diff --git a/docs/getting-started.md b/docs/getting-started.md index fc14ffa1..c2bb35aa 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -57,10 +57,10 @@ Run `kompose convert` in the same directory as your `compose.yaml` file. ```sh $ kompose convert INFO Kubernetes file "frontend-service.yaml" created -INFO Kubernetes file "redis-master-service.yaml" created +INFO Kubernetes file "redis-leader-service.yaml" created INFO Kubernetes file "redis-replica-service.yaml" created INFO Kubernetes file "frontend-deployment.yaml" created -INFO Kubernetes file "redis-master-deployment.yaml" created +INFO Kubernetes file "redis-leader-deployment.yaml" created INFO Kubernetes file "redis-replica-deployment.yaml" created ``` @@ -147,12 +147,12 @@ Run `kompose convert --provider=openshift` in the same directory as your `compos ```sh $ kompose convert --provider=openshift INFO OpenShift file "frontend-service.yaml" created -INFO OpenShift file "redis-master-service.yaml" created +INFO OpenShift file "redis-leader-service.yaml" created INFO OpenShift file "redis-replica-service.yaml" created INFO OpenShift file "frontend-deploymentconfig.yaml" created INFO OpenShift file "frontend-imagestream.yaml" created -INFO OpenShift file "redis-master-deploymentconfig.yaml" created -INFO OpenShift file "redis-master-imagestream.yaml" created +INFO OpenShift file "redis-leader-deploymentconfig.yaml" created +INFO OpenShift file "redis-leader-imagestream.yaml" created INFO OpenShift file "redis-replica-deploymentconfig.yaml" created INFO OpenShift file "redis-replica-imagestream.yaml" created ``` @@ -267,12 +267,12 @@ Run `kompose convert --provider=openshift` in the same directory as your `compos ```sh $ kompose convert --provider=openshift INFO OpenShift file "frontend-service.yaml" created -INFO OpenShift file "redis-master-service.yaml" created +INFO OpenShift file "redis-leader-service.yaml" created INFO OpenShift file "redis-replica-service.yaml" created INFO OpenShift file "frontend-deploymentconfig.yaml" created INFO OpenShift file "frontend-imagestream.yaml" created -INFO OpenShift file "redis-master-deploymentconfig.yaml" created -INFO OpenShift file "redis-master-imagestream.yaml" created +INFO OpenShift file "redis-leader-deploymentconfig.yaml" created +INFO OpenShift file "redis-leader-imagestream.yaml" created INFO OpenShift file "redis-replica-deploymentconfig.yaml" created INFO OpenShift file "redis-replica-imagestream.yaml" created ``` diff --git a/docs/index.md b/docs/index.md index ef50c6c5..0102ac97 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,6 +13,6 @@ $ kubectl apply -f . $ kubectl get po NAME READY STATUS RESTARTS AGE frontend-591253677-5t038 1/1 Running 0 10s -redis-master-2410703502-9hshf 1/1 Running 0 10s +redis-leader-2410703502-9hshf 1/1 Running 0 10s redis-replica-4049176185-hr1lr 1/1 Running 0 10s ``` diff --git a/docs/user-guide.md b/docs/user-guide.md index e20b0de0..4daac329 100644 --- a/docs/user-guide.md +++ b/docs/user-guide.md @@ -48,20 +48,20 @@ $ kompose -f compose.yml -f docker-guestbook.yml convert INFO Kubernetes file "frontend-service.yaml" created INFO Kubernetes file "mlbparks-service.yaml" created INFO Kubernetes file "mongodb-service.yaml" created -INFO Kubernetes file "redis-master-service.yaml" created +INFO Kubernetes file "redis-leader-service.yaml" created INFO Kubernetes file "redis-replica-service.yaml" created INFO Kubernetes file "frontend-deployment.yaml" created INFO Kubernetes file "mlbparks-deployment.yaml" created INFO Kubernetes file "mongodb-deployment.yaml" created INFO Kubernetes file "mongodb-claim0-persistentvolumeclaim.yaml" created -INFO Kubernetes file "redis-master-deployment.yaml" created +INFO Kubernetes file "redis-leader-deployment.yaml" created INFO Kubernetes file "redis-replica-deployment.yaml" created $ ls mlbparks-deployment.yaml mongodb-service.yaml redis-replica-service.jsonmlbparks-service.yaml -frontend-deployment.yaml mongodb-claim0-persistentvolumeclaim.yaml redis-master-service.yaml +frontend-deployment.yaml mongodb-claim0-persistentvolumeclaim.yaml redis-leader-service.yaml frontend-service.yaml mongodb-deployment.yaml redis-replica-deployment.yaml -redis-master-deployment.yaml +redis-leader-deployment.yaml ``` When multiple compose files are provided the configuration is merged. Any configuration that is common will be over ridden by subsequent file.