Merge pull request #61 from almaslennikov/revert-changes-for-ocp

Revert "Deploy configuration daemon DS during config template reconcile"

Author: almaslennikov

Dockerfile

@@ -28,7 +28,6 @@ RUN --mount=type=cache,target=/go/pkg/mod/ GO_GCFLAGS=${GCFLAGS} make build-mana
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
 COPY --from=builder /workspace/build/manager .
-COPY bindata /bindata
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]

config/rbac/role.yaml

@@ -10,14 +10,6 @@ rules:
   - configmaps
   verbs:
   - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
 - apiGroups:
   - ""
   resources:
@@ -46,15 +38,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - apps
-  resources:
-  - daemonsets
-  verbs:
-  - create
-  - delete
-  - get
-  - update
 - apiGroups:
   - configuration.net.nvidia.com
   resources:
@@ -107,14 +90,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - create
-  - get
-  - update
 - apiGroups:
   - maintenance.nvidia.com
   resources:
@@ -127,11 +102,3 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - security.openshift.io
-  resourceNames:
-  - privileged
-  resources:
-  - securitycontextconstraints
-  verbs:
-  - use

…data/manifests/daemon/config-daemon.yaml …rator-chart/templates/config-daemon.yamlbindata/manifests/daemon/config-daemon.yaml renamed to deployment/nic-configuration-operator-chart/templates/config-daemon.yaml bindata/manifests/daemon/config-daemon.yaml renamed to deployment/nic-configuration-operator-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

deployment/nic-configuration-operator-chart/templates/nic-configuration-operator-configmap.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

deployment/nic-configuration-operator-chart/templates/operator.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

deployment/nic-configuration-operator-chart/templates/role.yaml

@@ -7,12 +7,10 @@ toolchain go1.22.4
 require (
 	github.com/Mellanox/maintenance-operator/api v0.0.0-20240916123230-810ab7bb25f4
 	github.com/Mellanox/rdmamap v1.1.0
-	github.com/go-task/slim-sprig/v3 v3.0.0
 	github.com/jaypipes/ghw v0.12.0
 	github.com/jaypipes/pcidb v1.0.1
 	github.com/onsi/ginkgo/v2 v2.20.0
 	github.com/onsi/gomega v1.34.1
-	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.9.0
 	github.com/vishvananda/netlink v1.3.0
 	go.uber.org/zap v1.26.0
@@ -40,6 +38,7 @@ require (
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -57,6 +56,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.20.2 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect

go.mod

@@ -19,7 +19,6 @@ package controller
 import (
 	"context"
 	"fmt"
-	"os"
 	"reflect"
 	"slices"
 	"strings"
@@ -37,7 +36,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	v1alpha1 "github.com/Mellanox/nic-configuration-operator/api/v1alpha1"
-	"github.com/Mellanox/nic-configuration-operator/pkg/syncdaemon"
 )
 
 const nicConfigurationTemplateSyncEventName = "nic-configuration-template-sync-event"
@@ -56,14 +54,10 @@ type NicConfigurationTemplateReconciler struct {
 //+kubebuilder:rbac:groups=configuration.net.nvidia.com,resources=nicdevices,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=configuration.net.nvidia.com,resources=nicdevices/finalizers,verbs=update
 //+kubebuilder:rbac:groups="",resources=nodes,verbs=get;list;watch;update;patch
-//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch
-//+kubebuilder:rbac:groups="",resources=events,verbs=create
+//+kubebuilder:rbac:groups="",resources=configmaps,verbs=get
 //+kubebuilder:rbac:groups="",resources=pods,verbs=list
 //+kubebuilder:rbac:groups="",resources=pods/eviction,verbs=create;delete;get;list;patch;update;watch
 //+kubebuilder:rbac:groups=maintenance.nvidia.com,resources=nodemaintenances,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=coordination.k8s.io,resources=leases,verbs=get;update;create
-//+kubebuilder:rbac:groups=apps,resources=daemonsets,verbs=get;create;update;delete
-//+kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,verbs=use,resourceNames=privileged
 
 // Reconcile reconciles the NicConfigurationTemplate object
 func (r *NicConfigurationTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
@@ -178,12 +172,6 @@ func (r *NicConfigurationTemplateReconciler) Reconcile(ctx context.Context, req
 		}
 	}
 
-	err = syncdaemon.SyncConfigDaemonObjs(ctx, r.Client, r.Scheme, os.Getenv("NAMESPACE"))
-	if err != nil {
-		log.Log.Error(err, "failed to sync ds")
-		return ctrl.Result{}, err
-	}
-
 	return ctrl.Result{}, nil
 }
 

internal/controller/nicconfigurationtemplate_controller.go

@@ -82,8 +82,4 @@ const (
 	Mlx5ModuleVersionPath         = "/sys/bus/pci/drivers/mlx5_core/module/version"
 
 	FwConfigNotAppliedAfterRebootErrorMsg = "firmware configuration failed to apply after reboot"
-
-	ConfigDaemonManifestsPath = "./bindata/manifests/daemon"
-
-	OperatorConfigMapName = "nic-configuration-operator-config"
 )