From d65a3b15bf4a720b09c32e9fff06928aab43c9e5 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Sat, 13 Jun 2020 20:51:37 -0700 Subject: [PATCH] update agnhost guestbook usage for s/slave/replica/ --- test/conformance/testdata/conformance.yaml | 10 +++++----- test/e2e/kubectl/kubectl.go | 6 +++--- ...ment.yaml.in => agnhost-replica-deployment.yaml.in} | 10 +++++----- ...slave-service.yaml => agnhost-replica-service.yaml} | 6 +++--- test/images/agnhost/README.md | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) rename test/e2e/testing-manifests/guestbook/{agnhost-slave-deployment.yaml.in => agnhost-replica-deployment.yaml.in} (70%) rename test/e2e/testing-manifests/guestbook/{agnhost-slave-service.yaml => agnhost-replica-service.yaml} (72%) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 2f060dc9cd0..5b48884240c 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1356,11 +1356,11 @@ codename: '[sig-cli] Kubectl client Guestbook application should create and stop a working application [Conformance]' description: Create Guestbook application that contains an agnhost master server, - 2 agnhost slaves, frontend application, frontend service and agnhost master service - and agnhost slave service. Using frontend service, the test will write an entry - into the guestbook application which will store the entry into the backend agnhost - store. Application flow MUST work as expected and the data written MUST be available - to read. + 2 agnhost replicas, frontend application, frontend service and agnhost master + service and agnhost replica service. Using frontend service, the test will write + an entry into the guestbook application which will store the entry into the backend + agnhost store. Application flow MUST work as expected and the data written MUST + be available to read. release: v1.9 file: test/e2e/kubectl/kubectl.go - testname: Kubectl, check version v1 diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index 4f184aeda20..303304eecdd 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -343,12 +343,12 @@ var _ = SIGDescribe("Kubectl client", func() { forEachGBFile := func(run func(s string)) { guestbookRoot := "test/e2e/testing-manifests/guestbook" for _, gbAppFile := range []string{ - "agnhost-slave-service.yaml", + "agnhost-replica-service.yaml", "agnhost-master-service.yaml", "frontend-service.yaml", "frontend-deployment.yaml.in", "agnhost-master-deployment.yaml.in", - "agnhost-slave-deployment.yaml.in", + "agnhost-replica-deployment.yaml.in", } { contents := commonutils.SubstituteImageName(string(e2etestfiles.ReadOrDie(filepath.Join(guestbookRoot, gbAppFile)))) run(contents) @@ -358,7 +358,7 @@ var _ = SIGDescribe("Kubectl client", func() { /* Release : v1.9 Testname: Kubectl, guestbook application - Description: Create Guestbook application that contains an agnhost master server, 2 agnhost slaves, frontend application, frontend service and agnhost master service and agnhost slave service. Using frontend service, the test will write an entry into the guestbook application which will store the entry into the backend agnhost store. Application flow MUST work as expected and the data written MUST be available to read. + Description: Create Guestbook application that contains an agnhost master server, 2 agnhost replicas, frontend application, frontend service and agnhost master service and agnhost replica service. Using frontend service, the test will write an entry into the guestbook application which will store the entry into the backend agnhost store. Application flow MUST work as expected and the data written MUST be available to read. */ framework.ConformanceIt("should create and stop a working application ", func() { defer forEachGBFile(func(contents string) { diff --git a/test/e2e/testing-manifests/guestbook/agnhost-slave-deployment.yaml.in b/test/e2e/testing-manifests/guestbook/agnhost-replica-deployment.yaml.in similarity index 70% rename from test/e2e/testing-manifests/guestbook/agnhost-slave-deployment.yaml.in rename to test/e2e/testing-manifests/guestbook/agnhost-replica-deployment.yaml.in index 88f65d3e145..34bd3978ea6 100644 --- a/test/e2e/testing-manifests/guestbook/agnhost-slave-deployment.yaml.in +++ b/test/e2e/testing-manifests/guestbook/agnhost-replica-deployment.yaml.in @@ -1,25 +1,25 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: agnhost-slave + name: agnhost-replica spec: replicas: 2 selector: matchLabels: app: agnhost - role: slave + role: replica tier: backend template: metadata: labels: app: agnhost - role: slave + role: replica tier: backend spec: containers: - - name: slave + - name: replica image: {{.AgnhostImage}} - args: [ "guestbook", "--slaveof", "agnhost-master", "--http-port", "6379" ] + args: [ "guestbook", "--replicaof", "agnhost-master", "--http-port", "6379" ] resources: requests: cpu: 100m diff --git a/test/e2e/testing-manifests/guestbook/agnhost-slave-service.yaml b/test/e2e/testing-manifests/guestbook/agnhost-replica-service.yaml similarity index 72% rename from test/e2e/testing-manifests/guestbook/agnhost-slave-service.yaml rename to test/e2e/testing-manifests/guestbook/agnhost-replica-service.yaml index 93b06287bcf..e8873f54473 100644 --- a/test/e2e/testing-manifests/guestbook/agnhost-slave-service.yaml +++ b/test/e2e/testing-manifests/guestbook/agnhost-replica-service.yaml @@ -1,15 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: agnhost-slave + name: agnhost-replica labels: app: agnhost - role: slave + role: replica tier: backend spec: ports: - port: 6379 selector: app: agnhost - role: slave + role: replica tier: backend diff --git a/test/images/agnhost/README.md b/test/images/agnhost/README.md index e006e4c1ab7..6d4b6918a33 100644 --- a/test/images/agnhost/README.md +++ b/test/images/agnhost/README.md @@ -212,12 +212,12 @@ sed_expr="s|{{.AgnhostImage}}|us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnho # create the services. kubectl create -f ${guestbook}/frontend-service.yaml kubectl create -f ${guestbook}/agnhost-master-service.yaml -kubectl create -f ${guestbook}/agnhost-slave-service.yaml +kubectl create -f ${guestbook}/agnhost-replica-service.yaml # create the deployments. cat ${guestbook}/frontend-deployment.yaml.in | sed ${sed_expr} | kubectl create -f - cat ${guestbook}/agnhost-master-deployment.yaml.in | sed ${sed_expr} | kubectl create -f - -cat ${guestbook}/agnhost-slave-deployment.yaml.in | sed ${sed_expr} | kubectl create -f - +cat ${guestbook}/agnhost-replica-deployment.yaml.in | sed ${sed_expr} | kubectl create -f - ```