Merge pull request #395 from percona/K8SPSMDB-1153-psmdb-1180

K8SPSMDB-1153 - Update PSMDB operator chart for 1.18.0 release

charts/psmdb-db/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.17.0"
+appVersion: "1.18.0"
 description: A Helm chart for installing Percona Server MongoDB Cluster Databases using the PSMDB Operator.
 name: psmdb-db
 home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
-version: 1.17.1
+version: 1.18.0
 maintainers:
   - name: tplavcic
     email: [email protected]

charts/psmdb-db/templates/cluster.yaml

@@ -18,6 +18,7 @@ spec:
   {{- if .Values.platform }}
   platform: {{ .Values.platform }}
   {{- end }}
+  enableVolumeExpansion: {{ .Values.enableVolumeExpansion }}
   {{- if .Values.clusterServiceDNSSuffix }}
   clusterServiceDNSSuffix: {{ .Values.clusterServiceDNSSuffix }}
   {{- end }}
@@ -115,6 +116,10 @@ spec:
     topologySpreadConstraints:
 {{ $replset.topologySpreadConstraints | toYaml | indent 6 }}
     {{- end }}
+{{- if $replset.replsetOverrides }}
+    replsetOverrides:
+{{ $replset.replsetOverrides | toYaml | indent 6 }}
+    {{- end }}
     {{- if $replset.serviceAccountName }}
     serviceAccountName: {{ $replset.serviceAccountName }}
     {{- end }}
@@ -124,6 +129,10 @@ spec:
     {{- end }}
     {{- if $replset.priorityClass }}
     priorityClassName: {{ $replset.priorityClass }}
+    {{- end }}
+    {{- if $replset.primaryPreferTagSelector }}
+    primaryPreferTagSelector: 
+{{ $replset.primaryPreferTagSelector | toYaml | indent 6 }}
     {{- end }}
     {{- if $replset.annotations }}
     annotations:
@@ -191,18 +200,27 @@ spec:
     {{- if $replset.expose }}
     expose:
       enabled: {{ $replset.expose.enabled }}
-      exposeType: {{ $replset.expose.exposeType }}
+      type: {{ $replset.expose.type }}
+      {{- if $replset.expose.loadBalancerIP }}
+      loadBalancerIP: {{ $replset.expose.loadBalancerIP }}
+      {{- end }}
       {{- if $replset.expose.loadBalancerSourceRanges }}
       loadBalancerSourceRanges:
 {{ $replset.expose.loadBalancerSourceRanges | toYaml | indent 8 }}
       {{- end }}
-      {{- if $replset.expose.serviceAnnotations }}
-      serviceAnnotations:
-{{ $replset.expose.serviceAnnotations | toYaml | indent 8 }}
+      {{- if $replset.expose.annotations }}
+      annotations:
+{{ $replset.expose.annotations | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.expose.labels }}
+      labels:
+{{ $replset.expose.labels | toYaml | indent 8 }}
+      {{- end }}
+      {{- if $replset.expose.internalTrafficPolicy }}
+      internalTrafficPolicy: {{ $replset.expose.internalTrafficPolicy }}
       {{- end }}
-      {{- if $replset.expose.serviceLabels }}
-      serviceLabels:
-{{ $replset.expose.serviceLabels | toYaml | indent 8 }}
+      {{- if $replset.expose.externalTrafficPolicy }}
+      externalTrafficPolicy: {{ $replset.expose.externalTrafficPolicy }}
       {{- end }}
     {{- end }}
     {{- if $replset.schedulerName }}
@@ -430,18 +448,27 @@ spec:
       {{- if .Values.sharding.configrs.expose }}
       expose:
         enabled: {{ .Values.sharding.configrs.expose.enabled }}
-        exposeType: {{ .Values.sharding.configrs.expose.exposeType }}
+        type: {{ .Values.sharding.configrs.expose.type }}
+        {{- if .Values.sharding.configrs.expose.loadBalancerIP }}
+        loadBalancerIP: {{ .Values.sharding.configrs.expose.loadBalancerIP }}
+        {{- end }}
         {{- if .Values.sharding.configrs.expose.loadBalancerSourceRanges }}
         loadBalancerSourceRanges:
 {{ .Values.sharding.configrs.expose.loadBalancerSourceRanges | toYaml | indent 10 }}
         {{- end }}
-        {{- if .Values.sharding.configrs.expose.serviceAnnotations }}
-        serviceAnnotations:
-{{ .Values.sharding.configrs.expose.serviceAnnotations | toYaml | indent 10 }}
+        {{- if .Values.sharding.configrs.expose.annotations }}
+        annotations:
+{{ .Values.sharding.configrs.expose.annotations | toYaml | indent 10 }}
         {{- end }}
