added enable field to CR and uncomment call home

Author: arbelnat

api/v1/ibmblockcsi_types.go

@@ -120,6 +120,9 @@ type IBMBlockCSICallHomeSpec struct {
 	Repository string `json:"repository"`
 	Tag        string `json:"tag"`
 
+	// +kubebuilder:validation:Optional
+	Enable bool `json:"enable"`
+
 	// +kubebuilder:validation:Optional
 	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy"`
 

config/crd/bases/csi.ibm.com_ibmblockcsis.yaml

@@ -502,6 +502,8 @@ spec:
                             type: array
                         type: object
                     type: object
+                  enable:
+                    type: boolean
                   imagePullPolicy:
                     description: PullPolicy describes a policy for if/when to pull a container image
                     type: string

config/samples/csi.ibm.com_v1_ibmblockcsi_cr.yaml

@@ -46,21 +46,22 @@ spec:
                     - ppc64le
 
   # callHome is a cronJob
-#  callHome:
-#    repository: ibmcom/ibm-block-csi-call-home
-#    tag: "1.9.0"
-#    imagePullPolicy: IfNotPresent
-#    affinity:
-#      nodeAffinity:
-#        requiredDuringSchedulingIgnoredDuringExecution:
-#          nodeSelectorTerms:
-#            - matchExpressions:
-#                - key: kubernetes.io/arch
-#                  operator: In
-#                  values:
-#                    - amd64
-#                    - s390x
-#                    - ppc64le
+  callHome:
+    repository: ibmcom/ibm-block-csi-call-home
+    tag: "1.9.0"
+    enable: false
+    imagePullPolicy: IfNotPresent
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - matchExpressions:
+                - key: kubernetes.io/arch
+                  operator: In
+                  values:
+                    - amd64
+                    - s390x
+                    - ppc64le
 
 #    tolerations:
 #    - effect: NoSchedule

controllers/ibmblockcsi_controller.go

@@ -589,7 +589,7 @@ func (r *IBMBlockCSIReconciler) isNodeReady(node *appsv1.DaemonSet) bool {
 }
 
 func (r *IBMBlockCSIReconciler) isCallHomeDefined(instance *ibmblockcsi.IBMBlockCSI) bool {
-	return instance.Spec.CallHome.Repository != ""
+	return instance.Spec.CallHome.Enable == true
 }
 
 func (r *IBMBlockCSIReconciler) deleteCallHome(instance *ibmblockcsi.IBMBlockCSI, callHome *batchv1.CronJob, logger logr.Logger) error {

deploy/installer/generated/ibm-block-csi-operator.yaml

@@ -502,6 +502,8 @@ spec:
                             type: array
                         type: object
                     type: object
+                  enable:
+                    type: boolean
                   imagePullPolicy:
                     description: PullPolicy describes a policy for if/when to pull a container image
                     type: string

deploy/olm-catalog/ibm-block-csi-operator-community/1.9.0/manifests/ibm-block-csi-operator.v1.9.0.clusterserviceversion.yaml

@@ -77,6 +77,33 @@ metadata:
                 }
               }
             },
+            "callHome": {
+              "repository": "ibmcom/ibm-block-csi-call-home",
+              "tag": "1.9.0",
+              "enable": false
+              "imagePullPolicy": "IfNotPresent",
+              "affinity": {
+                "nodeAffinity": {
+                  "requiredDuringSchedulingIgnoredDuringExecution": {
+                    "nodeSelectorTerms": [
+                      {
+                        "matchExpressions": [
+                          {
+                            "key": "kubernetes.io/arch",
+                            "operator": "In",
+                            "values": [
+                              "amd64",
+                              "s390x",
+                              "ppc64le"
+                            ]
+                          }
+                        ]
+                      }
+                    ]
+                  }
+                }
+              }
+            },
             "sidecars": [
               {
                 "name": "csi-node-driver-registrar",