Merge in 1.4.2 fixes - verified

bundle.Dockerfile

@@ -8,7 +8,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=dell-csm-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=stable
 LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.14.0+git
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.32.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

controllers/csm_controller.go

@@ -92,7 +92,7 @@ const (
 	CSMFinalizerName = "finalizer.dell.emc.com"
 
 	// CSMVersion -
-	CSMVersion = "v1.8.0"
+	CSMVersion = "v1.10.0"
 )
 
 var (
@@ -369,7 +369,7 @@ func (r *ContainerStorageModuleReconciler) handleDeploymentUpdate(oldObj interfa
 		return
 	}
 
-	log.Debugw("deployment modified generation", d.Generation, old.Generation)
+	log.Debugw("deployment modified generation", d.Name, d.Generation, old.Generation)
 
 	desired := d.Status.Replicas
 	available := d.Status.AvailableReplicas
@@ -378,13 +378,16 @@ func (r *ContainerStorageModuleReconciler) handleDeploymentUpdate(oldObj interfa
 
 	// Replicas:               2 desired | 2 updated | 2 total | 2 available | 0 unavailable
 
-	log.Infow("deployment", "desired", desired)
-	log.Infow("deployment", "numberReady", ready)
-	log.Infow("deployment", "available", available)
-	log.Infow("deployment", "numberUnavailable", numberUnavailable)
+	log.Infow("deployment", "deployment name", d.Name, "desired", desired)
+	log.Infow("deployment", "deployment name", d.Name, "numberReady", ready)
+	log.Infow("deployment", "deployment name", d.Name, "available", available)
+	log.Infow("deployment", "deployment name", d.Name, "numberUnavailable", numberUnavailable)
 
-	ns := d.Namespace
-	log.Debugw("deployment", "namespace", ns, "name", name)
+	ns := d.Spec.Template.Labels[constants.CsmNamespaceLabel]
+	if ns == "" {
+		ns = d.Namespace
+	}
+	log.Debugw("csm being modified in handledeployment", "namespace", ns, "name", name)
 	namespacedName := t1.NamespacedName{
 		Name:      name,
 		Namespace: ns,
@@ -418,7 +421,11 @@ func (r *ContainerStorageModuleReconciler) handlePodsUpdate(_ interface{}, obj i
 
 	p, _ := obj.(*corev1.Pod)
 	name := p.GetLabels()[constants.CsmLabel]
-	ns := p.Namespace
+	// if this pod is an obs. pod, namespace might not match csm namespace
+	ns := p.GetLabels()[constants.CsmNamespaceLabel]
+	if ns == "" {
+		ns = p.Namespace
+	}
 	if name == "" {
 		return
 	}
@@ -481,7 +488,10 @@ func (r *ContainerStorageModuleReconciler) handleDaemonsetUpdate(oldObj interfac
 	log.Infow("daemonset ", "available", available)
 	log.Infow("daemonset ", "numberUnavailable", numberUnavailable)
 
-	ns := d.Namespace
+	ns := d.Spec.Template.Labels[constants.CsmNamespaceLabel]
+	if ns == "" {
+		ns = d.Namespace
+	}
 	r.Log.Debugw("daemonset ", "ns", ns, "name", name)
 	namespacedName := t1.NamespacedName{
 		Name:      name,
@@ -671,7 +681,8 @@ func (r *ContainerStorageModuleReconciler) SyncCSM(ctx context.Context, cr csmv1
 	log := logger.GetLogger(ctx)
 
 	// Create/Update Authorization Proxy Server
-	if authorizationEnabled, _ := utils.IsModuleEnabled(ctx, cr, csmv1.AuthorizationServer); authorizationEnabled {
+	authorizationEnabled, _ := utils.IsModuleEnabled(ctx, cr, csmv1.AuthorizationServer)
+	if authorizationEnabled {
 		log.Infow("Create/Update authorization")
 		if err := r.reconcileAuthorization(ctx, false, operatorConfig, cr, ctrlClient); err != nil {
 			return fmt.Errorf("failed to deploy authorization proxy server: %v", err)
@@ -834,9 +845,11 @@ func (r *ContainerStorageModuleReconciler) SyncCSM(ctx context.Context, cr csmv1
 			return err
 		}
 
-		// Create/Update DeamonSet
-		if err = daemonset.SyncDaemonset(ctx, node.DaemonSetApplyConfig, cluster.ClusterK8sClient, cr.Name); err != nil {
-			return err
+		// Create/Update DeamonSet, except for auth proxy
+		if !authorizationEnabled {
+			if err = daemonset.SyncDaemonset(ctx, node.DaemonSetApplyConfig, cluster.ClusterK8sClient, cr.Name); err != nil {
+				return err
+			}
 		}
 
 		if replicationEnabled {
@@ -1187,7 +1200,7 @@ func (r *ContainerStorageModuleReconciler) removeDriver(ctx context.Context, ins
 	return nil
 }
 
-// removeModule - remove authorization proxy server
+// removeModule - remove standalone modules
 func (r *ContainerStorageModuleReconciler) removeModule(ctx context.Context, instance csmv1.ContainerStorageModule, operatorConfig utils.OperatorConfig, ctrlClient client.Client) error {
 	log := logger.GetLogger(ctx)
 

operatorconfig/moduleconfig/authorization/v1.8.0/deployment.yaml

@@ -14,6 +14,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: proxy-server
     spec:
       containers:
@@ -92,6 +93,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: tenant-service
     spec:
       containers:
@@ -176,6 +178,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: role-service
     spec:
       serviceAccountName: role-service
@@ -254,6 +257,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: storage-service
     spec:
       serviceAccountName: storage-service
@@ -316,6 +320,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: redis
         role: primary
         tier: backend
@@ -367,6 +372,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: redis-commander
         tier: backend
     spec:
@@ -496,4 +502,4 @@ roleRef:
 subjects:
 - kind: Group
   name: system:serviceaccounts:authorization
-  apiGroup: rbac.authorization.k8s.io
+  apiGroup: rbac.authorization.k8s.io

operatorconfig/moduleconfig/authorization/v1.8.0/nginx-ingress-controller.yaml

@@ -426,6 +426,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: <NAMESPACE>
         app.kubernetes.io/name: ingress-nginx
@@ -660,4 +661,4 @@ webhooks:
     resources:
     - ingresses
   sideEffects: None
-
+

operatorconfig/moduleconfig/authorization/v1.9.0/deployment.yaml

@@ -15,6 +15,7 @@ spec:
     metadata:
       labels:
         app: proxy-server
+        csm: <NAME>
     spec:
       containers:
       - name: proxy-server
@@ -93,6 +94,7 @@ spec:
     metadata:
       labels:
         app: tenant-service
+        csm: <NAME>
     spec:
       containers:
       - name: tenant-service
@@ -176,6 +178,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: role-service
     spec:
       serviceAccountName: role-service
@@ -254,6 +257,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: storage-service
     spec:
       serviceAccountName: storage-service
@@ -316,6 +320,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: redis
         role: primary
         tier: backend
@@ -367,6 +372,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: redis-commander
         tier: backend
     spec:
@@ -496,4 +502,4 @@ roleRef:
 subjects:
 - kind: Group
   name: system:serviceaccounts:authorization
-  apiGroup: rbac.authorization.k8s.io
+  apiGroup: rbac.authorization.k8s.io

operatorconfig/moduleconfig/authorization/v1.9.0/nginx-ingress-controller.yaml

@@ -426,6 +426,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: <NAMESPACE>
         app.kubernetes.io/name: ingress-nginx
@@ -660,4 +661,4 @@ webhooks:
     resources:
     - ingresses
   sideEffects: None
-
+

operatorconfig/moduleconfig/authorization/v1.9.1/deployment.yaml

@@ -15,6 +15,7 @@ spec:
     metadata:
       labels:
         app: proxy-server
+        csm: <NAME>
     spec:
       containers:
       - name: proxy-server
@@ -93,6 +94,7 @@ spec:
     metadata:
       labels:
         app: tenant-service
+        csm: <NAME>
     spec:
       containers:
       - name: tenant-service
@@ -176,6 +178,7 @@ spec:
   template:
     metadata:
       labels:
+        csm: <NAME>
         app: role-service
     spec:
       serviceAccountName: role-service
@@ -255,6 +258,7 @@ spec:
     metadata:
       labels:
         app: storage-service
+        csm: <NAME>
     spec:
       serviceAccountName: storage-service
       containers:
@@ -319,6 +323,7 @@ spec:
         app: redis
         role: primary
         tier: backend
+        csm: <NAME>
     spec:
       containers:
       - name: primary
@@ -369,6 +374,7 @@ spec:
       labels:
         app: redis-commander
         tier: backend
+        csm: <NAME>
     spec:
       containers:
       - name: redis-commander
@@ -496,4 +502,4 @@ roleRef:
 subjects:
 - kind: Group
   name: system:serviceaccounts:authorization
-  apiGroup: rbac.authorization.k8s.io
+  apiGroup: rbac.authorization.k8s.io

operatorconfig/moduleconfig/authorization/v1.9.1/nginx-ingress-controller.yaml

@@ -429,6 +429,7 @@ spec:
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: <NAMESPACE>
         app.kubernetes.io/name: ingress-nginx
+        csm: <NAME>
     spec:
       containers:
       - args:
@@ -660,4 +661,4 @@ webhooks:
     resources:
     - ingresses
   sideEffects: None
-
+

operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powerflex.yaml

@@ -111,6 +111,7 @@ spec:
         app.kubernetes.io/name: karavi-metrics-powerflex
         app.kubernetes.io/instance: karavi
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       serviceAccount: karavi-metrics-powerflex-controller
       containers:

operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powermax.yaml

@@ -111,6 +111,7 @@ spec:
         app.kubernetes.io/name: karavi-metrics-powermax
         app.kubernetes.io/instance: karavi
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       serviceAccountName: karavi-metrics-powermax-controller
       containers:

operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powerscale.yaml

@@ -113,6 +113,7 @@ spec:
         app.kubernetes.io/name: karavi-metrics-powerscale
         app.kubernetes.io/instance: karavi
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       serviceAccount: karavi-metrics-powerscale-controller
       containers:

operatorconfig/moduleconfig/observability/v1.6.0/karavi-otel-collector.yaml

@@ -113,6 +113,7 @@ spec:
         app.kubernetes.io/name: otel-collector
         app.kubernetes.io/instance: karavi-observability
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       volumes:
         - name: tls-secret

operatorconfig/moduleconfig/observability/v1.6.0/karavi-topology.yaml

@@ -89,6 +89,7 @@ spec:
         app.kubernetes.io/name: karavi-topology
         app.kubernetes.io/instance: karavi-observability
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       volumes:
         - name: karavi-topology-secret-volume

operatorconfig/moduleconfig/observability/v1.7.0/karavi-metrics-powerflex.yaml

@@ -111,6 +111,7 @@ spec:
         app.kubernetes.io/name: karavi-metrics-powerflex
         app.kubernetes.io/instance: karavi
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       serviceAccount: karavi-metrics-powerflex-controller
       containers:

operatorconfig/moduleconfig/observability/v1.7.0/karavi-metrics-powermax.yaml

@@ -111,6 +111,7 @@ spec:
         app.kubernetes.io/name: karavi-metrics-powermax
         app.kubernetes.io/instance: karavi
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       serviceAccountName: karavi-metrics-powermax-controller
       containers:

operatorconfig/moduleconfig/observability/v1.7.0/karavi-metrics-powerscale.yaml

@@ -113,6 +113,7 @@ spec:
         app.kubernetes.io/name: karavi-metrics-powerscale
         app.kubernetes.io/instance: karavi
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       serviceAccount: karavi-metrics-powerscale-controller
       containers:

operatorconfig/moduleconfig/observability/v1.7.0/karavi-otel-collector.yaml

@@ -113,6 +113,7 @@ spec:
         app.kubernetes.io/name: otel-collector
         app.kubernetes.io/instance: karavi-observability
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       volumes:
         - name: tls-secret

operatorconfig/moduleconfig/observability/v1.7.0/karavi-topology.yaml

@@ -89,6 +89,7 @@ spec:
         app.kubernetes.io/name: karavi-topology
         app.kubernetes.io/instance: karavi-observability
         csm: <NAME>
+        csmNamespace: <CSM_NAMESPACE>
     spec:
       volumes:
         - name: karavi-topology-secret-volume