-        {{- if .Values.sharding.configrs.expose.serviceLabels }}
-        serviceLabels:
-{{ .Values.sharding.configrs.expose.serviceLabels | toYaml | indent 10 }}
+        {{- if .Values.sharding.configrs.expose.labels }}
+        labels:
+{{ .Values.sharding.configrs.expose.labels | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.internalTrafficPolicy }}
+        internalTrafficPolicy: {{ .Values.sharding.configrs.expose.internalTrafficPolicy }}
+        {{- end }}
+        {{- if .Values.sharding.configrs.expose.externalTrafficPolicy }}
+        externalTrafficPolicy: {{ .Values.sharding.configrs.expose.externalTrafficPolicy }}
         {{- end }}
       {{- end }}
       resources:
@@ -555,21 +582,30 @@ spec:
           cpu: {{ .Values.sharding.mongos.resources.requests.cpu }}
           memory: {{ .Values.sharding.mongos.resources.requests.memory }}
       expose:
-        exposeType: {{ .Values.sharding.mongos.expose.exposeType }}
+        type: {{ .Values.sharding.mongos.expose.type }}
+        {{- if .Values.sharding.mongos.expose.loadBalancerIP }}
+        loadBalancerIP: {{ .Values.sharding.mongos.expose.loadBalancerIP }}
+        {{- end }}
         {{- if .Values.sharding.mongos.expose.servicePerPod }}
         servicePerPod: {{ .Values.sharding.mongos.expose.servicePerPod }}
         {{- end }}
         {{- if .Values.sharding.mongos.expose.loadBalancerSourceRanges }}
         loadBalancerSourceRanges:
 {{ .Values.sharding.mongos.expose.loadBalancerSourceRanges | toYaml | indent 10 }}
         {{- end }}
-        {{- if .Values.sharding.mongos.expose.serviceAnnotations }}
-        serviceAnnotations:
-{{ .Values.sharding.mongos.expose.serviceAnnotations | toYaml | indent 10 }}
+        {{- if .Values.sharding.mongos.expose.annotations }}
+        annotations:
+{{ .Values.sharding.mongos.expose.annotations | toYaml | indent 10 }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.labels }}
+        labels:
+{{ .Values.sharding.mongos.expose.labels | toYaml | indent 10 }}
         {{- end }}
-        {{- if .Values.sharding.mongos.expose.serviceLabels }}
-        serviceLabels:
-{{ .Values.sharding.mongos.expose.serviceLabels | toYaml | indent 10 }}
+        {{- if .Values.sharding.mongos.expose.internalTrafficPolicy }}
+        internalTrafficPolicy: {{ .Values.sharding.mongos.expose.internalTrafficPolicy }}
+        {{- end }}
+        {{- if .Values.sharding.mongos.expose.externalTrafficPolicy }}
+        externalTrafficPolicy: {{ .Values.sharding.mongos.expose.externalTrafficPolicy }}
         {{- end }}
         {{- if .Values.sharding.mongos.expose.nodePort }}
         nodePort: {{ .Values.sharding.mongos.expose.nodePort }}
@@ -588,6 +624,11 @@ spec:
 {{ .Values.users | toYaml | indent 2 }}
   {{- end }}
 
+  {{- if .Values.roles }}
+  roles:
+{{ .Values.roles | toYaml | indent 2 }}
+  {{- end }}
+
   backup:
     enabled: {{ .Values.backup.enabled }}
     {{- if .Values.backup.annotations }}

charts/psmdb-db/values.yaml

@@ -14,11 +14,13 @@ finalizers:
   - percona.com/delete-psmdb-pods-in-order
 ## Set this if you want to delete database persistent volumes on cluster deletion
 #  - percona.com/delete-psmdb-pvc
+## Set this if you want to delete all pitr chunks on cluster deletion
+#  - percona.com/delete-pitr-chunks
 
 nameOverride: ""
 fullnameOverride: ""
 
-crVersion: 1.17.0
+crVersion: 1.18.0
 pause: false
 unmanaged: false
 unsafeFlags:
@@ -28,6 +30,8 @@ unsafeFlags:
   terminationGracePeriod: false
   backupIfUnhealthy: false
 
+enableVolumeExpansion: false
+
 annotations: {}
 
 # ignoreAnnotations:
@@ -46,13 +50,13 @@ upgradeOptions:
 
 image:
   repository: percona/percona-server-mongodb
-  tag: 7.0.12-7
+  tag: 7.0.14-8-multi
 
 imagePullPolicy: Always
 # imagePullSecrets: []
 # initImage:
 #   repository: percona/percona-server-mongodb-operator
-#   tag: 1.17.0
+#   tag: 1.18.0
 # initContainerSecurityContext: {}
 # tls:
 #   mode: preferTLS
@@ -68,6 +72,7 @@ secrets: {}
   # If not set the operator generates the default secret with name <cluster_name>-secrets
   # users: my-cluster-name-secrets
   # encryptionKey: my-cluster-name-mongodb-encryption-key
+  # keyFile: my-cluster-name-mongodb-keyfile
   # vault: my-cluster-name-vault
   # ldapSecret: my-ldap-secret
   # sse: my-cluster-name-sse
@@ -76,7 +81,7 @@ pmm:
   enabled: false
   image:
     repository: percona/pmm-client
-    tag: 2.42.0
+    tag: 2.43.2
   serverHost: monitoring-service
 #   mongodParams: ""
 #   mongosParams: ""
