Merge pull request #132756 from ylink-lfs/ci/redis_removal

ci: redis removal for e2e test dependency simplicity

test/e2e/apps/statefulset.go

@@ -66,7 +66,6 @@ import (
 const (
 	zookeeperManifestPath   = "test/e2e/testing-manifests/statefulset/zookeeper"
 	mysqlGaleraManifestPath = "test/e2e/testing-manifests/statefulset/mysql-galera"
-	redisManifestPath       = "test/e2e/testing-manifests/statefulset/redis"
 	cockroachDBManifestPath = "test/e2e/testing-manifests/statefulset/cockroachdb"
 	// We don't restart MySQL cluster regardless of restartCluster, since MySQL doesn't handle restart well
 	restartCluster = true
@@ -1195,14 +1194,6 @@ var _ = SIGDescribe("StatefulSet", func() {
 			appTester.run(ctx)
 		})
 
-		// Do not mark this as Conformance.
-		// StatefulSet Conformance should not be dependent on specific applications.
-		ginkgo.It("should creating a working redis cluster", func(ctx context.Context) {
-			e2epv.SkipIfNoDefaultStorageClass(ctx, c)
-			appTester.statefulPod = &redisTester{client: c}
-			appTester.run(ctx)
-		})
-
 		// Do not mark this as Conformance.
 		// StatefulSet Conformance should not be dependent on specific applications.
 		ginkgo.It("should creating a working mysql cluster", func(ctx context.Context) {
@@ -2090,37 +2081,6 @@ func (m *mysqlGaleraTester) read(statefulPodIndex int, key string) string {
 	return lastLine(m.mysqlExec(fmt.Sprintf("use statefulset; select v from foo where k=\"%v\";", key), m.ss.Namespace, name))
 }
 
-type redisTester struct {
-	ss     *appsv1.StatefulSet
-	client clientset.Interface
-}
-
-func (m *redisTester) name() string {
-	return "redis: master/slave"
-}
-
-func (m *redisTester) redisExec(cmd, ns, podName string) string {
-	cmd = fmt.Sprintf("/opt/redis/redis-cli -h %v %v", podName, cmd)
-	return e2ekubectl.RunKubectlOrDie(ns, "exec", podName, "--", "/bin/sh", "-c", cmd)
-}
-
-func (m *redisTester) deploy(ctx context.Context, ns string) *appsv1.StatefulSet {
-	m.ss = e2estatefulset.CreateStatefulSet(ctx, m.client, redisManifestPath, ns)
-	return m.ss
-}
-
-func (m *redisTester) write(statefulPodIndex int, kv map[string]string) {
-	name := fmt.Sprintf("%v-%d", m.ss.Name, statefulPodIndex)
-	for k, v := range kv {
-		framework.Logf("%s", m.redisExec(fmt.Sprintf("SET %v %v", k, v), m.ss.Namespace, name))
-	}
-}
-
-func (m *redisTester) read(statefulPodIndex int, key string) string {
-	name := fmt.Sprintf("%v-%d", m.ss.Name, statefulPodIndex)
-	return lastLine(m.redisExec(fmt.Sprintf("GET %v", key), m.ss.Namespace, name))
-}
-
 type cockroachDBTester struct {
 	ss     *appsv1.StatefulSet
 	client clientset.Interface

test/e2e/common/util.go

@@ -86,7 +86,6 @@ type testImagesStruct struct {
 	HttpdImage    string
 	HttpdNewImage string
 	PauseImage    string
-	RedisImage    string
 }
 
 var testImages testImagesStruct
@@ -102,7 +101,6 @@ func init() {
 		imageutils.GetE2EImage(imageutils.Httpd),
 		imageutils.GetE2EImage(imageutils.HttpdNew),
 		imageutils.GetE2EImage(imageutils.Pause),
-		imageutils.GetE2EImage(imageutils.Redis),
 	}
 }
 

test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: docker.io/library/redis:5.0.5-alpine
+        image: registry.k8s.io/e2e-test-images/redis:5.0.5-alpine
         resources:
           requests:
             cpu: 100m

test/e2e/testing-manifests/guestbook/legacy/redis-slave-controller.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: docker.io/library/redis:5.0.5-alpine
+        image: registry.k8s.io/e2e-test-images/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" ]

test/e2e/testing-manifests/statefulset/redis/service.yaml

@@ -1,16 +0,0 @@
-# A headless service to create DNS records
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  labels:
-    app: redis
-spec:
-  ports:
-  - port: 6379
-    name: peer
-  # *.redis.default.svc.cluster.local
-  clusterIP: None
-  selector:
-    app: redis
-  publishNotReadyAddresses: true

test/e2e/testing-manifests/statefulset/redis/statefulset.yaml

@@ -1,81 +0,0 @@
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: rd
-spec:
-  serviceName: "redis"
-  replicas: 3
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      initContainers:
-      - name: install
-        image: registry.k8s.io/e2e-test-images/pets/redis-installer:1.5
-        imagePullPolicy: Always
-        args:
-        - "--install-into=/opt"
-        - "--work-dir=/work-dir"
-        volumeMounts:
-        - name: opt
-          mountPath: "/opt"
-        - name: workdir
-          mountPath: "/work-dir"
-      - name: bootstrap
-        image: debian:jessie
-        command:
-        - "/work-dir/peer-finder"
-        args:
-        - -on-start="/work-dir/on-start.sh"
-        - "-service=redis"
-        env:
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        volumeMounts:
-        - name: opt
-          mountPath: "/opt"
-        - name: workdir
-          mountPath: "/work-dir"
-      containers:
-      - name: redis
-        image: debian:jessie
-        ports:
-        - containerPort: 6379
-          name: peer
-        command:
-        - /opt/redis/redis-server
-        args:
-        - /opt/redis/redis.conf
-        readinessProbe:
-          exec:
-            command:
-            - sh
-            - -c
-            - "/opt/redis/redis-cli -h $(hostname) ping"
-          initialDelaySeconds: 15
-          timeoutSeconds: 5
-        volumeMounts:
-        - name: datadir
-          mountPath: /data
-        - name: opt
-          mountPath: /opt
-      volumes:
-      - name: opt
-        emptyDir: {}
-      - name: workdir
-        emptyDir: {}
-  volumeClaimTemplates:
-  - metadata:
-      name: datadir
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      resources:
-        requests:
-          storage: 1Gi