aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitu Sood <ritu.sood@intel.com>2021-08-25 20:10:12 +0000
committerGerrit Code Review <gerrit@onap.org>2021-08-25 20:10:12 +0000
commit3ed06b3322c464214bb4d3ffebc8a91b0c915a5c (patch)
treed276bef37580b8b59c01808161e78f7771569ccf
parent33ca2d0552a329248f29a189dfda5646a9755a41 (diff)
parente45cf08c3e492d8f847b739062acf99dd1f9385c (diff)
Merge "Add resources field to all addon charts"
-rw-r--r--kud/deployment_infra/helm/cdi-operator/templates/deployment.yaml2
-rw-r--r--kud/deployment_infra/helm/cpu-manager/templates/webhook.yaml2
-rw-r--r--kud/deployment_infra/helm/node-feature-discovery/templates/worker.yaml2
-rw-r--r--kud/deployment_infra/helm/ovn4nfv/templates/deployment.yaml2
-rw-r--r--kud/deployment_infra/helm/ovn4nfv/values.yaml2
-rw-r--r--kud/deployment_infra/helm/sriov-network-operator/templates/operator.yaml2
-rw-r--r--kud/deployment_infra/helm/sriov-network-operator/values.yaml2
7 files changed, 13 insertions, 1 deletions
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: