Handle kube version errors (kadalu#669)

Fixes: kadalu#601, kadalu#617
Credits: Amar Tumballi <[email protected]>
Signed-off-by: Shree Vatsa N <[email protected]>

Author: vatsa287

.github/workflows/on-pr-submit.yml

@@ -48,11 +48,11 @@ jobs:
       run: make pylint
 
   run-on-minikube:
-    name: kube 1.20.0
+    name: kube 1.22.0
     runs-on: ubuntu-latest
     needs: get-info
     env:
-      KUBE_VERSION: v1.20.0
+      KUBE_VERSION: v1.22.0
       # Current conditions in minikube.sh which are using commit message:
       # [helm skip]: If contained in COMMIT MESSAGE, validating helm is skipped
       COMMIT_MSG: ${{needs.get-info.outputs.msg}}

operator/Dockerfile

@@ -36,7 +36,8 @@ COPY templates/server.yaml.j2               /kadalu/templates/server.yaml.j2
 COPY templates/csi.yaml.j2                  /kadalu/templates/csi.yaml.j2
 COPY templates/csi-driver-crd.yaml.j2       /kadalu/templates/csi-driver-crd.yaml.j2
 COPY templates/csi-driver-object.yaml.j2    /kadalu/templates/csi-driver-object.yaml.j2
-COPY templates/configmap.yaml.j2            /kadalu/templates/configmap.yaml.j2
+COPY templates/csi-driver-object-v1.yaml.j2    /kadalu/templates/csi-driver-object-v1.yaml.j2
+COPY templates/configmap.yaml.j2               /kadalu/templates/configmap.yaml.j2
 COPY templates/storageclass-kadalu.custom.yaml.j2    /kadalu/templates/storageclass-kadalu.custom.yaml.j2
 COPY templates/external-storageclass.yaml.j2         /kadalu/templates/external-storageclass.yaml.j2
 COPY lib/kadalulib.py                       /kadalu/kadalulib.py

operator/main.py

@@ -894,11 +894,21 @@ def deploy_csi_pods(core_v1_client):
 
     # Deploy CSI Pods
     api_instance = client.VersionApi().get_code()
-    if api_instance.major > "1" or api_instance.major == "1" and \
-       api_instance.minor >= "14":
+    int_api_instance_major = int(api_instance.major)
+    int_api_instance_minor = int(api_instance.minor)
+
+    if int_api_instance_major > 1 or int_api_instance_major == 1 and \
+       int_api_instance_minor >= 22:
+        filename = os.path.join(MANIFESTS_DIR, "csi-driver-object-v1.yaml")
+        template(filename, namespace=NAMESPACE, kadalu_version=VERSION)
+        lib_execute(KUBECTL_CMD, APPLY_CMD, "-f", filename)
+
+    elif int_api_instance_major > 1 or int_api_instance_major == 1 and \
+       int_api_instance_minor >= 14:
         filename = os.path.join(MANIFESTS_DIR, "csi-driver-object.yaml")
         template(filename, namespace=NAMESPACE, kadalu_version=VERSION)
         lib_execute(KUBECTL_CMD, APPLY_CMD, "-f", filename)
+
     else:
         filename = os.path.join(MANIFESTS_DIR, "csi-driver-crd.yaml")
         template(filename, namespace=NAMESPACE, kadalu_version=VERSION)

templates/csi-driver-object-v1.yaml.j2

@@ -0,0 +1,7 @@
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+  name: kadalu
+spec:
+  attachRequired: true
+  podInfoOnMount: true