Revert "Add a config map with config daemon config to the helm chart"

This reverts commit 165b226.
Mellanox · Feb 4, 2025 · c293a7f · c293a7f
1 parent 34ba7f0
commit c293a7f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 69 deletions.
diff --git a/bindata/manifests/daemon/config-daemon.yaml → ...erator-chart/templates/config-daemon.yaml b/bindata/manifests/daemon/config-daemon.yaml → ...erator-chart/templates/config-daemon.yaml
@@ -2,56 +2,37 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: nic-configuration-daemon
-  namespace: {{.Namespace}}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/name: nic-configuration-daemon
     app.kubernetes.io/created-by: nic-configuration-operator
     app.kubernetes.io/part-of: nic-configuration-operator
-  {{- if eq .ClusterType "openshift" }}
-  annotations:
-    release.openshift.io/version: "{{.ReleaseVersion}}"
-  {{- end }}
+    {{- include "nic-configuration-operator.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      app: nic-configuration-daemon
+      control-plane: nic-configuration-daemon
+      {{- include "nic-configuration-operator.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: nic-configuration-daemon
-        {{- if eq .ClusterType "openshift" }}
-        openshift.io/required-scc: privileged
-        {{- end }}
       labels:
-        app: nic-configuration-daemon
-        component: network
-        type: infra
-        {{- if eq .ClusterType "openshift" }}
-        openshift.io/component: network
-        {{- end }}
+        control-plane: nic-configuration-daemon
+        {{- include "nic-configuration-operator.selectorLabels" . | nindent 8 }}
     spec:
-      serviceAccountName: {{.ServiceAccountName}}
+      nodeSelector: {{- toYaml .Values.operator.nodeSelector | nindent 8 }}
+      serviceAccountName: {{ include "nic-configuration-operator.serviceAccountName" . }}
       terminationGracePeriodSeconds: 10
       hostNetwork: true
       hostPID: true
       priorityClassName: system-node-critical
-      {{- if .ImagePullSecrets }}
-      imagePullSecrets:
-      {{- range .ImagePullSecrets }}
-      - name: {{ . }}
-      {{- end }}
-      {{- end }}
-      {{- if .NodeSelector }}
-      nodeSelector: {{.NodeSelector}}
-      {{- end }}
       containers:
-        - image: {{.Image}}
+        - image: "{{ .Values.configDaemon.image.repository }}/{{ .Values.configDaemon.image.name }}:{{ .Values.configDaemon.image.tag | default .Chart.AppVersion }}"
           name: nic-configuration-daemon
           securityContext:
             privileged: true
-          {{- if .Resources }}
-          resources: {{.Resources}}
-          {{- end }}
+          resources: {{- toYaml .Values.configDaemon.resources | nindent 12 }}
           env:
             - name: NODE_NAME
               valueFrom:
@@ -61,9 +42,9 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            {{- if .LogLevel }}
+            {{- if .Values.logLevel}}
             - name: LOG_LEVEL
-              value: {{.LogLevel}}
+              value: {{ .Values.logLevel }}
             {{- end}}
           volumeMounts:
             - name: sys

diff --git a/...ment/nic-configuration-operator-chart/templates/nic-configuration-operator-configmap.yaml b/...ment/nic-configuration-operator-chart/templates/nic-configuration-operator-configmap.yaml
diff --git a/deployment/nic-configuration-operator-chart/templates/operator.yaml b/deployment/nic-configuration-operator-chart/templates/operator.yaml
@@ -40,11 +40,11 @@ spec:
             capabilities:
               drop:
                 - ALL
+          {{- if .Values.logLevel}}
           env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
+            - name: LOG_LEVEL
+              value: {{ .Values.logLevel }}
+          {{- end}}
           livenessProbe:
             httpGet:
               path: /healthz

diff --git a/deployment/nic-configuration-operator-chart/templates/role.yaml b/deployment/nic-configuration-operator-chart/templates/role.yaml
@@ -11,8 +11,6 @@ rules:
     - configmaps
   verbs:
     - get
-    - list
-    - watch
 - apiGroups:
     - ""
   resources:
@@ -105,15 +103,3 @@ rules:
     - patch
     - update
     - watch
-- apiGroups:
-    - apps
-  resources:
-    - daemonsets
-  verbs:
-    - create
-    - delete
-    - get
-    - list
-    - patch
-    - update
-    - watch