Merge pull request #7 from IBM/debug

Fix Value reconciliation issue in operator

Author: ashimagarg27

Dockerfile

@@ -33,11 +33,8 @@ FROM gcr.io/distroless/static:nonroot
 
 ENV OPERATOR=/usr/local/bin/ibm-object-csi-operator \
     USER_UID=1001 \
-    USER_NAME=ibm-object-csi-operator \
-    IBMObjectCSI_CR_YAML=/usr/local/etc/csi_v1alpha1_ibmobjectcsi.yaml
+    USER_NAME=ibm-object-csi-operator
 
-COPY --from=builder  /workspace/config/samples/csi_v1alpha1_ibmobjectcsi.yaml  ${IBMObjectCSI_CR_YAML}
-#RUN chmod 0444 ${IBMObjectCSI_CR_YAML}
 
 
 WORKDIR /

config/manager/kustomization.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ambikanair/ibm-object-csi-driver-operator
-  newTag: rename
+  newTag: debug

config/samples/csi_v1alpha1_ibmobjectcsi.yaml

@@ -13,7 +13,7 @@ spec:
   # and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars.
   controller:
     repository: icr.io/ibm/ibm-object-csi-driver
-    tag: "v1.0.2-alpha"
+    tag: "v1.0.1-alpha"
     imagePullPolicy: IfNotPresent
     affinity:
       nodeAffinity:
@@ -29,7 +29,7 @@ spec:
   # and csi-node-driver-registrar and livenessprobe sidecars.
   node:
     repository: icr.io/ibm/ibm-object-csi-driver
-    tag: "v1.0.2-alpha"
+    tag: "v1.0.1-alpha"
     imagePullPolicy: Always
     affinity:
       nodeAffinity:

controllers/ibmobjectcsi_controller.go

@@ -113,15 +113,6 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	//setting default values for a Kubernetes Custom Resource using the Scheme's Default() method, based on the Go type definition of the Custom Resource.
 	//This ensures that the CR has all the required fields with default values before further processing or reconciliation by the operator.
 	r.Scheme.Default(instance.Unwrap())
-	changed := instance.SetDefaults()
-	// update CR if there was changes after defaulting
-	if changed {
-		err = r.Update(context.TODO(), instance.Unwrap())
-		if err != nil {
-			err = fmt.Errorf("failed to update IBMObjectCSI CR: %v", err)
-			return reconcile.Result{}, err
-		}
-	}
 	if err := r.ControllerHelper.AddFinalizerIfNotPresent(
 		instance, instance.Unwrap()); err != nil {
 		return reconcile.Result{}, err

controllers/internal/crutils/default_setter.go

@@ -83,13 +83,6 @@ func (c *IBMObjectCSI) GetCSINodeImage() string {
 	return c.Spec.Node.Repository + ":" + c.Spec.Node.Tag
 }
 
-func (c *IBMObjectCSI) GetDefaultSidecarImageByName(name string) string {
-	if sidecar, found := config.DefaultSidecarsByName[name]; found {
-		return fmt.Sprintf("%s:%s", sidecar.Repository, sidecar.Tag)
-	}
-	return ""
-}
-
 func (c *IBMObjectCSI) GetCSIControllerSelectorLabels() labels.Set {
 	return common.GetSelectorLabels(config.CSIController.String())
 }

controllers/internal/crutils/ibmobjectcsi.go

@@ -255,7 +255,7 @@ func (s *csiControllerSyncer) getSidecarImageByName(name string) string {
 	if sidecar != nil {
 		return fmt.Sprintf("%s:%s", sidecar.Repository, sidecar.Tag)
 	}
-	return s.driver.GetDefaultSidecarImageByName(name)
+	return ""
 }
 
 func (s *csiControllerSyncer) getCSIProvisionerImage() string {

controllers/syncer/csi_controller.go

@@ -303,15 +303,15 @@ func (s *csiNodeSyncer) getCSINodeDriverRegistrarImage() string {
 	if sidecar != nil {
 		return fmt.Sprintf("%s:%s", sidecar.Repository, sidecar.Tag)
 	}
-	return s.driver.GetDefaultSidecarImageByName(config.CSINodeDriverRegistrar)
+	return ""
 }
 
 func (s *csiNodeSyncer) getLivenessProbeImage() string {
 	sidecar := s.getSidecarByName(config.LivenessProbe)
 	if sidecar != nil {
 		return fmt.Sprintf("%s:%s", sidecar.Repository, sidecar.Tag)
 	}
-	return s.driver.GetDefaultSidecarImageByName(config.LivenessProbe)
+	return ""
 }
 
 func (s *csiNodeSyncer) getCSINodeDriverRegistrarPullPolicy() corev1.PullPolicy {

controllers/syncer/csi_node.go

@@ -35,7 +35,6 @@ import (
 	objectdriverv1alpha1 "github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/api/v1alpha1"
 	"github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/controllers"
 	"github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/controllers/util/common"
-	operatorConfig "github.ibm.com/alchemy-containers/ibm-object-csi-driver-operator/pkg/config"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -70,12 +69,6 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
-	err := operatorConfig.LoadDefaultsOfIBMObjectCSI()
-	if err != nil {
-		log.Error(err, "Failed to load default IBMObjectCSI custom resource config")
-		os.Exit(1)
-	}
-
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
 		Metrics:                metricsserver.Options{BindAddress: metricsAddr},