Skip to content

Commit 25a08b6

Browse files
horshors
authored
Merge branch 'main' into dependabot/github_actions/docker/setup-buildx-action-4
2 parents dfba86b + cd594ce commit 25a08b6

31 files changed

Lines changed: 128 additions & 137 deletions

‎.github/ISSUE_TEMPLATE/1-feature-request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Feature request 🧭
22
description: Suggest an idea for this project
3-
labels: "feature-request"
3+
labels: ["feature-request", "Proposed", "PG"]
44
body:
55
- type: textarea
66
attributes:

‎Jenkinsfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ pipeline {
415415
AUTHOR_NAME = sh(script: "echo ${CHANGE_AUTHOR_EMAIL} | awk -F'@' '{print \$1}'", , returnStdout: true).trim()
416416
}
417417
agent {
418-
label 'docker'
418+
label 'docker-x64-min'
419419
}
420420
options {
421421
disableConcurrentBuilds(abortPrevious: true)
@@ -535,7 +535,7 @@ pipeline {
535535
parallel {
536536
stage('cluster1') {
537537
agent {
538-
label 'docker'
538+
label 'docker-x64-min'
539539
}
540540
steps {
541541
prepareNode()
@@ -545,7 +545,7 @@ pipeline {
545545
}
546546
stage('cluster2') {
547547
agent {
548-
label 'docker'
548+
label 'docker-x64-min'
549549
}
550550
steps {
551551
prepareNode()
@@ -555,7 +555,7 @@ pipeline {
555555
}
556556
stage('cluster3') {
557557
agent {
558-
label 'docker'
558+
label 'docker-x64-min'
559559
}
560560
steps {
561561
prepareNode()
@@ -565,7 +565,7 @@ pipeline {
565565
}
566566
stage('cluster4') {
567567
agent {
568-
label 'docker'
568+
label 'docker-x64-min'
569569
}
570570
steps {
571571
prepareNode()

‎Makefile‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,22 +448,24 @@ update-version:
448448

449449
# Prepare release
450450
PG_VER ?= $(shell grep -o "postgresVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+")
451+
CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
451452
include e2e-tests/release_versions
452453
release: generate
454+
$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/functions
453455
$(SED) -i \
454456
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
455-
-e "/^spec:/,/^ image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
457+
-e "/^spec:/,/^ image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \
456458
-e "s| image: docker.io/perconalab/percona-postgresql-operator:main| image: $(IMAGE)|" \
457-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
458-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" \
459+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \
460+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" \
459461
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \
460462
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
461463
$(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
462464
$(SED) -i \
463465
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_UPGRADE)#}" \
464-
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
465-
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
466-
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" deploy/upgrade.yaml
466+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \
467+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \
468+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" deploy/upgrade.yaml
467469

468470
# Prepare main branch after release
469471
CURRENT_VERSION := $(shell grep -oE "crVersion: [0-9]+\.[0-9]+\.[0-9]+" deploy/cr.yaml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9775,10 +9775,9 @@ spec:
97759775
https://k8s.io/docs/concepts/workloads/controllers/cron-jobs/#cron-schedule-syntax
97769776
minLength: 6
97779777
type: string
9778+
required:
9779+
- className
97789780
type: object
9779-
x-kubernetes-validations:
9780-
- message: className is required
9781-
rule: has(self.className) && self.className != ""
97829781
type: object
97839782
x-kubernetes-validations:
97849783
- message: At least one repository must be configured when backups

‎config/crd/bases/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10470,10 +10470,9 @@ spec:
1047010470
https://k8s.io/docs/concepts/workloads/controllers/cron-jobs/#cron-schedule-syntax
1047110471
minLength: 6
1047210472
type: string
10473+
required:
10474+
- className
1047310475
type: object
10474-
x-kubernetes-validations:
10475-
- message: className is required
10476-
rule: has(self.className) && self.className != ""
1047710476
type: object
1047810477
x-kubernetes-validations:
1047910478
- message: At least one repository must be configured when backups

‎config/crd/patches/versionlabel_in_perconapgbackups.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgbackups.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎config/crd/patches/versionlabel_in_perconapgclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgclusters.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎config/crd/patches/versionlabel_in_perconapgrestores.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgrestores.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎config/crd/patches/versionlabel_in_perconapgupgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgupgrades.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎deploy/bundle.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.20.0
299299
labels:
300-
pgv2.percona.com/version: v2.9.0
300+
pgv2.percona.com/version: v2.10.0
301301
name: perconapgbackups.pgv2.percona.com
302302
spec:
303303
group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
995995
annotations:
996996
controller-gen.kubebuilder.io/version: v0.20.0
997997
labels:
998-
pgv2.percona.com/version: v2.9.0
998+
pgv2.percona.com/version: v2.10.0
999999
name: perconapgclusters.pgv2.percona.com
10001000
spec:
10011001
group: pgv2.percona.com
@@ -10767,10 +10767,9 @@ spec:
1076710767
https://k8s.io/docs/concepts/workloads/controllers/cron-jobs/#cron-schedule-syntax
1076810768
minLength: 6
1076910769
type: string
10770+
required:
10771+
- className
1077010772
type: object
10771-
x-kubernetes-validations:
10772-
- message: className is required
10773-
rule: has(self.className) && self.className != ""
1077410773
type: object
1077510774
x-kubernetes-validations:
1077610775
- message: At least one repository must be configured when backups
@@ -30141,7 +30140,7 @@ metadata:
3014130140
annotations:
3014230141
controller-gen.kubebuilder.io/version: v0.20.0
3014330142
labels:
30144-
pgv2.percona.com/version: v2.9.0
30143+
pgv2.percona.com/version: v2.10.0
3014530144
name: perconapgrestores.pgv2.percona.com
3014630145
spec:
3014730146
group: pgv2.percona.com
@@ -30463,7 +30462,7 @@ metadata:
3046330462
annotations:
3046430463
controller-gen.kubebuilder.io/version: v0.20.0
3046530464
labels:
30466-
pgv2.percona.com/version: v2.9.0
30465+
pgv2.percona.com/version: v2.10.0
3046730466
name: perconapgupgrades.pgv2.percona.com
3046830467
spec:
3046930468
group: pgv2.percona.com

0 commit comments

Comments
 (0)