@@ -108,6 +113,19 @@ replsets:
     #     maxSkew: 1
     #     topologyKey: kubernetes.io/hostname
     #     whenUnsatisfiable: DoNotSchedule
+    # replsetOverrides:
+    #   my-cluster-name-rs0-0:
+    #     host: my-cluster-name-rs0-0.example.net:27017
+    #     tags:
+    #       key: value-0
+    #   my-cluster-name-rs0-1:
+    #     host: my-cluster-name-rs0-1.example.net:27017
+    #     tags:
+    #       key: value-1
+    #   my-cluster-name-rs0-2:
+    #     host: my-cluster-name-rs0-2.example.net:27017
+    #     tags:
+    #       key: value-2
     affinity:
       antiAffinityTopologyKey: "kubernetes.io/hostname"
       # advanced:
@@ -121,6 +139,9 @@ replsets:
       #           - S1
       #       topologyKey: failure-domain.beta.kubernetes.io/zone
     # tolerations: []
+    # primaryPreferTagSelector:
+    #   region: us-west-2
+    #   zone: us-west-2c
     # priorityClass: ""
     # annotations: {}
     # labels: {}
@@ -199,13 +220,15 @@ replsets:
     #     external-2: rs0-2.mycluster2.xyz
     expose:
       enabled: false
-      exposeType: ClusterIP
+      type: ClusterIP
+      # loadBalancerIP: 10.0.0.0
       # loadBalancerSourceRanges:
       #   - 10.0.0.0/8
-      # serviceAnnotations:
+      # annotations:
       #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
-      # serviceLabels:
+      # labels:
       #   some-label: some-key
+      # internalTrafficPolicy: Local
     # schedulerName: ""
     resources:
       limits:
@@ -372,13 +395,15 @@ sharding:
       maxUnavailable: 1
     expose:
       enabled: false
-      exposeType: ClusterIP
+      type: ClusterIP
+      # loadBalancerIP: 10.0.0.0
       # loadBalancerSourceRanges:
       #   - 10.0.0.0/8
-      # serviceAnnotations:
+      # annotations:
       #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
-      # serviceLabels:
+      # labels:
       #   some-label: some-key
+      # internalTrafficPolicy: Local
     resources:
       limits:
         cpu: "300m"
@@ -408,7 +433,7 @@ sharding:
     #   - "host2"
 
   mongos:
-    size: 2
+    size: 3
     # terminationGracePeriodSeconds: 300
     # configuration: |
     #   systemLog:
@@ -463,14 +488,16 @@ sharding:
         cpu: "300m"
         memory: "0.5G"
     expose:
-      exposeType: ClusterIP
-      # servicePerPod: true
+      enabled: false
+      type: ClusterIP
+      # loadBalancerIP: 10.0.0.0/8
       # loadBalancerSourceRanges:
       #   - 10.0.0.0/8
-      # serviceAnnotations:
+      # annotations:
       #   service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
-      # serviceLabels:
+      # labels:
       #   some-label: some-key
+      # internalTrafficPolicy: Local
       # nodePort: 32017
     # auditLog:
     #   destination: file
@@ -485,7 +512,7 @@ sharding:
 # users:
 # - name: my-user
 #   db: admin
-#   passwordSecretRef: 
+#   passwordSecretRef:
 #     name: my-user-password
 #     key: my-user-password-key
 #   roles:
@@ -495,18 +522,52 @@ sharding:
 #       db: admin
 # - name: my-usr
 #   db: admin
-#   passwordSecretRef: 
+#   passwordSecretRef:
 #     name: my-user-pwd
 #     key: my-user-pwd-key
 #   roles:
 #     - name: dbOwner
-#       db: sometest 
+#       db: sometest
+
+#  roles:
+#    - role: myClusterwideAdmin
+#      db: admin
+#      privileges:
+#        - resource:
+#            cluster: true
+#          actions:
+#            - addShard
+#        - resource:
+#            db: config
+#            collection: ''
+#          actions:
+#            - find
+#            - update
+#            - insert
+#            - remove
+#      roles:
+#        - role: read
+#          db: admin
+#    - role: my-role
+#      db: myDb
+#      privileges:
+#        - resource:
+#            db: ''
+#            collection: ''
+#          actions:
+#            - find
+#      authenticationRestrictions:
+#        - clientSource:
+#            - 127.0.0.1
+#          serverAddress:
+#            - 127.0.0.1
+
 
 backup:
   enabled: true
   image:
     repository: percona/percona-backup-mongodb
-    tag: 2.5.0
+    tag: 2.7.0-multi
   # annotations:
   #   iam.amazonaws.com/role: role-arn
   # podSecurityContext: {}

charts/psmdb-operator/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.17.0"
+appVersion: "1.18.0"
 description: A Helm chart for deploying the Percona Operator for MongoDB
 name: psmdb-operator
 home: https://docs.percona.com/percona-operator-for-mongodb/
-version: 1.17.1
+version: 1.18.0
 maintainers:
   - name: tplavcic
     email: [email protected]