guestbook: update example & test with leader/follower naming

The guestbook in version v5 fails trying to connect to `redis-leader`. The reason is that the deployment is still named `redis-master`. Therefore, this commit renames the example & test guestbook deployments to use the leader/follower naming. Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
cilium · Dec 5, 2023 · be374aa · be374aa
1 parent 888779d
commit be374aa
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/.../guestbook/1-redis-master-controller.json → .../guestbook/1-redis-leader-controller.json b/.../guestbook/1-redis-master-controller.json → .../guestbook/1-redis-leader-controller.json
@@ -2,28 +2,28 @@
     "kind":"ReplicationController",
     "apiVersion":"v1",
     "metadata":{
-        "name":"redis-master",
+        "name":"redis-leader",
         "labels":{
             "k8s-app.guestbook":"redis",
-            "role":"master"
+            "role":"leader"
         }
     },
     "spec":{
         "replicas":1,
         "selector":{
             "k8s-app.guestbook":"redis",
-            "role":"master"
+            "role":"leader"
         },
         "template":{
             "metadata":{
                 "labels":{
                     "k8s-app.guestbook":"redis",
-                    "role":"master"
+                    "role":"leader"
                 }
             },
             "spec":{
                 "containers":[{
-                    "name":"redis-master",
+                    "name":"redis-leader",
                     "image":"docker.io/library/redis:4.0.1",
                     "ports":[{
                         "name":"redis-server",

diff --git a/...isc/guestbook/2-redis-master-service.json → ...isc/guestbook/2-redis-leader-service.json b/...isc/guestbook/2-redis-master-service.json → ...isc/guestbook/2-redis-leader-service.json
@@ -2,10 +2,10 @@
     "kind":"Service",
     "apiVersion":"v1",
     "metadata":{
-        "name":"redis-master",
+        "name":"redis-leader",
         "labels":{
             "k8s-app.guestbook":"redis",
-            "role":"master"
+            "role":"leader"
         }
     },
     "spec":{
@@ -15,7 +15,7 @@
         }],
         "selector":{
             "k8s-app.guestbook":"redis",
-            "role":"master"
+            "role":"leader"
         }
     }
 }
diff --git a/...c/guestbook/3-redis-slave-controller.json → ...uestbook/3-redis-follower-controller.json b/...c/guestbook/3-redis-slave-controller.json → ...uestbook/3-redis-follower-controller.json
@@ -2,30 +2,30 @@
     "kind":"ReplicationController",
     "apiVersion":"v1",
     "metadata":{
-        "name":"redis-slave",
+        "name":"redis-follower",
         "labels":{
             "k8s-app.guestbook":"redis",
-            "role":"slave"
+            "role":"follower"
         }
     },
     "spec":{
         "replicas":1,
         "selector":{
             "k8s-app.guestbook":"redis",
-            "role":"slave"
+            "role":"follower"
         },
         "template":{
             "metadata":{
                 "labels":{
                     "k8s-app.guestbook":"redis",
-                    "role":"slave"
+                    "role":"follower"
                 }
             },
             "spec":{
                 "containers":[{
-                    "name":"redis-slave",
+                    "name":"redis-follower",
                     "image":"docker.io/library/redis:4.0.1",
-                    "command": ["redis-server","--loglevel","verbose","--slaveof","redis-master","6379"],
+                    "command": ["redis-server","--loglevel","verbose","--slaveof","redis-leader","6379"],
                     "ports":[{
                         "name":"redis-server",
                         "containerPort":6379

diff --git a/...misc/guestbook/4-redis-slave-service.json → ...c/guestbook/4-redis-follower-service.json b/...misc/guestbook/4-redis-slave-service.json → ...c/guestbook/4-redis-follower-service.json
@@ -2,10 +2,10 @@
     "kind":"Service",
     "apiVersion":"v1",
     "metadata":{
-        "name":"redis-slave",
+        "name":"redis-follower",
         "labels":{
             "k8s-app.guestbook":"redis",
-            "role":"slave"
+            "role":"follower"
         }
     },
     "spec":{
@@ -15,7 +15,7 @@
         }],
         "selector":{
             "k8s-app.guestbook":"redis",
-            "role":"slave"
+            "role":"follower"
         }
     }
 }
diff --git a/test/k8s/manifests/guestbook_deployment.yaml b/test/k8s/manifests/guestbook_deployment.yaml
@@ -2,7 +2,7 @@
 kind: ReplicationController
 apiVersion: v1
 metadata:
-  name: redis-master
+  name: redis-leader
   labels:
     app: redis
     role: leader
@@ -32,7 +32,7 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: redis-master
+  name: redis-leader
   labels:
     app: redis
     role: leader

diff --git a/test/k8s/net_policies.go b/test/k8s/net_policies.go
@@ -1975,8 +1975,8 @@ var _ = SkipDescribeIf(func() bool {
 			err = kubectl.WaitforPods(helpers.DefaultNamespace, "-l tier=frontend", helpers.HelperTimeout)
 			ExpectWithOffset(1, err).Should(BeNil(), "Frontend pods are not ready after timeout")
 
-			err = kubectl.WaitForServiceEndpoints(helpers.DefaultNamespace, "", "redis-master", helpers.HelperTimeout)
-			ExpectWithOffset(1, err).Should(BeNil(), "error waiting for redis-master service to be ready")
+			err = kubectl.WaitForServiceEndpoints(helpers.DefaultNamespace, "", "redis-leader", helpers.HelperTimeout)
+			ExpectWithOffset(1, err).Should(BeNil(), "error waiting for redis-leader service to be ready")
 
 			err = kubectl.WaitForServiceEndpoints(helpers.DefaultNamespace, "", "redis-follower", helpers.HelperTimeout)
 			ExpectWithOffset(1, err).Should(BeNil(), "error waiting for redis-follower service to be ready")