diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index b09ea4553b4..dfa38c8fb4c 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -65,17 +65,16 @@ var CommonImageWhiteList = sets.NewString( ) type testImagesStruct struct { - AgnhostImage string - BusyBoxImage string - GBFrontendImage string - GBRedisSlaveImage string - KittenImage string - MounttestImage string - NautilusImage string - NginxImage string - NginxNewImage string - PauseImage string - RedisImage string + AgnhostImage string + BusyBoxImage string + GBFrontendImage string + KittenImage string + MounttestImage string + NautilusImage string + NginxImage string + NginxNewImage string + PauseImage string + RedisImage string } var testImages testImagesStruct @@ -85,7 +84,6 @@ func init() { imageutils.GetE2EImage(imageutils.Agnhost), imageutils.GetE2EImage(imageutils.BusyBox), imageutils.GetE2EImage(imageutils.GBFrontend), - imageutils.GetE2EImage(imageutils.GBRedisSlave), imageutils.GetE2EImage(imageutils.Kitten), imageutils.GetE2EImage(imageutils.Mounttest), imageutils.GetE2EImage(imageutils.Nautilus), diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index 2a9e70c1a29..31a216f0980 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -1144,7 +1144,7 @@ metadata: waitForOrFailWithDebug(1) forEachPod(func(pod v1.Pod) { e2elog.Logf("wait on redis-master startup in %v ", ns) - framework.LookForStringInLog(ns, pod.Name, "redis-master", "The server is now ready to accept connections", framework.PodStartTimeout) + framework.LookForStringInLog(ns, pod.Name, "redis-master", "Ready to accept connections", framework.PodStartTimeout) }) validateService := func(name string, servicePort int, timeout time.Duration) { err := wait.Poll(framework.Poll, timeout, func() (bool, error) { @@ -1323,7 +1323,7 @@ metadata: waitForOrFailWithDebug(1) forEachPod(func(pod v1.Pod) { ginkgo.By("checking for a matching strings") - _, err := framework.LookForStringInLog(ns, pod.Name, containerName, "The server is now ready to accept connections", framework.PodStartTimeout) + _, err := framework.LookForStringInLog(ns, pod.Name, containerName, "Ready to accept connections", framework.PodStartTimeout) framework.ExpectNoError(err) ginkgo.By("limiting log lines") diff --git a/test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml b/test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml index 9aa6bc30036..60a1a6fabaa 100644 --- a/test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml +++ b/test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: master - image: docker.io/library/redis:3.2.9-alpine + image: docker.io/library/redis:5.0.5-alpine resources: requests: cpu: 100m diff --git a/test/e2e/testing-manifests/guestbook/legacy/redis-slave-controller.yaml b/test/e2e/testing-manifests/guestbook/legacy/redis-slave-controller.yaml index 90cbd6981b3..3376794b345 100644 --- a/test/e2e/testing-manifests/guestbook/legacy/redis-slave-controller.yaml +++ b/test/e2e/testing-manifests/guestbook/legacy/redis-slave-controller.yaml @@ -17,7 +17,10 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: docker.io/library/redis:5.0.5-alpine + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] resources: requests: cpu: 100m diff --git a/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in b/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in index 46775a82306..7b4536bddbd 100644 --- a/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in +++ b/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in @@ -18,7 +18,10 @@ spec: spec: containers: - name: slave - image: {{.GBRedisSlaveImage}} + image: {{.RedisImage}} + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] resources: requests: cpu: 100m diff --git a/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml b/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml index ca2f826f86d..d237c4d4290 100644 --- a/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml +++ b/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml @@ -24,7 +24,10 @@ spec: spec: containers: - name: slave - image: gcr.io/google-samples/gb-redisslave:v3 + image: docker.io/library/redis:5.0.5-alpine + # We are only implementing the dns option of: + # https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh + command: [ "redis-server", "--slaveof", "redis-master", "6379" ] resources: requests: cpu: 100m diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index d56db8d910a..86067e952a2 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -134,8 +134,6 @@ const ( Etcd // GBFrontend image GBFrontend - // GBRedisSlave image - GBRedisSlave // Httpd image Httpd // HttpdNew image @@ -214,7 +212,6 @@ func initImageConfigs() map[int]Config { configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"} configs[Etcd] = Config{gcRegistry, "etcd", "3.3.10"} configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"} - configs[GBRedisSlave] = Config{sampleRegistry, "gb-redisslave", "v3"} configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"} configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"} configs[Invalid] = Config{gcRegistry, "invalid-image", "invalid-tag"} @@ -234,7 +231,7 @@ func initImageConfigs() map[int]Config { configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"} configs[PrometheusDummyExporter] = Config{e2eRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusToSd] = Config{e2eRegistry, "prometheus-to-sd", "v0.5.0"} - configs[Redis] = Config{dockerLibraryRegistry, "redis", "3.2.9-alpine"} + configs[Redis] = Config{dockerLibraryRegistry, "redis", "5.0.5-alpine"} configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"} configs[ResourceController] = Config{e2eRegistry, "resource-consumer-controller", "1.0"} configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"}