Skip to content

Commit 97526dd

Browse files
nmarukovichnmarukovich
authored
Merge branch 'main' into CLOUD-789-2
2 parents ce4f2e4 + 7f6cdbe commit 97526dd

File tree

85 files changed

+467
-303
lines changed

Some content is hidden

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

85 files changed

+467
-303
lines changed

‎.github/workflows/reviewdog.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: runner / suggester / golangci-lint
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v3.6.0
8+
- uses: actions/checkout@v4.1.0
99
- name: golangci-lint
1010
uses: golangci/golangci-lint-action@v3
1111
with:
@@ -17,7 +17,7 @@ jobs:
1717
name: runner / suggester / gofmt
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v3.6.0
20+
- uses: actions/checkout@v4.1.0
2121
- run: gofmt -w -s $(find . -not -path "*/vendor/*" -name "*.go")
2222
- uses: reviewdog/action-suggester@v1
2323
with:
@@ -27,7 +27,7 @@ jobs:
2727
name: runner / suggester / shfmt
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v3.6.0
30+
- uses: actions/checkout@v4.1.0
3131
- uses: actions/setup-go@v4
3232
with:
3333
go-version: '^1.17'
@@ -43,7 +43,7 @@ jobs:
4343
name: runner / shellcheck
4444
runs-on: ubuntu-latest
4545
steps:
46-
- uses: actions/checkout@v3.6.0
46+
- uses: actions/checkout@v4.1.0
4747
- uses: reviewdog/action-shellcheck@v1
4848
with:
4949
github_token: ${{ secrets.github_token }}
@@ -54,7 +54,7 @@ jobs:
5454
name: runner / misspell
5555
runs-on: ubuntu-latest
5656
steps:
57-
- uses: actions/checkout@v3.6.0
57+
- uses: actions/checkout@v4.1.0
5858
- uses: reviewdog/action-misspell@v1
5959
with:
6060
github_token: ${{ secrets.github_token }}
@@ -66,7 +66,7 @@ jobs:
6666
name: runner / alex
6767
runs-on: ubuntu-latest
6868
steps:
69-
- uses: actions/checkout@v3.6.0
69+
- uses: actions/checkout@v4.1.0
7070
- uses: reviewdog/action-alex@v1
7171
with:
7272
github_token: ${{ secrets.github_token }}

‎.github/workflows/scan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout code
9-
uses: actions/checkout@v3.6.0
9+
uses: actions/checkout@v4.1.0
1010
- name: Build an image from Dockerfile
1111
run: |
1212
export IMAGE=perconalab/percona-server-mongodb-operator:${{ github.sha }}
1313
export DOCKER_PUSH=0
1414
export DOCKER_SQUASH=0
1515
./e2e-tests/build
1616
- name: Run Trivy vulnerability scanner
17-
uses: aquasecurity/trivy-action@0.11.2
17+
uses: aquasecurity/trivy-action@0.12.0
1818
with:
1919
image-ref: 'docker.io/perconalab/percona-server-mongodb-operator:${{ github.sha }}'
2020
format: 'table'

‎.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
- uses: actions/setup-go@v4
99
with:
1010
go-version: '^1.19'
11-
- uses: actions/checkout@v3.6.0
11+
- uses: actions/checkout@v4.1.0
1212
- name: go test
1313
run: go test -v ./...

