Merge pull request #1167 from percona/K8SPS-593-add-cr-minimal

Include minimal CR to 1.0.0 release

Author: valmiranogueira

Makefile

@@ -265,6 +265,14 @@ CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\
 release: manifests
 	$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/vars.sh
 	echo $(VERSION) > pkg/version/version.txt
+	$(SED) -i \
+		-e "/^spec:/,/^  crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
+		-e "/^  mysql:/,/^    image:/{s#image: .*#image: $(IMAGE_MYSQL84)#}" \
+		-e "/^    haproxy:/,/^      image:/{s#image: .*#image: $(IMAGE_HAPROXY)#}" \
+		-e "/^    router:/,/^      image:/{s#image: .*#image: $(IMAGE_ROUTER84)#}" \
+		-e "/^  orchestrator:/,/^      image:/{s#image: .*#image: $(IMAGE_ORCHESTRATOR)#}" \
+		-e "/^  backup:/,/^    image:/{s#image: .*#image: $(IMAGE_BACKUP84)#}" \
+		deploy/cr-minimal.yaml
 	$(SED) -i \
 		-e "/^spec:/,/^  crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
 		-e "/^  mysql:/,/^    image:/{s#image: .*#image: $(IMAGE_MYSQL84)#}" \
@@ -299,6 +307,14 @@ after-release: update-version manifests
 		-e "/initContainer:/,/image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main#}" \
 		-e "/^  pmm:/,/^    image:/{s#image: .*#image: perconalab/pmm-client:3-dev-latest#}" \
 		deploy/cr.yaml
+		$(SED) -i \
+		-e "/^spec:/,/^  crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \
+		-e "/^  mysql:/,/^    image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-psmysql8.4#}" \
+		-e "/^    haproxy:/,/^      image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-haproxy#}" \
+		-e "/^    router:/,/^      image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-router8.4#}" \
+		-e "/^  orchestrator:/,/^      image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-orchestrator#}" \
+		-e "/^  backup:/,/^    image:/{s#image: .*#image: perconalab/percona-server-mysql-operator:main-backup8.4#}" \
+		deploy/cr-minimal.yaml
 	$(SED) -i \
 		-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mysql-operator:main|g" \
 		config/manager/manager.yaml config/manager/cluster/manager.yaml deploy/bundle.yaml deploy/cw-bundle.yaml deploy/operator.yaml deploy/cw-operator.yaml

build/ps-entrypoint.sh

@@ -3,6 +3,8 @@ set -eo pipefail
 shopt -s nullglob
 set -o xtrace
 
+trap "exit" SIGTERM
+
 # if command starts with an option, prepend mysqld
 if [ "${1:0:1}" = '-' ]; then
 	set -- mysqld "$@"

deploy/cr-minimal.yaml

@@ -0,0 +1,41 @@
+apiVersion: ps.percona.com/v1
+kind: PerconaServerMySQL
+metadata:
+  name: minimal-cluster
+  finalizers:
+    - percona.com/delete-mysql-pods-in-order
+spec:
+  unsafeFlags:
+    mysqlSize: true
+    proxySize: true
+  crVersion: 1.0.0
+  updateStrategy: SmartUpdate
+  upgradeOptions:
+    versionServiceEndpoint: https://check.percona.com
+    apply: disabled
+  mysql:
+    clusterType: group-replication
+    autoRecovery: true
+    image: percona/percona-server:8.4.6-6.1
+    size: 1
+    volumeSpec:
+      persistentVolumeClaim:
+        resources:
+          requests:
+            storage: 2Gi
+  orchestrator:
+    enabled: false
+    size: 3
+    image: percona/percona-orchestrator:3.2.6-18
+  proxy:
+    haproxy:
+      enabled: true
+      size: 1
+      image: percona/percona-orchestrator:3.2.6-18
+    router:
+      enabled: false
+      size: 1
+      image: percona/percona-mysql-router:8.4.6
+  backup:
+    enabled: false
+    image: percona/percona-xtrabackup:8.4.0-4.1