Merge the e2e Test Files (#623)

shubham-cmyk · web-flow · commit 323dc4092027 · 2023-09-15T12:10:27.000+05:30
Signed-off-by: Shubham Gupta &lt;iamshubhamgupta2001@gmail.com&gt;
diff --git a/api/v1beta2/rediscluster_types.go b/api/v1beta2/rediscluster_types.go
@@ -71,6 +71,7 @@ type RedisFollower struct {
 }
 
 // RedisClusterStatus defines the observed state of RedisCluster
+// +kubebuilder:subresource:status
 type RedisClusterStatus struct {
 	State  status.RedisClusterState `json:"state,omitempty"`
 	Reason string                   `json:"reason,omitempty"`
diff --git a/kuttl-test.yaml b/kuttl-test.yaml
diff --git a/tests/_config/kind-config.yaml b/tests/_config/kind-config.yaml
diff --git a/tests/_config/kuttl-test.yaml b/tests/_config/kuttl-test.yaml
@@ -0,0 +1,8 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestSuite
+startKIND: false
+kindConfig: "./kind-config.yaml"
+parallel: 1
+timeout: 300
+suppress : 
+  - events
diff --git a/tests/e2e/setup/ready-standalone.yaml b/tests/e2e/setup/ready-standalone.yaml
diff --git a/tests/e2e/v1beta1/setup/00-install.yaml b/tests/e2e/v1beta1/setup/00-install.yaml
@@ -1,8 +1,7 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 apply : 
-  - standalone.yaml
   - cluster.yaml
 assert :
-  - ready-standalone.yaml
-  - ready-cluster.yaml
+  - ready-cluster.yaml
+  - ready-cluster-sts.yaml
diff --git a/tests/e2e/v1beta1/setup/cluster.yaml b/tests/e2e/v1beta1/setup/cluster.yaml
@@ -1,33 +1,35 @@
----
 apiVersion: redis.redis.opstreelabs.in/v1beta1
-kind: Redis
+kind: RedisCluster
 metadata:
-  name: redis-standalone
+  name: redis-cluster-v1beta1
 spec:
-  podSecurityContext:
+  clusterSize: 3
+  clusterVersion: v7
+  persistenceEnabled: true
+  securityContext:
     runAsUser: 1000
-    fsGroup: 1000  
+    fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v7.0.12
+    image: quay.io/opstree/redis:v7.0.7
     imagePullPolicy: IfNotPresent
     resources:
       requests:
-        cpu: 10m
-        memory: 10Mi
+        cpu: 101m
+        memory: 128Mi
       limits:
-        cpu: 10m
-        memory: 10Mi
+        cpu: 101m
+        memory: 128Mi
   redisExporter:
-    enabled: false
+    enabled: true
     image: quay.io/opstree/redis-exporter:v1.44.0
     imagePullPolicy: Always
     resources:
       requests:
-        cpu: 10m
-        memory: 10Mi
+        cpu: 100m
+        memory: 128Mi
       limits:
-        cpu: 10m
-        memory: 12Mi
+        cpu: 100m
+        memory: 128Mi
   storage:
     volumeClaimTemplate:
       spec:
diff --git a/tests/e2e/v1beta1/setup/ready-cluster-sts.yaml b/tests/e2e/v1beta1/setup/ready-cluster-sts.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: redis-cluster-leader
+  name: redis-cluster-v1beta1-leader
 status:
   replicas: 3
   readyReplicas: 3
@@ -11,7 +11,7 @@ status:
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: redis-cluster-follower
+  name: redis-cluster-v1beta1-follower
 status:
   replicas: 3
   readyReplicas: 3
diff --git a/tests/e2e/v1beta1/setup/ready-cluster.yaml b/tests/e2e/v1beta1/setup/ready-cluster.yaml
@@ -0,0 +1,7 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta1
+kind: RedisCluster
+metadata:
+  name: redis-cluster-v1beta1
+status:
+  readyFollowerReplicas: 3
+  readyLeaderReplicas: 3
diff --git a/tests/e2e/v1beta2/setup/00-install.yaml b/tests/e2e/v1beta2/setup/00-install.yaml
@@ -0,0 +1,7 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply : 
+  - cluster.yaml
+assert :
+  - ready-cluster.yaml
+  - ready-cluster-sts.yaml
diff --git a/tests/e2e/v1beta2/setup/cluster.yaml b/tests/e2e/v1beta2/setup/cluster.yaml
@@ -1,7 +1,7 @@
-apiVersion: redis.redis.opstreelabs.in/v1beta1
+apiVersion: redis.redis.opstreelabs.in/v1beta2
 kind: RedisCluster
 metadata:
-  name: redis-cluster
+  name: redis-cluster-v1beta2
 spec:
   clusterSize: 3
   clusterVersion: v7
@@ -10,7 +10,7 @@ spec:
     runAsUser: 1000
     fsGroup: 1000
   kubernetesConfig:
-    image: quay.io/opstree/redis:v7.0.12
+    image: quay.io/opstree/redis:v7.0.11
     imagePullPolicy: IfNotPresent
     resources:
       requests:
@@ -20,7 +20,7 @@ spec:
         cpu: 101m
         memory: 128Mi
   redisExporter:
-    enabled: false
+    enabled: true
     image: quay.io/opstree/redis-exporter:v1.44.0
     imagePullPolicy: Always
     resources:
@@ -38,9 +38,10 @@ spec:
         resources:
           requests:
             storage: 1Gi
+    nodeConfVolume: true
     nodeConfVolumeClaimTemplate:
       spec:
         accessModes: ["ReadWriteOnce"]
         resources:
           requests:
-            storage: 1Gi
+            storage: 1Gi
diff --git a/tests/e2e/v1beta2/setup/ready-cluster-sts.yaml b/tests/e2e/v1beta2/setup/ready-cluster-sts.yaml
@@ -0,0 +1,17 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: redis-cluster-v1beta2-leader
+status:
+  replicas: 3
+  readyReplicas: 3
+
+---
+
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: redis-cluster-v1beta2-follower
+status:
+  replicas: 3
+  readyReplicas: 3
diff --git a/tests/e2e/v1beta2/setup/ready-cluster.yaml b/tests/e2e/v1beta2/setup/ready-cluster.yaml
@@ -0,0 +1,7 @@
+apiVersion: redis.redis.opstreelabs.in/v1beta1
+kind: RedisCluster
+metadata:
+  name: redis-cluster-v1beta2
+status:
+  # readyFollowerReplicas: 3
+  readyLeaderReplicas: 3
diff --git a/tests/readme.md b/tests/readme.md
@@ -0,0 +1,42 @@
+# E2E Testing of the Redis Cluster with Kuttl
+
+This guide will walk you through the process of end-to-end (E2E) testing a Redis cluster using the `kuttl` utility.
+
+## **Prerequisites**
+
+Ensure you have the following tools installed:
+
+- **kuttl**: For testing. [Installation Guide](https://kuttl.dev/docs/installation/)
+- **kind**: For local Kubernetes clusters. [Installation Guide](https://kind.sigs.k8s.io/docs/user/quick-start/#installation)
+- **kubectl**: Kubernetes command-line tool. [Installation Guide](https://kubernetes.io/docs/tasks/tools/install-kubectl/)
+- **helm**: Package manager for Kubernetes. [Installation Guide](https://helm.sh/docs/intro/install/)
+
+## **Steps**
+
+### **1. Set Up a 3-node Kind Cluster**
+
+## Steps to Follow
+
+### 1. Set Up a 3-node Kind Cluster
+
+Create a 3-node kind cluster using the provided configuration:
+
+```bash
+kind create cluster --config /redis-operator/tests/_config/kind-example-config.yaml
+```
+
+### 2. Install the Redis Operator
+
+To install the Redis operator, utilize the Helm chart from the repository provided:
+
+- [OT-CONTAINER-KIT Redis Operator Helm Chart](https://github.com/OT-CONTAINER-KIT/helm-charts/tree/main/charts/redis-operator#readme)
+
+Please refer to the repository's README for detailed instructions on installing the operator using Helm.
+
+### 3. Execute Kuttl Test
+
+Execute the kuttl test using the following command:
+
+```bash
+kubectl kuttl test redis-operator/tests/e2e/v1beta2 --config /redis-operator/tests/_config/kuttl-test.yaml --timeout 10m
+```

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ type RedisFollower struct {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// RedisClusterStatus defines the observed state of RedisCluster`
	`74`	`+// +kubebuilder:subresource:status`
`74`	`75`	`type RedisClusterStatus struct {`
`75`	`76`	State status.RedisClusterState `json:"state,omitempty"`
`76`	`77`	Reason string `json:"reason,omitempty"`