‎Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ pipeline {
244244
environment {
245245
CLOUDSDK_CORE_DISABLE_PROMPTS = 1
246246
CLEAN_NAMESPACE = 1
247+
OPERATOR_NS = 'psmdb-operator'
247248
GIT_SHORT_COMMIT = sh(script: 'git rev-parse --short HEAD', , returnStdout: true).trim()
248249
VERSION = "${env.GIT_BRANCH}-${env.GIT_SHORT_COMMIT}"
249250
CLUSTER_NAME = sh(script: "echo jen-psmdb-${env.CHANGE_ID}-${GIT_SHORT_COMMIT}-${env.BUILD_NUMBER} | tr '[:upper:]' '[:lower:]'", , returnStdout: true).trim()

‎config/crd/bases/psmdb.percona.com_perconaservermongodbbackups.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,6 @@ spec:
131131
type: string
132132
sseCustomerKey:
133133
type: string
134-
required:
135-
- kmsKeyID
136-
- sseAlgorithm
137-
- sseCustomerAlgorithm
138-
- sseCustomerKey
139134
type: object
140135
storageClass:
141136
type: string

‎config/crd/bases/psmdb.percona.com_perconaservermongodbrestores.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ spec:
101101
type: string
102102
sseCustomerKey:
103103
type: string
104-
required:
105-
- kmsKeyID
106-
- sseAlgorithm
107-
- sseCustomerAlgorithm
108-
- sseCustomerKey
109104
type: object
110105
storageClass:
111106
type: string

‎config/crd/bases/psmdb.percona.com_perconaservermongodbs.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,6 @@ spec:
268268
type: string
269269
sseCustomerKey:
270270
type: string
271-
required:
272-
- kmsKeyID
273-
- sseAlgorithm
274-
- sseCustomerAlgorithm
275-
- sseCustomerKey
276271
type: object
277272
storageClass:
278273
type: string

‎deploy/bundle.yaml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ spec:
130130
type: string
131131
sseCustomerKey:
132132
type: string
133-
required:
134-
- kmsKeyID
135-
- sseAlgorithm
136-
- sseCustomerAlgorithm
137-
- sseCustomerKey
138133
type: object
139134
storageClass:
140135
type: string
@@ -261,11 +256,6 @@ spec:
261256
type: string
262257
sseCustomerKey:
263258
type: string
264-
required:
265-
- kmsKeyID
266-
- sseAlgorithm
267-
- sseCustomerAlgorithm
268-
- sseCustomerKey
269259
type: object
270260
storageClass:
271261
type: string
@@ -909,11 +899,6 @@ spec:
909899
type: string
910900
sseCustomerKey:
911901
type: string
912-
required:
913-
- kmsKeyID
914-
- sseAlgorithm
915-
- sseCustomerAlgorithm
916-
- sseCustomerKey
917902
type: object
918903
storageClass:
919904
type: string
@@ -17464,10 +17449,13 @@ rules:
1746417449
resources:
1746517450
- perconaservermongodbs
1746617451
- perconaservermongodbs/status
17452+
- perconaservermongodbs/finalizers
1746717453
- perconaservermongodbbackups
1746817454
- perconaservermongodbbackups/status
17455+
- perconaservermongodbbackups/finalizers
1746917456
- perconaservermongodbrestores
1747017457
- perconaservermongodbrestores/status
17458+
- perconaservermongodbrestores/finalizers
1747117459
verbs:
1747217460
- get
1747317461
- list

‎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.15.0
7-
image: percona/percona-server-mongodb:6.0.4-3
6+
crVersion: 1.16.0
7+
image: perconalab/percona-server-mongodb-operator:main-mongod6.0
88
allowUnsafeConfigurations: true
99
upgradeOptions:
1010
apply: disabled

‎deploy/cr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ spec:
1111
# clusterServiceDNSMode: "Internal"
1212
# pause: true
1313
# unmanaged: false
14-
crVersion: 1.15.0
15-
image: percona/percona-server-mongodb:6.0.4-3
14+
crVersion: 1.16.0
15+
image: perconalab/percona-server-mongodb-operator:main-mongod6.0
1616
imagePullPolicy: Always
1717
# tls:
1818
# # 90 days in hours
@@ -41,7 +41,7 @@ spec:
4141
# vault: my-cluster-name-vault
4242
pmm:
4343
enabled: false
44-
image: percona/pmm-client:2.35.0
44+
image: perconalab/pmm-client:dev-latest
4545
serverHost: monitoring-service
4646
# mongodParams: --environment=ENVIRONMENT
4747
# mongosParams: --environment=ENVIRONMENT
@@ -519,7 +519,7 @@ spec:
519519
# credentialsSecret: my-cluster-name-backup-s3
520520
# serverSideEncryption:
521521
# kmsKeyID: 1234abcd-12ab-34cd-56ef-1234567890ab
522-
# sseAlgorithm: AES256
522+
# sseAlgorithm: aws:kms
523523
# sseCustomerAlgorithm: AES256
524524
# sseCustomerKey: Y3VzdG9tZXIta2V5
525525
# region: us-west-2

0 commit comments

Comments
 (0)