Skip to content

Commit 0934cee

Browse files
horshors
authored
Merge pull request #2166 from percona/release-1.18.0
2 parents 6997d68 + 4a95d93 commit 0934cee

File tree

43 files changed

+1285
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1285
-126
lines changed

‎.github/workflows/reviewdog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: check on release branch
9090
if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-') }}
9191
run: |
92-
make generate manifests VERSION="$(grep "Version" version/version.go|grep -oE "[0-9]+\.[0-9]+\.[0-9]+")" IMAGE_TAG_BASE="percona/percona-xtradb-cluster-operator"
92+
make generate manifests VERSION="$(cat pkg/version/version.txt)" IMAGE_TAG_BASE="percona/percona-xtradb-cluster-operator"
9393
git diff --exit-code
9494
- name: check on non release branches
9595
if: ${{ ! (contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-')) }}

‎deploy/bundle.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/component: crd
88
app.kubernetes.io/name: percona-xtradb-cluster
99
app.kubernetes.io/part-of: percona-xtradb-cluster-operator
10-
app.kubernetes.io/version: v1.18.0
10+
app.kubernetes.io/version: v1.19.0
1111
name: perconaxtradbclusterbackups.pxc.percona.com
1212
spec:
1313
group: pxc.percona.com
@@ -269,7 +269,7 @@ metadata:
269269
app.kubernetes.io/component: crd
270270
app.kubernetes.io/name: percona-xtradb-cluster
271271
app.kubernetes.io/part-of: percona-xtradb-cluster-operator
272-
app.kubernetes.io/version: v1.18.0
272+
app.kubernetes.io/version: v1.19.0
273273
name: perconaxtradbclusterrestores.pxc.percona.com
274274
spec:
275275
group: pxc.percona.com
@@ -680,7 +680,7 @@ metadata:
680680
app.kubernetes.io/component: crd
681681
app.kubernetes.io/name: percona-xtradb-cluster
682682
app.kubernetes.io/part-of: percona-xtradb-cluster-operator
683-
app.kubernetes.io/version: v1.18.0
683+
app.kubernetes.io/version: v1.19.0
684684
name: perconaxtradbclusters.pxc.percona.com
685685
spec:
686686
group: pxc.percona.com

‎deploy/cr-minimal.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: PerconaXtraDBCluster
33
metadata:
44
name: minimal-cluster
55
spec:
6-
crVersion: 1.18.0
6+
crVersion: 1.19.0
77
secretsName: minimal-cluster-secrets
88
unsafeFlags:
99
tls: true

‎deploy/cr.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
# annotations:
1111
# percona.com/issue-vault-token: "true"
1212
spec:
13-
crVersion: 1.18.0
13+
crVersion: 1.19.0
1414
# enableVolumeExpansion: false
1515
# ignoreAnnotations:
1616
# - iam.amazonaws.com/role

‎deploy/crd.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
app.kubernetes.io/component: crd
88
app.kubernetes.io/name: percona-xtradb-cluster
99
app.kubernetes.io/part-of: percona-xtradb-cluster-operator
10-
app.kubernetes.io/version: v1.18.0
10+
app.kubernetes.io/version: v1.19.0
1111
name: perconaxtradbclusterbackups.pxc.percona.com
1212
spec:
1313
group: pxc.percona.com
@@ -269,7 +269,7 @@ metadata:
269269
app.kubernetes.io/component: crd
270270
app.kubernetes.io/name: percona-xtradb-cluster
271271
app.kubernetes.io/part-of: percona-xtradb-cluster-operator
272-
app.kubernetes.io/version: v1.18.0
272+
app.kubernetes.io/version: v1.19.0
273273
name: perconaxtradbclusterrestores.pxc.percona.com
274274
spec:
275275
group: pxc.percona.com
@@ -680,7 +680,7 @@ metadata:
680680
app.kubernetes.io/component: crd
681681
app.kubernetes.io/name: percona-xtradb-cluster
682682
app.kubernetes.io/part-of: percona-xtradb-cluster-operator
683-
app.kubernetes.io/version: v1.18.0
683+
app.kubernetes.io/version: v1.19.0
684684
name: perconaxtradbclusters.pxc.percona.com
685685
spec:
686686
group: pxc.percona.com

‎e2e-tests/default-cr/run‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,17 @@ function main() {
7070
ADMIN_PASSWORD=$(kubectl_bin exec monitoring-0 -- bash -c "printenv | grep ADMIN_PASSWORD | cut -d '=' -f2")
7171
MONITORING_ENDPOINT=$(get_service_endpoint monitoring-service)
7272
API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key)
73+
retry=0
74+
until [[ -n $API_KEY ]]; do
75+
API_KEY=$(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys" | jq .key)
76+
sleep 5
77+
let retry+=1
78+
if [ "$retry" -ge 24 ]; then
79+
echo "Error: Failed to create PMM service account. API_KEY is empty"
80+
echo "Response: $(curl --insecure -X POST -H "Content-Type: application/json" -d '{"name":"operator", "role": "Admin"}' "https://admin:$ADMIN_PASSWORD@$MONITORING_ENDPOINT/graph/api/auth/keys")"
81+
return 1
82+
fi
83+
done
7384

7485
kubectl_bin patch secret ${cluster}-secrets --type merge --patch '{"stringData": {"pmmserverkey": '$API_KEY'}}'
7586

‎e2e-tests/demand-backup-cloud/compare/job.batch_restore-job-on-demand-backup-azure-demand-backup-cloud-k129-oc.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ spec:
8383
limits:
8484
cpu: 50m
8585
memory: 50M
86-
securityContext:
87-
privileged: true
8886
terminationMessagePath: /dev/termination-log
8987
terminationMessagePolicy: File
9088
volumeMounts:

‎e2e-tests/demand-backup-cloud/compare/job.batch_restore-job-on-demand-backup-s3-demand-backup-cloud-k127-oc.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ spec:
8686
limits:
8787
cpu: 50m
8888
memory: 50M
89-
securityContext:
90-
privileged: true
9189
terminationMessagePath: /dev/termination-log
9290
terminationMessagePolicy: File
9391
volumeMounts:

‎e2e-tests/demand-backup-cloud/compare/job.batch_restore-job-on-demand-backup-s3-demand-backup-cloud-k129-oc.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ spec:
8888
limits:
8989
cpu: 50m
9090
memory: 50M
91-
securityContext:
92-
privileged: true
9391
terminationMessagePath: /dev/termination-log
9492
terminationMessagePolicy: File
9593
volumeMounts:

‎e2e-tests/demand-backup-without-passwords/run‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@ function write_data() {
2424

2525
create_infra ${namespace}
2626
kubectl_bin apply -f ${conf_dir}/client.yml
27-
apply_config "${test_dir}/conf/${cluster}.yml"
27+
if [[ $IMAGE_PXC =~ 5\.7 ]]; then
28+
cat_config "${test_dir}/conf/${cluster}.yml" \
29+
| $sed '/\[sst\]/,+1d' \
30+
| $sed 's|compress=lz4|compress|' \
31+
| kubectl_bin apply -f -
32+
else
33+
apply_config "${test_dir}/conf/${cluster}.yml"
34+
fi
2835
wait_cluster_consistency "${cluster}" 3 2
2936
write_data
3037

@@ -33,13 +40,23 @@ run_backup "${cluster}" "backup1"
3340
log "deleting pxc/${cluster}"
3441
kubectl_bin delete pxc ${cluster}
3542

43+
# Wait till the PVCs are deleted before starting a new cluster
44+
kubectl wait pvc --selector=app.kubernetes.io/component=pxc --for=delete --timeout=360s
45+
3646
if kubectl get secret my-cluster-secrets >/dev/null 2>&1; then
3747
log "Secret exists"
3848
exit 1
3949
fi
4050

4151
log "recreating pxc/${cluster}"
42-
apply_config "${test_dir}/conf/${cluster}.yml"
52+
if [[ $IMAGE_PXC =~ 5\.7 ]]; then
53+
cat_config "${test_dir}/conf/${cluster}.yml" \
54+
| $sed '/\[sst\]/,+1d' \
55+
| $sed 's|compress=lz4|compress|' \
56+
| kubectl_bin apply -f -
57+
else
58+
apply_config "${test_dir}/conf/${cluster}.yml"
59+
fi
4360

4461
run_recovery_check "${cluster}" "backup1"
4562
wait_cluster_consistency "${cluster}" 3 2

0 commit comments

Comments
 (0)