Update upgrade-consistency-sharded-tls tests

Author: jvpasinatto

Makefile

@@ -104,6 +104,9 @@ MOCKGEN = $(shell pwd)/bin/mockgen
 mockgen: ## Download mockgen locally if necessary.
 	$(call go-get-tool,$(MOCKGEN), github.com/golang/mock/mockgen@latest)
 
+update-version:
+	echo $(NEXT_VER) > pkg/version/version.txt
+
 # Prepare release
 include e2e-tests/release_versions
 CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
@@ -133,8 +136,7 @@ release: manifests
 MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
 MINOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f2)
 NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
-after-release: manifests
-	echo $(NEXT_VER) > pkg/version/version.txt
+after-release: update-version manifests
 	$(SED) -i \
 		-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
 		-e "/^spec:/,/^  image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" deploy/cr-minimal.yaml

e2e-tests/functions

@@ -25,12 +25,12 @@ qualify_image_ref() {
 	local ref="$1"
 	local first="${ref%%/*}"
 
-	if [[ "$first" == *.* || "$first" == *:* || "$first" == "localhost" ]]; then
+	if [[ $first == *.* || $first == *:* || $first == "localhost" ]]; then
 		printf '%s' "$ref"
 		return 0
 	fi
 
-	if [[ "$ref" == percona/* || "$ref" == perconalab/* ]]; then
+	if [[ $ref == percona/* || $ref == perconalab/* ]]; then
 		printf '%s%s' "$REGISTRY_NAME_FULL" "$ref"
 		return 0
 	fi
@@ -44,14 +44,14 @@ qualify_image_var() {
 	local out=""
 	local ref
 
-	[[ -z "$val" ]] && return 0
+	[[ -z $val ]] && return 0
 
-	if [[ "$val" == *$'\n'* ]]; then
+	if [[ $val == *$'\n'* ]]; then
 		while IFS= read -r ref; do
-			[[ -z "$ref" ]] && continue
+			[[ -z $ref ]] && continue
 			out+=$(qualify_image_ref "$ref")
 			out+=$'\n'
-		done <<< "$val"
+		done <<<"$val"
 		out="${out%$'\n'}"
 		printf -v "$var" '%s' "$out"
 		return 0

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1230-oc.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 9
+  generation: 8
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-cfg-1230.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 9
+  generation: 8
   labels:
     app.kubernetes.io/component: cfg
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1230-oc.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 9
+  generation: 8
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/compare/statefulset_some-name-rs0-1230.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   annotations: {}
-  generation: 9
+  generation: 8
   labels:
     app.kubernetes.io/component: mongod
     app.kubernetes.io/instance: some-name

e2e-tests/upgrade-consistency-sharded-tls/run

@@ -93,20 +93,20 @@ main() {
 	sleep 20
 	desc 'check if Pod started'
 	wait_cluster
-	compare_generation "7" "statefulset" "${CLUSTER}-rs0"
-	compare_generation "7" "statefulset" "${CLUSTER}-cfg"
+	compare_generation "6" "statefulset" "${CLUSTER}-rs0"
+	compare_generation "6" "statefulset" "${CLUSTER}-cfg"
 
 	renew_certificate "some-name-ssl"
 	sleep 20
 	wait_cluster
-	compare_generation "8" "statefulset" "${CLUSTER}-rs0"
-	compare_generation "8" "statefulset" "${CLUSTER}-cfg"
+	compare_generation "7" "statefulset" "${CLUSTER}-rs0"
+	compare_generation "7" "statefulset" "${CLUSTER}-cfg"
 
 	renew_certificate "some-name-ssl-internal"
 	sleep 20
 	wait_cluster
-	compare_generation "9" "statefulset" "${CLUSTER}-rs0"
-	compare_generation "9" "statefulset" "${CLUSTER}-cfg"
+	compare_generation "8" "statefulset" "${CLUSTER}-rs0"
+	compare_generation "8" "statefulset" "${CLUSTER}-cfg"
 
 	desc 'check if service and statefulset created with expected config'
 	compare_kubectl service/${CLUSTER}-rs0 "-1230"

e2e-tests/upgrade-sharded/run

@@ -41,7 +41,7 @@ esac
 OPERATOR_NAME='percona-server-mongodb-operator'
 IMAGE=$(echo "${INIT_OPERATOR_IMAGES}" | jq -r '.versions[].matrix.operator[].imagePath')
 # we use the starting image from the same repo so we don't need to use initImage option
-if [[ "${TARGET_IMAGE}" == perconalab/* || "${TARGET_IMAGE}" == */perconalab/* ]]; then
+if [[ ${TARGET_IMAGE} == perconalab/* || ${TARGET_IMAGE} == */perconalab/* ]]; then
 	IMAGE="${IMAGE/percona\//perconalab\/}"
 fi
 IMAGE_MONGOD=$(echo "${INIT_OPERATOR_IMAGES}" | jq -r '.versions[].matrix.mongod[].imagePath')

e2e-tests/upgrade/run

@@ -44,7 +44,7 @@ OPERATOR_NAME='percona-server-mongodb-operator'
 
 IMAGE=$(echo "${INIT_OPERATOR_IMAGES}" | jq -r '.versions[].matrix.operator[].imagePath')
 # we use the starting image from the same repo so we don't need to use initImage option
-if [[ "${TARGET_IMAGE}" == perconalab/* || "${TARGET_IMAGE}" == */perconalab/* ]]; then
+if [[ ${TARGET_IMAGE} == perconalab/* || ${TARGET_IMAGE} == */perconalab/* ]]; then
 	IMAGE="${IMAGE/percona\//perconalab\/}"
 fi
 IMAGE_MONGOD=$(echo "${INIT_OPERATOR_IMAGES}" | jq -r '.versions[].matrix.mongod[].imagePath')

installers/olm/generate.sh

@@ -84,8 +84,8 @@ update_yaml_images() {
 		return 1
 	fi
 
-    local temp_file
-    temp_file=$(mktemp)
+	local temp_file
+	temp_file=$(mktemp)
 
 	sed -E 's/(("image":|"initImage":|containerImage:|image:|initImage:)[ ]*"?)([^"]+)("?)/\1docker.io\/\3\4/g' "$yaml_file" >"$temp_file"
 	mv "$temp_file" "$yaml_file"