Merge pull request #728 from fengxsong/feat_support_extradeploy

feat: support extraDeploy field in helm chart
k8snetworkplumbingwg · Jul 3, 2024 · 55c55e1 · 55c55e1
2 parents 50d436d + bf051df
commit 55c55e1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/deployment/sriov-network-operator-chart/README.md b/deployment/sriov-network-operator-chart/README.md
@@ -144,3 +144,13 @@ This section contains general parameters that apply to both the operator and dae
 | `images.webhook` | Operator Webhook image |
 | `images.metricsExporter` | Network Metrics Exporter image |
 | `images.metricsExporterKubeRbacProxy` | Kube RBAC Proxy image used for metrics exporter |
+
+### Extra objects parameters
+
+**Disclaimer**:
+
+Please note that any resources deployed using the `extraDeploy` in this Helm chart are the sole responsibility of the user. It is important to review and understand the implications of these deployed resources. The maintainers of this Helm chart take no responsibility for any issues or damages caused by the deployment or operation of these resources.
+
+| Name | description |
+| ---- | ------------|
+|`extraDeploy`| Array of extra objects to deploy with the release |
diff --git a/deployment/sriov-network-operator-chart/templates/extra-list.yaml b/deployment/sriov-network-operator-chart/templates/extra-list.yaml
@@ -0,0 +1,8 @@
+{{- range .Values.extraDeploy }}
+---
+{{- if typeIs "string" . }}
+  {{- tpl . $ }}
+{{- else }}
+  {{- tpl (. | toYaml) $ }}
+{{- end }}
+{{- end }}
diff --git a/deployment/sriov-network-operator-chart/templates/operator.yaml b/deployment/sriov-network-operator-chart/templates/operator.yaml
@@ -70,8 +70,6 @@ spec:
               value: {{ .Values.images.webhook }}
             - name: METRICS_EXPORTER_IMAGE
               value: {{ .Values.images.metricsExporter }}
-            - name: METRICS_EXPORTER_SECRET_NAME
-              value: {{ .Values.operator.admissionControllers.certificates.secretNames.metricsExporter }}
             - name: METRICS_EXPORTER_PORT
               value: "{{ .Values.operator.metricsExporter.port }}"
             - name: METRICS_EXPORTER_SECRET_NAME

diff --git a/deployment/sriov-network-operator-chart/values.yaml b/deployment/sriov-network-operator-chart/values.yaml
@@ -21,7 +21,7 @@ operator:
             matchExpressions:
               - key: "node-role.kubernetes.io/control-plane"
                 operator: In
-                values: [ "" ]
+                values: [""]
   nameOverride: ""
   fullnameOverride: ""
   resourcePrefix: "openshift.io"
@@ -110,3 +110,4 @@ images:
   metricsExporterKubeRbacProxy: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
 
 imagePullSecrets: []
+extraDeploy: []