Update Redis version to 7.0.4

.github/workflows/release.yml

@@ -8,7 +8,8 @@ on:
 env:
   GO_VERSION: 1.17
   HELM_VERSION: v3.6.3
-  REDIS_VERSION: 6.2.7
+  REDIS_VERSION_6: 6.2.7
+  REDIS_VERSION_7: 7.0.4
   CRD_PATH: charts/operator-for-redis/crds/db.ibm.com_redisclusters.yaml
   CRD_DIFF: crd.diff
 
@@ -70,17 +71,32 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push cluster node image
+      - name: Build and push cluster node image Redis v6.2.x
         uses: docker/build-push-action@v3
         with:
           file: Dockerfile.node
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ env.REDIS_VERSION_6 }}-${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
+            OPERATOR_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            REDIS_VERSION=${{ env.REDIS_VERSION_6 }}
+
+
+      - name: Build and push cluster node image Redis v7.0.x
+        uses: docker/build-push-action@v3
+        with:
+          file: Dockerfile.node
+          push: true
+          tags: ${{ env.REDIS_VERSION_7 }}-${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
             OPERATOR_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+            REDIS_VERSION=${{ env.REDIS_VERSION_7 }}
 
   metrics:
     runs-on: ubuntu-latest
@@ -139,7 +155,7 @@ jobs:
       - name: Package node-for-redis chart
         env:
           OPERATOR_VERSION: ${{ needs.operator.outputs.version }}
-        run: helm package charts/node-for-redis --version=$OPERATOR_VERSION --app-version=${{ env.REDIS_VERSION }} --destination helm-releases
+        run: helm package charts/node-for-redis --version=$OPERATOR_VERSION --app-version=${{ env.REDIS_VERSION_6 }}-${{ env.REDIS_VERSION_7 }} --destination helm-releases
 
       - name: Push helm charts
         env:

Dockerfile.node

@@ -1,4 +1,4 @@
-ARG REDIS_VERSION=6.2.7
+ARG REDIS_VERSION=7.0.4
 ARG BUILDIMAGE=golang:1.17-bullseye
 ARG BASEIMAGE=redis:${REDIS_VERSION}-bullseye
 ARG DOCKER_PROXY_REGISTRY

Makefile

@@ -3,6 +3,9 @@ ARTIFACT_INITCONTAINER=init-container
 
 PREFIX=ibmcom/
 
+REDIS_VERSION_6=6.2.7
+REDIS_VERSION_7=7.0.4
+
 SOURCES := $(shell find . ! -name "*_test.go" -name '*.go')
 
 CMDBINS := operator node metrics
@@ -18,7 +21,7 @@ TAG?=$(shell git tag|tail -1)
 COMMIT=$(shell git rev-parse HEAD)
 DATE=$(shell date +%Y-%m-%d/%H:%M:%S)
 BUILDINFOPKG=github.com/IBM/operator-for-redis-cluster/pkg/utils
-LDFLAGS= -ldflags "-w -X ${BUILDINFOPKG}.TAG=${TAG} -X ${BUILDINFOPKG}.COMMIT=${COMMIT} -X ${BUILDINFOPKG}.OPERATOR_VERSION=${OPERATOR_VERSION} -X ${BUILDINFOPKG}.REDIS_VERSION=${REDIS_VERSION} -X ${BUILDINFOPKG}.BUILDTIME=${DATE} -s"
+LDFLAGS= -ldflags "-w -X ${BUILDINFOPKG}.TAG=${TAG} -X ${BUILDINFOPKG}.COMMIT=${COMMIT} -X ${BUILDINFOPKG}.OPERATOR_VERSION=${OPERATOR_VERSION} -X ${BUILDINFOPKG}.REDIS_VERSION=${REDIS_VERSION_6}-${REDIS_VERSION_7} -X ${BUILDINFOPKG}.BUILDTIME=${DATE} -s"
 
 all: build
 
@@ -34,7 +37,12 @@ buildlinux-%: ${SOURCES}
 	CGO_ENABLED=0 GOOS=linux go build -installsuffix cgo ${LDFLAGS} -o docker/$*/$* ./cmd/$*/main.go
 
 container-%: buildlinux-%
-	docker build -t $(PREFIX)$*-for-redis:$(TAG) -f Dockerfile.$* .
+	@if [ "$*" = "node" ]; then\
+		docker build -t $(PREFIX)$*-for-redis:$(REDIS_VERSION_6)-$(TAG) --build-arg "REDIS_VERSION=$(REDIS_VERSION_6)" -f Dockerfile.$* . ;\
+		docker build -t $(PREFIX)$*-for-redis:$(REDIS_VERSION_7)-$(TAG) --build-arg "REDIS_VERSION=$(REDIS_VERSION_7)" -f Dockerfile.$* . ;\
+	else\
+		docker build -t $(PREFIX)$*-for-redis:$(TAG) -f Dockerfile.$* . ;\
+    fi
 
 build: $(addprefix build-,$(CMDBINS))
 

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/glog v1.0.0
 	github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb
-	github.com/mediocregopher/radix/v4 v4.1.0
+	github.com/mediocregopher/radix/v4 v4.1.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.19.0

go.sum

@@ -409,8 +409,8 @@ github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/mediocregopher/radix/v4 v4.1.0 h1:z96wBJkyK/hOrAV+qC8AXk0QsbwZEtx5+8ovjnXELuA=
-github.com/mediocregopher/radix/v4 v4.1.0/go.mod h1:ajchozX/6ELmydxWeWM6xCFHVpZ4+67LXHOTOVR0nCE=
+github.com/mediocregopher/radix/v4 v4.1.1 h1:JkZBEp0y8pWGNZkmO3RR5oEO5huwd4zKKt4rh1C+P8s=
+github.com/mediocregopher/radix/v4 v4.1.1/go.mod h1:ajchozX/6ELmydxWeWM6xCFHVpZ4+67LXHOTOVR0nCE=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=