From 513d3f5aab5d00cdfb77bd9eafbec0ffd1ef399d Mon Sep 17 00:00:00 2001 From: mms-build-account Date: Tue, 28 Jun 2022 07:11:52 +0100 Subject: [PATCH] Updated --- crds.yaml | 40 ----------- mongodb-enterprise-openshift.yaml | 2 +- mongodb-enterprise.yaml | 2 +- .../replica-set-configure-storage.yaml | 72 +++++++++++++++++++ .../replica-set-sts-override.yaml | 2 +- 5 files changed, 75 insertions(+), 43 deletions(-) create mode 100644 samples/mongodb_multi/replica-set-configure-storage.yaml diff --git a/crds.yaml b/crds.yaml index ef1abd0..6b2ee35 100644 --- a/crds.yaml +++ b/crds.yaml @@ -112,9 +112,6 @@ spec: x-kubernetes-preserve-unknown-fields: true configSrvPodSpec: properties: - nodeAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true persistence: properties: multiple: @@ -161,11 +158,6 @@ spec: type: string type: object type: object - podAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true - podAntiAffinityTopologyKey: - type: string podTemplate: type: object x-kubernetes-preserve-unknown-fields: true @@ -226,9 +218,6 @@ spec: type: integer mongosPodSpec: properties: - nodeAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true persistence: properties: multiple: @@ -275,11 +264,6 @@ spec: type: string type: object type: object - podAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true - podAntiAffinityTopologyKey: - type: string podTemplate: type: object x-kubernetes-preserve-unknown-fields: true @@ -296,9 +280,6 @@ spec: type: boolean podSpec: properties: - nodeAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true persistence: properties: multiple: @@ -345,11 +326,6 @@ spec: type: string type: object type: object - podAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true - podAntiAffinityTopologyKey: - type: string podTemplate: type: object x-kubernetes-preserve-unknown-fields: true @@ -624,9 +600,6 @@ spec: type: integer shardPodSpec: properties: - nodeAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true persistence: properties: multiple: @@ -673,11 +646,6 @@ spec: type: string type: object type: object - podAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true - podAntiAffinityTopologyKey: - type: string podTemplate: type: object x-kubernetes-preserve-unknown-fields: true @@ -1665,9 +1633,6 @@ spec: type: object podSpec: properties: - nodeAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true persistence: properties: multiple: @@ -1714,11 +1679,6 @@ spec: type: string type: object type: object - podAffinity: - type: object - x-kubernetes-preserve-unknown-fields: true - podAntiAffinityTopologyKey: - type: string podTemplate: type: object x-kubernetes-preserve-unknown-fields: true diff --git a/mongodb-enterprise-openshift.yaml b/mongodb-enterprise-openshift.yaml index bc14dc2..aef0c13 100644 --- a/mongodb-enterprise-openshift.yaml +++ b/mongodb-enterprise-openshift.yaml @@ -189,7 +189,7 @@ spec: serviceAccountName: mongodb-enterprise-operator containers: - name: mongodb-enterprise-operator - image: registry.connect.redhat.com/mongodb/enterprise-operator:1.16.1 + image: registry.connect.redhat.com/mongodb/enterprise-operator:1.16.2 imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/mongodb-enterprise.yaml b/mongodb-enterprise.yaml index 1b42454..2801ea0 100644 --- a/mongodb-enterprise.yaml +++ b/mongodb-enterprise.yaml @@ -192,7 +192,7 @@ spec: runAsUser: 2000 containers: - name: mongodb-enterprise-operator - image: quay.io/mongodb/mongodb-enterprise-operator:1.16.1 + image: quay.io/mongodb/mongodb-enterprise-operator:1.16.2 imagePullPolicy: Always args: - -watch-resource=mongodb diff --git a/samples/mongodb_multi/replica-set-configure-storage.yaml b/samples/mongodb_multi/replica-set-configure-storage.yaml new file mode 100644 index 0000000..e744cb0 --- /dev/null +++ b/samples/mongodb_multi/replica-set-configure-storage.yaml @@ -0,0 +1,72 @@ +# provide statefulset override per cluster +--- +apiVersion: mongodb.com/v1 +kind: MongoDBMulti +metadata: + name: multi-replica-set +spec: + version: 4.4.0-ent + type: ReplicaSet + duplicateServiceObjects: false + credentials: my-credentials + opsManager: + configMapRef: + name: my-project + clusterSpecList: + clusterSpecs: + - clusterName: cluster1.mongokubernetes.com + members: 2 + statefulSet: + spec: + template: + spec: + containers: + - name: sidecar1 + image: busybox + command: ["sleep"] + args: [ "infinity" ] + # to override the default storage size of the "data" PV + volumeClaimTemplates: + - metadata: + name: data + spec: + resources: + requests: + storage: 1Gi + - clusterName: cluster2.mongokubernetes.com + members: 1 + statefulSet: + spec: + template: + spec: + containers: + - name: sidecar2 + image: busybox + command: ["sleep"] + args: [ "infinity" ] + volumeClaimTemplates: + - metadata: + name: data + spec: + resources: + requests: + storage: 1Gi + - clusterName: cluster3.mongokubernetes.com + members: 1 + statefulSet: + spec: + template: + spec: + containers: + - name: sidecar3 + image: busybox + command: ["sleep"] + args: [ "infinity" ] + volumeClaimTemplates: + - metadata: + name: data + spec: + resources: + requests: + storage: 1Gi + \ No newline at end of file diff --git a/samples/mongodb_multi/replica-set-sts-override.yaml b/samples/mongodb_multi/replica-set-sts-override.yaml index 719cce1..420cf1a 100644 --- a/samples/mongodb_multi/replica-set-sts-override.yaml +++ b/samples/mongodb_multi/replica-set-sts-override.yaml @@ -66,4 +66,4 @@ spec: name: data spec: accessModes: [ "ReadWriteOnce" ] - storageClassName: "gp2" + storageClassName: "gp2" \ No newline at end of file