2 files changed, 21 insertions, 22 deletions
diff --git a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
index 325dbb0308..6513ee2a68 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/templates/deployment.yaml
@@ -88,5 +88,4 @@ spec:
           name: {{ include "common.fullname" . }}
       - name: artifact-data
         emptyDir: {}
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
+      {{- include "common.imagePullSecrets" . | nindent 6 }}
diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 932399e735..5c9c0ad864 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -108,14 +108,26 @@ mongodb:
     port: 27017
   auth:
     enabled: false
-  #nfsprovisionerPrefix: multicloud-k8s
-  #sdnctlPrefix: multicloud-k8s
-  #persistence:
-  #  mountSubPath: multicloud-k8s/mongo/data
-  #  enabled: true
-  #disableNfsProvisioner: true
-  flavor: &storage_flavor large
-  resources: &storage_resources
+  resources:
+    limits:
+      cpu: "2"
+      memory: "2Gi"
+    requests:
+      cpu: "500m"
+      memory: "2Gi"
+
+#etcd chart overrides for k8splugin
+etcd:
+  nameOverride: multicloud-k8s-etcd
+  service:
+    name: multicloud-k8s-etcd
+    clientPortName: tcp-etcd-client
+    peerPortName: tcp-etcd-server
+  persistence:
+    mountSubPath: multicloud-k8s/etcd/data
+    enabled: true
+  flavor: large
+  resources:
     small:
       limits:
         cpu: "100m"
@@ -132,18 +144,6 @@ mongodb:
         memory: "300Mi"
     unlimited: {}
 
-#etcd chart overrides for k8splugin
-etcd:
-  nameOverride: multicloud-k8s-etcd
-  service:
-    name: multicloud-k8s-etcd
-    clientPortName: tcp-etcd-client
-    peerPortName: tcp-etcd-server
-  persistence:
-    mountSubPath: multicloud-k8s/etcd/data
-    enabled: true
-  flavor: *storage_flavor
-  resources: *storage_resources
 
 # No persistence right now as we rely on Mongo to handle that
 persistence: