Skip to content

Commit d65a3b1

Browse files
committed
update agnhost guestbook usage for s/slave/replica/
1 parent 9ce9e2a commit d65a3b1

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

test/conformance/testdata/conformance.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,11 +1356,11 @@
13561356
codename: '[sig-cli] Kubectl client Guestbook application should create and stop
13571357
a working application [Conformance]'
13581358
description: Create Guestbook application that contains an agnhost master server,
1359-
2 agnhost slaves, frontend application, frontend service and agnhost master service
1360-
and agnhost slave service. Using frontend service, the test will write an entry
1361-
into the guestbook application which will store the entry into the backend agnhost
1362-
store. Application flow MUST work as expected and the data written MUST be available
1363-
to read.
1359+
2 agnhost replicas, frontend application, frontend service and agnhost master
1360+
service and agnhost replica service. Using frontend service, the test will write
1361+
an entry into the guestbook application which will store the entry into the backend
1362+
agnhost store. Application flow MUST work as expected and the data written MUST
1363+
be available to read.
13641364
release: v1.9
13651365
file: test/e2e/kubectl/kubectl.go
13661366
- testname: Kubectl, check version v1

test/e2e/kubectl/kubectl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,12 @@ var _ = SIGDescribe("Kubectl client", func() {
343343
forEachGBFile := func(run func(s string)) {
344344
guestbookRoot := "test/e2e/testing-manifests/guestbook"
345345
for _, gbAppFile := range []string{
346-
"agnhost-slave-service.yaml",
346+
"agnhost-replica-service.yaml",
347347
"agnhost-master-service.yaml",
348348
"frontend-service.yaml",
349349
"frontend-deployment.yaml.in",
350350
"agnhost-master-deployment.yaml.in",
351-
"agnhost-slave-deployment.yaml.in",
351+
"agnhost-replica-deployment.yaml.in",
352352
} {
353353
contents := commonutils.SubstituteImageName(string(e2etestfiles.ReadOrDie(filepath.Join(guestbookRoot, gbAppFile))))
354354
run(contents)
@@ -358,7 +358,7 @@ var _ = SIGDescribe("Kubectl client", func() {
358358
/*
359359
Release : v1.9
360360
Testname: Kubectl, guestbook application
361-
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.
361+
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.
362362
*/
363363
framework.ConformanceIt("should create and stop a working application ", func() {
364364
defer forEachGBFile(func(contents string) {

test/e2e/testing-manifests/guestbook/agnhost-slave-deployment.yaml.in renamed to test/e2e/testing-manifests/guestbook/agnhost-replica-deployment.yaml.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: agnhost-slave
4+
name: agnhost-replica
55
spec:
66
replicas: 2
77
selector:
88
matchLabels:
99
app: agnhost
10-
role: slave
10+
role: replica
1111
tier: backend
1212
template:
1313
metadata:
1414
labels:
1515
app: agnhost
16-
role: slave
16+
role: replica
1717
tier: backend
1818
spec:
1919
containers:
20-
- name: slave
20+
- name: replica
2121
image: {{.AgnhostImage}}
22-
args: [ "guestbook", "--slaveof", "agnhost-master", "--http-port", "6379" ]
22+
args: [ "guestbook", "--replicaof", "agnhost-master", "--http-port", "6379" ]
2323
resources:
2424
requests:
2525
cpu: 100m
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: agnhost-slave
4+
name: agnhost-replica
55
labels:
66
app: agnhost
7-
role: slave
7+
role: replica
88
tier: backend
99
spec:
1010
ports:
1111
- port: 6379
1212
selector:
1313
app: agnhost
14-
role: slave
14+
role: replica
1515
tier: backend

test/images/agnhost/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ sed_expr="s|{{.AgnhostImage}}|us.gcr.io/k8s-artifacts-prod/e2e-test-images/agnho
212212
# create the services.
213213
kubectl create -f ${guestbook}/frontend-service.yaml
214214
kubectl create -f ${guestbook}/agnhost-master-service.yaml
215-
kubectl create -f ${guestbook}/agnhost-slave-service.yaml
215+
kubectl create -f ${guestbook}/agnhost-replica-service.yaml
216216

217217
# create the deployments.
218218
cat ${guestbook}/frontend-deployment.yaml.in | sed ${sed_expr} | kubectl create -f -
219219
cat ${guestbook}/agnhost-master-deployment.yaml.in | sed ${sed_expr} | kubectl create -f -
220-
cat ${guestbook}/agnhost-slave-deployment.yaml.in | sed ${sed_expr} | kubectl create -f -
220+
cat ${guestbook}/agnhost-replica-deployment.yaml.in | sed ${sed_expr} | kubectl create -f -
221221
```
222222

223223

0 commit comments

Comments
 (0)