Add support for network-operator-init-container

Signed-off-by: Yury Kulazhenkov <[email protected]>

api/v1alpha1/nicclusterpolicy_types.go

@@ -69,7 +69,7 @@ type ConfigMapNameReference struct {
 
 // InitContainerSpec contains configuration for the init container of the OFED driver
 type InitContainerSpec struct {
-	// Enable indicates if init container deployment is requried
+	// Enable indicates if init container deployment is required
 	// +optional
 	// +kubebuilder:default:=false
 	Enable    bool `json:"enable,omitempty"`

config/crd/bases/mellanox.com_nicclusterpolicies.yaml

@@ -464,7 +464,7 @@ spec:
                       enable:
                         default: false
                         description: Enable indicates if init container deployment
-                          is requried
+                          is required
                         type: boolean
                       image:
                         pattern: '[a-zA-Z0-9\-]+'

deployment/network-operator/crds/mellanox.com_nicclusterpolicies.yaml

@@ -464,7 +464,7 @@ spec:
                       enable:
                         default: false
                         description: Enable indicates if init container deployment
-                          is requried
+                          is required
                         type: boolean
                       image:
                         pattern: '[a-zA-Z0-9\-]+'

main.go

@@ -128,7 +128,7 @@ func main() {
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
-		"Enable leader election for controller manager. "+
+		"InitContainerEnable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
 	opts := zap.Options{
 		Development: true,

manifests/state-ofed-driver/0010_service-account.yaml

@@ -0,0 +1,18 @@
+# 2023 NVIDIA CORPORATION & AFFILIATES
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: ofed-driver
+  namespace: {{ .RuntimeSpec.Namespace }}

manifests/state-ofed-driver/0020_cluster_role.yaml

@@ -0,0 +1,24 @@
+# 2023 NVIDIA CORPORATION & AFFILIATES
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: ofed-driver
+rules:
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get", "list", "patch", "watch", "update"]
+  - apiGroups: [""]
+    resources: ["configmaps"]
+    verbs: ["get", "list"]

manifests/state-ofed-driver/0030_cluster_role_binding.yaml

@@ -0,0 +1,25 @@
+# 2023 NVIDIA CORPORATION & AFFILIATES
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: ofed-driver
+subjects:
+  - kind: ServiceAccount
+    name: ofed-driver
+    namespace: {{ .RuntimeSpec.Namespace }}
+roleRef:
+  kind: ClusterRole
+  name: ofed-driver
+  apiGroup: rbac.authorization.k8s.io

manifests/state-ofed-driver/0040_ofed_init_container_config-configmap.yaml

@@ -0,0 +1,28 @@
+# 2023 NVIDIA CORPORATION & AFFILIATES
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+{{- if .RuntimeSpec.InitContainerConfig.InitContainerEnable  }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ofed-init-container-config
+  namespace: {{ .RuntimeSpec.Namespace }}
+data:
+  config.json: |-
+    {
+      "safeDriverLoad": {
+        "enable": {{ .RuntimeSpec.InitContainerConfig.SafeLoadEnable }},
+        "annotation": "{{ .RuntimeSpec.InitContainerConfig.SafeLoadAnnotation }}"
+      }
+    }
+{{end}}

manifests/state-ofed-driver/0050_ofed-driver-ds.yaml

@@ -1,4 +1,4 @@
-# Copyright 2020 NVIDIA
+# Copyright 2023 NVIDIA
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,16 +40,34 @@ spec:
         - key: nvidia.com/gpu
           operator: Exists
           effect: NoSchedule
-{{ if .RuntimeSpec.IsOpenshift }}
       serviceAccountName: ofed-driver
-{{end}}
       hostNetwork: true
       {{- if .CrSpec.ImagePullSecrets }}
       imagePullSecrets:
       {{- range .CrSpec.ImagePullSecrets }}
         - name: {{ . }}
       {{- end }}
       {{- end }}
+      {{- if .RuntimeSpec.InitContainerConfig.InitContainerEnable  }}
+      initContainers:
+        - name: network-operator-init-container
+          imagePullPolicy: IfNotPresent
+          image: {{ .RuntimeSpec.InitContainerConfig.InitContainerImageName }}
+          args:
+            - --node-name
+            - $(NODE_NAME)
+            - --configmap-name
+            - ofed-init-container-config
+            - --configmap-namespace
+            - {{ .RuntimeSpec.Namespace }}
+            - --configmap-key
+            - config.json
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
+      {{- end }}
       containers:
         - image: {{ .RuntimeSpec.MOFEDImageName }}
           imagePullPolicy: IfNotPresent

pkg/state/state_ofed.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver/v3"
+	"github.com/NVIDIA/k8s-operator-libs/pkg/upgrade"
 	"github.com/go-logr/logr"
 	osconfigv1 "github.com/openshift/api/config/v1"
 	"github.com/pkg/errors"
@@ -137,12 +138,20 @@ type additionalVolumeMounts struct {
 	Volumes      []v1.Volume
 }
 
+type initContainerConfig struct {
+	InitContainerEnable    bool
+	InitContainerImageName string
+	SafeLoadEnable         bool
+	SafeLoadAnnotation     string
+}
+
 type ofedRuntimeSpec struct {
 	runtimeSpec
-	CPUArch        string
-	OSName         string
-	OSVer          string
-	MOFEDImageName string
+	CPUArch             string
+	OSName              string
+	OSVer               string
+	MOFEDImageName      string
+	InitContainerConfig initContainerConfig
 	// is true if cluster type is Openshift
 	IsOpenshift bool
 }
@@ -440,15 +449,18 @@ func (s *stateOFED) getManifestObjects(
 		}
 	}
 
+	s.mergeImagePullSecrets(cr)
+
 	renderData := &ofedManifestRenderData{
 		CrSpec: cr.Spec.OFEDDriver,
 		RuntimeSpec: &ofedRuntimeSpec{
-			runtimeSpec:    runtimeSpec{config.FromEnv().State.NetworkOperatorResourceNamespace},
-			CPUArch:        nodeAttr[nodeinfo.AttrTypeCPUArch],
-			OSName:         nodeAttr[nodeinfo.AttrTypeOSName],
-			OSVer:          nodeAttr[nodeinfo.AttrTypeOSVer],
-			MOFEDImageName: s.getMofedDriverImageName(cr, nodeAttr, reqLogger),
-			IsOpenshift:    clusterInfo.IsOpenshift(),
+			runtimeSpec:         runtimeSpec{config.FromEnv().State.NetworkOperatorResourceNamespace},
+			CPUArch:             nodeAttr[nodeinfo.AttrTypeCPUArch],
+			OSName:              nodeAttr[nodeinfo.AttrTypeOSName],
+			OSVer:               nodeAttr[nodeinfo.AttrTypeOSVer],
+			MOFEDImageName:      s.getMofedDriverImageName(cr, nodeAttr, reqLogger),
+			InitContainerConfig: s.getInitContainerConfig(cr, reqLogger),
+			IsOpenshift:         clusterInfo.IsOpenshift(),
 		},
 		Tolerations:            cr.Spec.Tolerations,
 		NodeAffinity:           cr.Spec.NodeAffinity,
@@ -464,6 +476,56 @@ func (s *stateOFED) getManifestObjects(
 	return objs, nil
 }
 
+// add pull secrets from the init container to the pull secrets list of the main container,
+// this list will be used as imagePullSecrets on the Pod level
+func (s *stateOFED) mergeImagePullSecrets(cr *mellanoxv1alpha1.NicClusterPolicy) {
+	if cr.Spec.OFEDDriver.InitContainer == nil {
+		return
+	}
+	if len(cr.Spec.OFEDDriver.InitContainer.ImagePullSecrets) == 0 {
+		return
+	}
+	secretesToAdd := make([]string, 0, len(cr.Spec.OFEDDriver.InitContainer.ImagePullSecrets))
+	for _, initSecret := range cr.Spec.OFEDDriver.InitContainer.ImagePullSecrets {
+		found := false
+		for _, mainSecret := range cr.Spec.OFEDDriver.ImagePullSecrets {
+			if initSecret == mainSecret {
+				found = true
+				break
+			}
+		}
+		if !found {
+			secretesToAdd = append(secretesToAdd, initSecret)
+		}
+	}
+	cr.Spec.OFEDDriver.ImagePullSecrets = append(cr.Spec.OFEDDriver.ImagePullSecrets, secretesToAdd...)
+}
+
+// prepare configuration for the init container
+func (s *stateOFED) getInitContainerConfig(
+	cr *mellanoxv1alpha1.NicClusterPolicy, reqLogger logr.Logger) initContainerConfig {
+	var initContCfg initContainerConfig
+	safeLoadEnable := cr.Spec.OFEDDriver.OfedUpgradePolicy != nil &&
+		cr.Spec.OFEDDriver.OfedUpgradePolicy.AutoUpgrade &&
+		cr.Spec.OFEDDriver.OfedUpgradePolicy.SafeLoad
+	if cr.Spec.OFEDDriver.InitContainer != nil {
+		initContCfg = initContainerConfig{
+			InitContainerEnable: cr.Spec.OFEDDriver.InitContainer.Enable,
+			InitContainerImageName: cr.Spec.OFEDDriver.InitContainer.Repository + "/" +
+				cr.Spec.OFEDDriver.InitContainer.Image + ":" +
+				cr.Spec.OFEDDriver.InitContainer.Version,
+			SafeLoadEnable:     safeLoadEnable,
+			SafeLoadAnnotation: upgrade.GetUpgradeDriverWaitForSafeLoadAnnotationKey(),
+		}
+	}
+
+	if safeLoadEnable && !initContCfg.InitContainerEnable {
+		reqLogger.V(consts.LogLevelWarning).Info("safe driver loading feature is enabled, but init container is" +
+			"disabled. It is required to enable init container to use safe driver loading feature.")
+	}
+	return initContCfg
+}
+
 // getMofedDriverImageName generates MOFED driver image name based on the driver version specified in CR
 // TODO(adrianc): in Network-Operator v1.5.0, we should just use the new naming scheme
 func (s *stateOFED) getMofedDriverImageName(cr *mellanoxv1alpha1.NicClusterPolicy,

pkg/state/state_ofed_test.go

@@ -78,6 +78,67 @@ var _ = Describe("MOFED state test", func() {
 		})
 	})
 
+	Context("Init container", func() {
+		It("Merge ImagePullSecrets", func() {
+			cr := &v1alpha1.NicClusterPolicy{
+				Spec: v1alpha1.NicClusterPolicySpec{
+					OFEDDriver: &v1alpha1.OFEDDriverSpec{
+						ImageSpec: v1alpha1.ImageSpec{
+							ImagePullSecrets: []string{"1", "2", "3"},
+						},
+						InitContainer: &v1alpha1.InitContainerSpec{
+							ImageSpec: v1alpha1.ImageSpec{
+								ImagePullSecrets: []string{"A", "1", "B", "2", "3", "C"},
+							}},
+					},
+				},
+			}
+			stateOfed.mergeImagePullSecrets(cr)
+			Expect(cr.Spec.OFEDDriver.ImageSpec.ImagePullSecrets).To(And(
+				HaveLen(6),
+				ContainElements("A", "B", "C", "1", "2", "3")))
+		})
+		It("Merge ImagePullSecrets - no init container config", func() {
+			cr := &v1alpha1.NicClusterPolicy{
+				Spec: v1alpha1.NicClusterPolicySpec{
+					OFEDDriver: &v1alpha1.OFEDDriverSpec{
+						ImageSpec: v1alpha1.ImageSpec{
+							ImagePullSecrets: []string{"1", "2", "3"},
+						},
+					},
+				},
+			}
+			stateOfed.mergeImagePullSecrets(cr)
+			Expect(cr.Spec.OFEDDriver.ImageSpec.ImagePullSecrets).To(And(
+				HaveLen(3),
+				ContainElements("1", "2", "3")))
+		})
+		It("getInitContainerConfig", func() {
+			cr := &v1alpha1.NicClusterPolicy{
+				Spec: v1alpha1.NicClusterPolicySpec{
+					OFEDDriver: &v1alpha1.OFEDDriverSpec{
+						OfedUpgradePolicy: &v1alpha1.DriverUpgradePolicySpec{
+							AutoUpgrade: true,
+							SafeLoad:    true,
+						},
+						InitContainer: &v1alpha1.InitContainerSpec{
+							Enable: true,
+							ImageSpec: v1alpha1.ImageSpec{
+								Image:      "image",
+								Repository: "repository",
+								Version:    "version",
+							},
+						},
+					},
+				},
+			}
+			cfg := stateOfed.getInitContainerConfig(cr, testLogger)
+			Expect(cfg.SafeLoadAnnotation).NotTo(BeEmpty())
+			Expect(cfg.SafeLoadEnable).To(BeTrue())
+			Expect(cfg.InitContainerEnable).To(BeTrue())
+			Expect(cfg.InitContainerImageName).To(Equal("repository/image:version"))
+		})
+	})
 	Context("Proxy config", func() {
 		It("Set Proxy from Cluster Wide Proxy", func() {
 			cr := &v1alpha1.NicClusterPolicy{