Skip to content

Commit e58583f

Browse files
jvpasinattojvpasinatto
authored
Merge pull request #1777 from percona/update-versions-1190
K8SPSMDB-1224: Update images and versions for 1.19.0 release
2 parents 7050b21 + bda7743 commit e58583f

File tree

16 files changed

+58
-46
lines changed

16 files changed

+58
-46
lines changed

‎Makefile

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,20 @@ release: manifests
106106
$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(VERSION)\"/" version/version.go
107107
$(SED) -i \
108108
-e "s/crVersion: .*/crVersion: $(VERSION)/" \
109-
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD70)#}" deploy/cr-minimal.yaml
109+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" deploy/cr-minimal.yaml
110110
$(SED) -i \
111111
-e "s/crVersion: .*/crVersion: $(VERSION)/" \
112-
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD70)#}" \
112+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" \
113113
-e "/^ backup:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKUP)#}" \
114114
-e "s#initImage: .*#initImage: percona/percona-server-mongodb-operator:$(VERSION)#g" \
115115
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
116+
$(SED) -i \
117+
-e "s|perconalab/percona-server-mongodb-operator:main-mongod7.0|$(IMAGE_MONGOD80)|g" \
118+
-e "s|perconalab/percona-server-mongodb-operator:main-backup|$(IMAGE_BACKUP)|g" \
119+
-e "s|perconalab/percona-server-mongodb-operator:main|$(IMAGE_OPERATOR)|g" \
120+
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
121+
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"${IMAGE_OPERATOR}\"|g" pkg/controller/perconaservermongodb/suite_test.go
122+
116123

