Skip to content

Commit b59df33

Browse files
eleo007eleo007
committed
Fix conflicts with main
2 parents d86c8fa + 5c84ff3 commit b59df33

File tree

20 files changed

+242
-156
lines changed

20 files changed

+242
-156
lines changed

‎.github/workflows/reviewdog.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ jobs:
88
- uses: actions/setup-go@v6
99
with:
1010
go-version: '^1.25.1'
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
- name: golangci-lint
13-
uses: golangci/golangci-lint-action@v8
13+
uses: golangci/golangci-lint-action@v9
1414
with:
1515
version: latest
1616
only-new-issues: true
@@ -20,7 +20,7 @@ jobs:
2020
name: runner / suggester / goimports-reviser
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
- uses: actions/setup-go@v6
2525
with:
2626
go-version: '^1.25.1'
@@ -34,7 +34,7 @@ jobs:
3434
name: runner / suggester / gofmt
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838
- run: gofmt -w -s $(find . -not -path "*/vendor/*" -name "*.go")
3939
- uses: reviewdog/action-suggester@v1
4040
with:
@@ -44,7 +44,7 @@ jobs:
4444
name: runner / suggester / shfmt
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@v5
47+
- uses: actions/checkout@v6
4848
- uses: actions/setup-go@v6
4949
with:
5050
go-version: '^1.25.1'
@@ -60,7 +60,7 @@ jobs:
6060
name: runner / shellcheck
6161
runs-on: ubuntu-latest
6262
steps:
63-
- uses: actions/checkout@v5
63+
- uses: actions/checkout@v6
6464
- uses: reviewdog/action-shellcheck@v1
6565
with:
6666
github_token: ${{ secrets.github_token }}
@@ -70,7 +70,7 @@ jobs:
7070
name: runner / misspell
7171
runs-on: ubuntu-latest
7272
steps:
73-
- uses: actions/checkout@v5
73+
- uses: actions/checkout@v6
7474
- uses: reviewdog/action-misspell@v1
7575
with:
7676
github_token: ${{ secrets.github_token }}
@@ -81,7 +81,7 @@ jobs:
8181
name: runner / alex
8282
runs-on: ubuntu-latest
8383
steps:
84-
- uses: actions/checkout@v5
84+
- uses: actions/checkout@v6
8585
- uses: reviewdog/action-alex@v1
8686
with:
8787
github_token: ${{ secrets.github_token }}
@@ -92,14 +92,14 @@ jobs:
9292
name: runner / manifests
9393
runs-on: ubuntu-latest
9494
steps:
95-
- uses: actions/checkout@v5
95+
- uses: actions/checkout@v6
9696
- name: check on release branch
97-
if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-') }}
97+
if: ${{ contains(github.base_ref, 'release-') }}
9898
run: |
9999
make generate VERSION="$(cat percona/version/version.txt)" IMAGE_TAG_BASE="percona/percona-postgresql-operator"
100100
git diff --exit-code
101101
- name: check on non release branches
102-
if: ${{ ! (contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-')) }}
102+
if: ${{ ! contains(github.base_ref, 'release-') }}
103103
run: |
104104
make generate VERSION=main
105105
git diff --exit-code

‎.github/workflows/scan.yml‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

1919
- name: Set up QEMU
2020
uses: docker/setup-qemu-action@v3
@@ -30,16 +30,13 @@ jobs:
3030
export DOCKER_DEFAULT_PLATFORM='linux/arm64'
3131
make build-docker-image
3232
33-
- name: Run Trivy vulnerability scanner image (linux/arm64)
34-
uses: aquasecurity/[email protected]
33+
- name: Run Snyk vulnerability scanner image (linux/arm64)
34+
uses: snyk/actions/docker@master
35+
env:
36+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
3537
with:
36-
image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
37-
format: 'table'
38-
exit-code: '1'
39-
ignore-unfixed: true
40-
vuln-type: 'os,library'
41-
severity: 'CRITICAL,HIGH'
42-
version: 'v0.57.1'
38+
image: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
39+
args: --platform=linux/arm64 --severity-threshold=high --exclude-base-image-vulns --file=./build/postgres-operator/Dockerfile -fail-on=upgradable
4340

4441
- name: Build an image from Dockerfile (linux/amd64)
4542
run: |
@@ -49,13 +46,11 @@ jobs:
4946
export DOCKER_DEFAULT_PLATFORM='linux/amd64'
5047
make build-docker-image
5148
52-
- name: Run Trivy vulnerability scanner image (linux/amd64)
53-
uses: aquasecurity/[email protected]
49+
- name: Run Snyk vulnerability scanner image (linux/amd64)
50+
uses: snyk/actions/docker@master
51+
env:
52+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
5453
with:
55-
image-ref: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
56-
format: 'table'
57-
exit-code: '1'
58-
ignore-unfixed: true
59-
vuln-type: 'os,library'
60-
severity: 'CRITICAL,HIGH'
61-
version: 'v0.57.1'
54+
image: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
55+
args: --platform=linux/amd64 --severity-threshold=high --exclude-base-image-vulns --file=./build/postgres-operator/Dockerfile -fail-on=upgradable
56+

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Clone the code
9-
uses: actions/checkout@v5
9+
uses: actions/checkout@v6
1010
- name: Setup Go
1111
uses: actions/setup-go@v6
1212
with:
1313
go-version: '^1.25.1'
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- name: Basic tests
1616
run: make check
1717
- name: envtest

‎build/postgres-operator/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN mkdir -p build/_output/bin \
4545
RUN ./bin/license_aggregator.sh ./cmd/...; \
4646
cp -r ./licenses /licenses
4747

48-
FROM registry.access.redhat.com/ubi9/ubi-minimal AS ubi9
48+
FROM registry.access.redhat.com/ubi10/ubi-minimal AS ubi10
4949
RUN microdnf update -y && microdnf clean all -y
5050

5151
LABEL name="Percona Postgres Operator" \

‎config/bundle/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
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
9+
newName: docker.io/perconalab/percona-postgresql-operator
1010
newTag: main

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22859,7 +22859,7 @@ spec:
2285922859
type: object
2286022860
fromPostgresVersion:
2286122861
description: The major version of PostgreSQL before the upgrade.
22862-
maximum: 16
22862+
maximum: 17
2286322863
minimum: 12
2286422864
type: integer
2286522865
image:

‎config/cw-bundle/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ resources:
77

88
images:
99
- name: postgres-operator
10-
newName: docker.io/percona/percona-postgresql-operator
10+
newName: docker.io/perconalab/percona-postgresql-operator
1111
newTag: main

‎config/manager/cluster/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ patchesStrategicMerge:
88

99
images:
1010
- name: postgres-operator
11-
newName: docker.io/percona/percona-postgresql-operator
11+
newName: docker.io/perconalab/percona-postgresql-operator
1212
newTag: main

‎config/manager/namespace/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ patchesStrategicMerge:
99

1010
images:
1111
- name: postgres-operator
12-
newName: docker.io/percona/percona-postgresql-operator
12+
newName: docker.io/perconalab/percona-postgresql-operator
1313
newTag: main

‎deploy/bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23160,7 +23160,7 @@ spec:
2316023160
type: object
2316123161
fromPostgresVersion:
2316223162
description: The major version of PostgreSQL before the upgrade.
23163-
maximum: 16
23163+
maximum: 17
2316423164
minimum: 12
2316523165
type: integer
2316623166
image:

0 commit comments

Comments
 (0)