Fix e2e test redis image name (#10)

* Fix e2e test redis image name

Author: Kenny Scharm

.github/workflows/pull_request.yml

@@ -158,7 +158,7 @@ jobs:
       - name: Build images
         run: |
           docker build -f Dockerfile.operator -t ibmcom/operator-for-redis:local .
-          docker build -f Dockerfile.node -t ibmcom/node-for-redis:local .
+          docker build -f Dockerfile.node -t ibmcom/node-for-redis:local -t ibmcom/node-for-redis:new .
           docker build -f Dockerfile.metrics -t ibmcom/metrics-for-redis:local .
 
       - name: kind create cluster
@@ -174,6 +174,7 @@ jobs:
         run: |
           kind load docker-image ibmcom/operator-for-redis:local
           kind load docker-image ibmcom/node-for-redis:local
+          kind load docker-image ibmcom/node-for-redis:new
           kind load docker-image ibmcom/metrics-for-redis:local
     
       - name: Install operator-for-redis with Helm

docs/docs/cookbook.md

@@ -155,21 +155,21 @@ If you followed the steps for creating a `kind` cluster with the e2e test config
 
 Build the required docker images:
 ```console
-make container PREFIX= TAG=local
-make container-node PREFIX= TAG=new
+make container PREFIX=ibmcom/ TAG=local
+make container-node PREFIX=ibmcom/ TAG=new
 ```
 Note that we need both `local` and `new` image tags for a rolling update e2e test case.
 
 Load the required images into the kind cluster:
 ```console
-$ kind load docker-image operator-for-redis:local
-$ kind load docker-image node-for-redis:local
-$ kind load docker-image node-for-redis:new
+$ kind load docker-image ibmcom/operator-for-redis:local
+$ kind load docker-image ibmcom/node-for-redis:local
+$ kind load docker-image ibmcom/node-for-redis:new
 ```
 
 Once the kind cluster is up and running, deploy the `operator-for-redis` Helm chart:
 ```console
-$ helm install op charts/operator-for-redis --wait --set image.repository=operator-for-redis --set image.tag=local
+$ helm install op charts/operator-for-redis --wait --set image.repository=ibmcom/operator-for-redis --set image.tag=local
 NAME: op
 LAST DEPLOYED: Thu Oct 21 15:11:51 2021
 NAMESPACE: default

docs/docs/home.md

@@ -97,12 +97,11 @@ make TAG=<Your-TAG> container
 
 ### How to Release the Redis Operator
 
-> THIS IS FOR RELEASE INTO ICM REPOS:
 >
 > Do the following in `main` branch:
 > 1. Create a tag on commit
 > 2. Push the commit and tag
-> 3. ICM automation will build and push docker images and helm charts with git tag version
+> 3. Github actions automation will build and push docker images and helm charts with release version
 >
 > NOTE: If you need to test the build prior to the above steps, you can run: `make build` and resolve any issues.
 

docs/docusaurus.config.js

@@ -18,7 +18,7 @@ module.exports = {
     },
     navbar: {
       hideOnScroll: false,
-      title: 'ICM Redis Operator',
+      title: 'Operator for Redis Cluster',
       logo: {
         src: 'images/logo.svg',
         srcDark: 'images/logo.svg',

test/e2e/framework/redis_cluster_handlers.go

@@ -27,6 +27,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
+const (
+	redisImageName = "ibmcom/node-for-redis"
+)
+
 // NewRedisCluster builds and returns a new RedisCluster instance
 func NewRedisCluster(name, namespace, tag string, nbPrimary, replication int32) *rapi.RedisCluster {
 	cluster := &rapi.RedisCluster{
@@ -67,7 +71,7 @@ func NewRedisCluster(name, namespace, tag string, nbPrimary, replication int32)
 					Containers: []v1.Container{
 						{
 							Name:            "redis",
-							Image:           fmt.Sprintf("icm-redis-node:%s", tag),
+							Image:           fmt.Sprintf("%s:%s", redisImageName, tag),
 							ImagePullPolicy: v1.PullIfNotPresent,
 							Args: []string{
 								"--v=6",
@@ -472,7 +476,7 @@ func CreateRedisNodeServiceAccountFunc(kubeClient kclient.Client, redisCluster *
 }
 
 // IsPodDisruptionBudgetCreatedFunc returns the func that checks if the PodDisruptionBudget
-// associated with the the RedisCluster has been created properly.
+// associated with the RedisCluster has been created properly.
 func IsPodDisruptionBudgetCreatedFunc(kubeClient kclient.Client, redisCluster *rapi.RedisCluster) func() error {
 	return func() error {
 		pdbName := types.NamespacedName{Namespace: redisCluster.Namespace, Name: redisCluster.Name}