From e45cf08c3e492d8f847b739062acf99dd1f9385c Mon Sep 17 00:00:00 2001
From: Todd Malsbary <todd.malsbary@intel.com>
Date: Mon, 16 Aug 2021 16:54:09 -0700
Subject: [PATCH] Add resources field to all addon charts

Issue-ID: MULTICLOUD-1324
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I3193fb5983394c6ac9a95dffaaa36074f07cacf6
---
 kud/deployment_infra/helm/cdi-operator/templates/deployment.yaml        | 2 ++
 kud/deployment_infra/helm/cpu-manager/templates/webhook.yaml            | 2 ++
 kud/deployment_infra/helm/node-feature-discovery/templates/worker.yaml  | 2 +-
 kud/deployment_infra/helm/ovn4nfv/templates/deployment.yaml             | 2 ++
 kud/deployment_infra/helm/ovn4nfv/values.yaml                           | 2 ++
 .../helm/sriov-network-operator/templates/operator.yaml                 | 2 ++
 kud/deployment_infra/helm/sriov-network-operator/values.yaml            | 2 ++
 7 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/kud/deployment_infra/helm/cdi-operator/templates/deployment.yaml b/kud/deployment_infra/helm/cdi-operator/templates/deployment.yaml
index 3010d6e7..dc924a16 100644
--- a/kud/deployment_infra/helm/cdi-operator/templates/deployment.yaml
+++ b/kud/deployment_infra/helm/cdi-operator/templates/deployment.yaml
@@ -66,5 +66,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 6 }}
       {{- end }}
+      resources:
+        {{- toYaml .Values.resources | nindent 8 }}
       securityContext:
         {{- toYaml .Values.securityContext | nindent 8 }}
diff --git a/kud/deployment_infra/helm/cpu-manager/templates/webhook.yaml b/kud/deployment_infra/helm/cpu-manager/templates/webhook.yaml
index 62e9fdbf..a857e3e7 100644
--- a/kud/deployment_infra/helm/cpu-manager/templates/webhook.yaml
+++ b/kud/deployment_infra/helm/cpu-manager/templates/webhook.yaml
@@ -112,6 +112,8 @@ spec:
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: cmk-webhook
+        resources:
+          {{- toYaml .Values.resources | nindent 10 }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
         volumeMounts:
diff --git a/kud/deployment_infra/helm/node-feature-discovery/templates/worker.yaml b/kud/deployment_infra/helm/node-feature-discovery/templates/worker.yaml
index 998a0686..0cf542b3 100644
--- a/kud/deployment_infra/helm/node-feature-discovery/templates/worker.yaml
+++ b/kud/deployment_infra/helm/node-feature-discovery/templates/worker.yaml
@@ -37,7 +37,7 @@ spec:
             fieldRef:
               fieldPath: spec.nodeName
         resources:
-        {{- toYaml .Values.worker.resources | nindent 12 }}
+          {{- toYaml .Values.worker.resources | nindent 10 }}
         command:
         - "nfd-worker"
         args:
diff --git a/kud/deployment_infra/helm/ovn4nfv/templates/deployment.yaml b/kud/deployment_infra/helm/ovn4nfv/templates/deployment.yaml
index 7613fef5..828f385c 100644
--- a/kud/deployment_infra/helm/ovn4nfv/templates/deployment.yaml
+++ b/kud/deployment_infra/helm/ovn4nfv/templates/deployment.yaml
@@ -53,3 +53,5 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: "nfn-operator"
+          resources:
+            {{- toYaml .Values.nfnOperator.resources | nindent 12 }}
diff --git a/kud/deployment_infra/helm/ovn4nfv/values.yaml b/kud/deployment_infra/helm/ovn4nfv/values.yaml
index 2addb6d9..93de002b 100644
--- a/kud/deployment_infra/helm/ovn4nfv/values.yaml
+++ b/kud/deployment_infra/helm/ovn4nfv/values.yaml
@@ -106,6 +106,8 @@ nfnOperator:
     type: NodePort
     port: 50000
 
+  resources: {}
+
 ovn:
   image:
     repository: docker.io/integratedcloudnative/ovn-images
diff --git a/kud/deployment_infra/helm/sriov-network-operator/templates/operator.yaml b/kud/deployment_infra/helm/sriov-network-operator/templates/operator.yaml
index 679ed269..b0ed7675 100644
--- a/kud/deployment_infra/helm/sriov-network-operator/templates/operator.yaml
+++ b/kud/deployment_infra/helm/sriov-network-operator/templates/operator.yaml
@@ -75,6 +75,8 @@ spec:
               value: "4.3.0"
             - name: SRIOV_CNI_BIN_PATH
               value: "/opt/cni/bin"
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/kud/deployment_infra/helm/sriov-network-operator/values.yaml b/kud/deployment_infra/helm/sriov-network-operator/values.yaml
index 59f257e4..fe29180a 100644
--- a/kud/deployment_infra/helm/sriov-network-operator/values.yaml
+++ b/kud/deployment_infra/helm/sriov-network-operator/values.yaml
@@ -37,6 +37,8 @@ fullnameOverride: ""
 nodeSelector:
   node-role.kubernetes.io/master: ""
 
+resources: {}
+
 affinity: {}
 
 tolerations:
-- 
2.16.6