117124
# Prepare main branch after release
118125
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
@@ -122,13 +129,19 @@ after-release: manifests
122129
$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(NEXT_VER)\"/" version/version.go
123130
$(SED) -i \
124131
-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
125-
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod7.0#}" deploy/cr-minimal.yaml
132+
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" deploy/cr-minimal.yaml
126133
$(SED) -i \
127134
-e "s/crVersion: .*/crVersion: $(NEXT_VER)/" \
128-
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod7.0#}" \
135+
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-mongod8.0#}" \
129136
-e "/^ backup:/,/^ image:/{s#image: .*#image: perconalab/percona-server-mongodb-operator:main-backup#}" \
130137
-e "s#initImage: .*#initImage: perconalab/percona-server-mongodb-operator:main#g" \
131138
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
139+
$(SED) -i \
140+
-e "s|$(IMAGE_MONGOD80)|perconalab/percona-server-mongodb-operator:main-mongod8.0|g" \
141+
-e "s|$(IMAGE_BACKUP)|perconalab/percona-server-mongodb-operator:main-backup|g" \
142+
-e "s|$(IMAGE_OPERATOR)|perconalab/percona-server-mongodb-operator:main|g" \
143+
pkg/controller/perconaservermongodb/testdata/reconcile-statefulset/*.yaml
144+
$(SED) -i "s|cr.Spec.InitImage = \".*\"|cr.Spec.InitImage = \"perconalab/percona-server-mongodb-operator:main\"|g" pkg/controller/perconaservermongodb/suite_test.go
132145

133146
version-service-client: swagger
134147
curl https://raw.githubusercontent.com/Percona-Lab/percona-version-service/$(VS_BRANCH)/api/version.swagger.yaml \

‎deploy/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19752,7 +19752,7 @@ spec:
1975219752
serviceAccountName: percona-server-mongodb-operator
1975319753
containers:
1975419754
- name: percona-server-mongodb-operator
19755-
image: perconalab/percona-server-mongodb-operator:main
19755+
image: percona/percona-server-mongodb-operator:1.19.0
1975619756
imagePullPolicy: Always
1975719757
livenessProbe:
1975819758
failureThreshold: 3

‎deploy/cr-minimal.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ kind: PerconaServerMongoDB
33
metadata:
44
name: minimal-cluster
55
spec:
6-
crVersion: 1.18.0
7-
image: perconalab/percona-server-mongodb-operator:main-mongod7.0
6+
crVersion: 1.19.0
7+
image: percona/percona-server-mongodb:8.0.4-1-multi
88
unsafeFlags:
99
replsetSize: true
1010
mongosSize: true

‎deploy/cr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
# unmanaged: false
1515
# enableVolumeExpansion: false
1616
crVersion: 1.19.0
17-
image: perconalab/percona-server-mongodb-operator:main-mongod7.0
17+
image: percona/percona-server-mongodb:8.0.4-1-multi
1818
imagePullPolicy: Always
1919
# tls:
2020
# mode: preferTLS
@@ -27,7 +27,7 @@ spec:
2727
# group: cert-manager.io
2828
# imagePullSecrets:
2929
# - name: private-registry-credentials
30-
# initImage: perconalab/percona-server-mongodb-operator:main
30+
# initImage: percona/percona-server-mongodb-operator:1.19.0
3131
# initContainerSecurityContext: {}
3232
# unsafeFlags:
3333
# tls: false
@@ -59,7 +59,7 @@ spec:
5959
# sse: my-cluster-name-sse
6060
pmm:
6161
enabled: false
62-
image: perconalab/pmm-client:dev-latest
62+
image: percona/pmm-client:2.44.0
6363
serverHost: monitoring-service
6464
# containerSecurityContext: {}
6565
# mongodParams: --environment=ENVIRONMENT
@@ -618,7 +618,7 @@ spec:
618618

619619
backup:
620620
enabled: true
621-
image: perconalab/percona-server-mongodb-operator:main-backup
621+
image: percona/percona-backup-mongodb:2.8.0-multi
622622
# annotations:
623623
# iam.amazonaws.com/role: role-arn
624624
# resources:

‎deploy/cw-bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19773,7 +19773,7 @@ spec:
1977319773
serviceAccountName: percona-server-mongodb-operator
1977419774
containers:
1977519775
- name: percona-server-mongodb-operator
19776-
image: perconalab/percona-server-mongodb-operator:main
19776+
image: percona/percona-server-mongodb-operator:1.19.0
1977719777
imagePullPolicy: Always
1977819778
livenessProbe:
1977919779
failureThreshold: 3

‎deploy/cw-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: percona-server-mongodb-operator
1616
containers:
1717
- name: percona-server-mongodb-operator
18-
image: perconalab/percona-server-mongodb-operator:main
18+
image: percona/percona-server-mongodb-operator:1.19.0
1919
imagePullPolicy: Always
2020
livenessProbe:
2121
failureThreshold: 3

‎deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: percona-server-mongodb-operator
1616
containers:
1717
- name: percona-server-mongodb-operator
18-
image: perconalab/percona-server-mongodb-operator:main
18+
image: percona/percona-server-mongodb-operator:1.19.0
1919
imagePullPolicy: Always
2020
livenessProbe:
2121
failureThreshold: 3

‎e2e-tests/functions

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ GIT_BRANCH=${VERSION:-$(git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]
55
API="psmdb.percona.com/v1"
66
OPERATOR_VERSION="$(grep 'crVersion' $(realpath $(dirname ${BASH_SOURCE[0]})/../deploy/cr.yaml) | awk '{print $2}')"
77
IMAGE=${IMAGE:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}"}
8-
IMAGE_MONGOD=${IMAGE_MONGOD:-"perconalab/percona-server-mongodb-operator:main-mongod7.0"}
8+
IMAGE_MONGOD=${IMAGE_MONGOD:-"perconalab/percona-server-mongodb-operator:main-mongod8.0"}
99
IMAGE_MONGOD_CHAIN=${IMAGE_MONGOD_CHAIN:-$'
10-
perconalab/percona-server-mongodb-operator:main-mongod5.0
1110
perconalab/percona-server-mongodb-operator:main-mongod6.0
1211
perconalab/percona-server-mongodb-operator:main-mongod7.0
1312
perconalab/percona-server-mongodb-operator:main-mongod8.0'}
@@ -16,7 +15,7 @@ SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
1615
PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
1716
IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
1817
IMAGE_PMM_SERVER=${IMAGE_PMM_SERVER:-"perconalab/pmm-server:dev-latest"}
19-
CERT_MANAGER_VER="1.16.1"
18+
CERT_MANAGER_VER="1.16.2"
2019
tmp_dir=$(mktemp -d)
2120
sed=$(which gsed || which sed)
2221
date=$(which gdate || which date)

‎e2e-tests/release_versions

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.18.0
2-
IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.14-8
3-
IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.17-14
4-
IMAGE_MONGOD50=percona/percona-server-mongodb:5.0.29-25
5-
IMAGE_BACKUP=percona/percona-backup-mongodb:2.6.0
6-
IMAGE_PMM_CLIENT=percona/pmm-client:2.43.2
7-
IMAGE_PMM_SERVER=percona/pmm-server:2.43.2
1+
IMAGE_OPERATOR=percona/percona-server-mongodb-operator:1.19.0
2+
IMAGE_MONGOD80=percona/percona-server-mongodb:8.0.4-1-multi
3+
IMAGE_MONGOD70=percona/percona-server-mongodb:7.0.15-9-multi
4+
IMAGE_MONGOD60=percona/percona-server-mongodb:6.0.19-16-multi
5+
IMAGE_BACKUP=percona/percona-backup-mongodb:2.8.0-multi
6+
IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
7+
IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
88
GKE_MIN=1.28
99
GKE_MAX=1.30
10-
EKS_MIN=1.28
10+
EKS_MIN=1.29
1111
EKS_MAX=1.31
1212
AKS_MIN=1.28
1313
AKS_MAX=1.31
14-
OPENSHIFT_MIN=4.13.52
15-
OPENSHIFT_MAX=4.17.3
16-
MINIKUBE_REL=1.31.0
14+
OPENSHIFT_MIN=4.14.44
15+
OPENSHIFT_MAX=4.17.11
16+
MINIKUBE_REL=1.34.0

‎pkg/controller/perconaservermongodb/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,6 @@ func readDefaultCR(name, namespace string) (*psmdbv1.PerconaServerMongoDB, error
106106

107107
cr.Name = name
108108
cr.Namespace = namespace
109-
cr.Spec.InitImage = "perconalab/percona-server-mongodb-operator:main"
109+
cr.Spec.InitImage = "percona/percona-server-mongodb-operator:1.19.0"
110110
return cr, nil
111111
}

0 commit comments

Comments
 (0)