Skip to content

Commit 07f1be6

Browse files
pooknullpooknull
authored
Merge branch 'main' into K8SPSMDB-1296
2 parents 40b7674 + c35de73 commit 07f1be6

File tree

82 files changed

+3891
-456
lines changed

Some content is hidden

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

82 files changed

+3891
-456
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ help: ## Display this help.
1414
@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
1515

1616
generate: controller-gen ## Generate CRDs and RBAC files
17+
go generate ./...
1718
$(CONTROLLER_GEN) crd:maxDescLen=0,allowDangerousTypes=true rbac:roleName=$(NAME) webhook paths="./..." output:crd:artifacts:config=config/crd/bases ## Generate WebhookConfiguration, Role and CustomResourceDefinition objects.
1819
$(CONTROLLER_GEN) object paths="./..." ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
1920

‎cmd/mongodb-healthcheck/logger/logger.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"gopkg.in/natefinch/lumberjack.v2"
1414
"sigs.k8s.io/controller-runtime/pkg/log/zap"
1515

16-
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb"
16+
"github.com/percona/percona-server-mongodb-operator/pkg/psmdb/config"
1717
)
1818

1919
type Logger struct {
@@ -22,7 +22,7 @@ type Logger struct {
2222
}
2323

2424
func New() *Logger {
25-
logPath := filepath.Join(psmdb.MongodDataVolClaimName, "logs", "mongodb-healthcheck.log")
25+
logPath := filepath.Join(config.MongodDataVolClaimName, "logs", "mongodb-healthcheck.log")
2626

2727
return newLogger(logPath)
2828
}

‎config/crd/kustomization.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ resources:
77
- bases/psmdb.percona.com_perconaservermongodbs.yaml
88
#+kubebuilder:scaffold:crdkustomizeresource
99

10+
patchesStrategicMerge:
11+
- patches/versionlabel_in_psmdb.yaml
12+
- patches/versionlabel_in_psmdbbackup.yaml
13+
- patches/versionlabel_in_psmdbrestore.yaml
14+
1015
patches:
1116
- path: patches/deprecated-1.2.json
1217
target:

‎config/crd/patches/versionlabel_in_psmdb.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconaservermongodbs.psmdb.percona.com
5+
labels:
6+
app.kubernetes.io/name: percona-server-mongodb
7+
app.kubernetes.io/version: v1.21.0
8+
app.kubernetes.io/component: crd
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎config/crd/patches/versionlabel_in_psmdbbackup.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconaservermongodbbackups.psmdb.percona.com
5+
labels:
6+
app.kubernetes.io/name: percona-server-mongodb
7+
app.kubernetes.io/version: v1.21.0
8+
app.kubernetes.io/component: crd
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎config/crd/patches/versionlabel_in_psmdbrestore.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: perconaservermongodbrestores.psmdb.percona.com
5+
labels:
6+
app.kubernetes.io/name: percona-server-mongodb
7+
app.kubernetes.io/version: v1.21.0
8+
app.kubernetes.io/component: crd
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator

‎deploy/bundle.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.16.3
6+
labels:
7+
app.kubernetes.io/component: crd
8+
app.kubernetes.io/name: percona-server-mongodb
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator
10+
app.kubernetes.io/version: v1.21.0
611
name: perconaservermongodbbackups.psmdb.percona.com
712
spec:
813
group: psmdb.percona.com
@@ -189,6 +194,11 @@ kind: CustomResourceDefinition
189194
metadata:
190195
annotations:
191196
controller-gen.kubebuilder.io/version: v0.16.3
197+
labels:
198+
app.kubernetes.io/component: crd
199+
app.kubernetes.io/name: percona-server-mongodb
200+
app.kubernetes.io/part-of: percona-server-mongodb-operator
201+
app.kubernetes.io/version: v1.21.0
192202
name: perconaservermongodbrestores.psmdb.percona.com
193203
spec:
194204
group: psmdb.percona.com
@@ -383,6 +393,11 @@ kind: CustomResourceDefinition
383393
metadata:
384394
annotations:
385395
controller-gen.kubebuilder.io/version: v0.16.3
396+
labels:
397+
app.kubernetes.io/component: crd
398+
app.kubernetes.io/name: percona-server-mongodb
399+
app.kubernetes.io/part-of: percona-server-mongodb-operator
400+
app.kubernetes.io/version: v1.21.0
386401
name: perconaservermongodbs.psmdb.percona.com
387402
spec:
388403
group: psmdb.percona.com

‎deploy/cr-minimal.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: minimal-cluster
55
spec:
66
crVersion: 1.20.0
7-
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
7+
image: percona/percona-server-mongodb:7.0.18-11
88
unsafeFlags:
99
replsetSize: true
1010
mongosSize: true

‎deploy/cr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
# unmanaged: false
1515
# enableVolumeExpansion: false
1616
crVersion: 1.20.0
17-
image: perconalab/percona-server-mongodb-operator:main-mongod8.0
17+
image: percona/percona-server-mongodb:7.0.18-11
1818
imagePullPolicy: Always
1919
# tls:
2020
# mode: preferTLS
@@ -27,7 +27,7 @@ spec:
2727
# group: cert-manager.io
2828
# imagePullSecrets:
2929
# - name: private-registry-credentials
30-
# initImage: perconalab/percona-server-mongodb-operator:main
30+
# initImage: percona/percona-server-mongodb-operator:1.20.0
3131
# initContainerSecurityContext: {}
3232
# unsafeFlags:
3333
# tls: false
@@ -59,7 +59,7 @@ spec:
5959
# sse: my-cluster-name-sse
6060
pmm:
6161
enabled: false
62-
image: perconalab/pmm-client:dev-latest
62+
image: percona/pmm-client:2.44.1
6363
serverHost: monitoring-service
6464
# containerSecurityContext: {}
6565
# customClusterName: mongo-cluster
@@ -622,7 +622,7 @@ spec:
622622

623623
backup:
624624
enabled: true
625-
image: perconalab/percona-server-mongodb-operator:main-backup
625+
image: percona/percona-backup-mongodb:2.9.1
626626
# annotations:
627627
# iam.amazonaws.com/role: role-arn
628628
# resources:

‎deploy/crd.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ kind: CustomResourceDefinition
33
metadata:
44
annotations:
55
controller-gen.kubebuilder.io/version: v0.16.3
6+
labels:
7+
app.kubernetes.io/component: crd
8+
app.kubernetes.io/name: percona-server-mongodb
9+
app.kubernetes.io/part-of: percona-server-mongodb-operator
10+
app.kubernetes.io/version: v1.21.0
611
name: perconaservermongodbbackups.psmdb.percona.com
712
spec:
813
group: psmdb.percona.com
@@ -189,6 +194,11 @@ kind: CustomResourceDefinition
189194
metadata:
190195
annotations:
191196
controller-gen.kubebuilder.io/version: v0.16.3
197+
labels:
198+
app.kubernetes.io/component: crd
199+
app.kubernetes.io/name: percona-server-mongodb
200+
app.kubernetes.io/part-of: percona-server-mongodb-operator
201+
app.kubernetes.io/version: v1.21.0
192202
name: perconaservermongodbrestores.psmdb.percona.com
193203
spec:
194204
group: psmdb.percona.com
@@ -383,6 +393,11 @@ kind: CustomResourceDefinition
383393
metadata:
384394
annotations:
385395
controller-gen.kubebuilder.io/version: v0.16.3
396+
labels:
397+
app.kubernetes.io/component: crd
398+
app.kubernetes.io/name: percona-server-mongodb
399+
app.kubernetes.io/part-of: percona-server-mongodb-operator
400+
app.kubernetes.io/version: v1.21.0
386401
name: perconaservermongodbs.psmdb.percona.com
387402
spec:
388403
group: psmdb.percona.com

0 commit comments

Comments
 (0)