Skip to content

Commit 992ca34

Browse files
authored
Merge branch 'main' into test-upgrade-290
2 parents 287b75b + cbe031e commit 992ca34

33 files changed

+96
-101
lines changed

.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:

.github/workflows/scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
uses: actions/checkout@v6
1818

1919
- name: Set up QEMU
20-
uses: docker/setup-qemu-action@v3
20+
uses: docker/setup-qemu-action@v4
2121

2222
- name: Set up Docker Buildx
23-
uses: docker/setup-buildx-action@v3
23+
uses: docker/setup-buildx-action@v4
2424

2525
- name: Build an image from Dockerfile (linux/arm64)
2626
run: |

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()

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/bundle/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ resources:
66
- ../manager/namespace
77
images:
88
- name: postgres-operator
9-
newName: docker.io/percona/percona-postgresql-operator
10-
newTag: 2.9.0
9+
newName: docker.io/perconalab/percona-postgresql-operator
10+
newTag: main

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

0 commit comments

Comments
 (0)