CSCwt70014: changes for kube1-35-1

Author: rtupakul

doc/running-minio.adoc

@@ -104,12 +104,15 @@ spec:
   # Uncomment and add storageClass specific to your requirements below. Read more https://kubernetes.io/docs/concepts/storage/persistent-volumes/#class-1
   storageClassName: kadalu.replica1
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   # This name uniquely identifies the Deployment
   name: minio-deployment
 spec:
+  selector:
+    matchLabels:
+      app: minio
   strategy:
     type: Recreate
   template:

helm/kadalu/charts/operator/templates/rbac.yaml

@@ -6,7 +6,6 @@ metadata:
 rules:
   - apiGroups:
       - storage.k8s.io
-      - csi.storage.k8s.io
     resources:
       - csidrivers
       - storageclasses

kadalu_operator/main.py

@@ -915,9 +915,10 @@ def deploy_csi_pods(core_v1_client):
 
     # Deploy CSI Pods
     api_instance = client.VersionApi().get_code()
+    k8s_major = int(re.sub(r'[^0-9]', '', api_instance.major))
+    k8s_minor = int(re.sub(r'[^0-9]', '', api_instance.minor))
 
-    if api_instance.major > "1" or api_instance.major == "1" and \
-       api_instance.minor >= "22":
+    if k8s_major > 1 or (k8s_major == 1 and k8s_minor >= 22):
 
         csi_driver_version = csi_driver_object_api_version()
         if csi_driver_version is not None and \
@@ -932,11 +933,11 @@ def deploy_csi_pods(core_v1_client):
         template(filename, namespace=NAMESPACE, kadalu_version=VERSION)
         lib_execute(KUBECTL_CMD, APPLY_CMD, "-f", filename)
 
-    elif api_instance.major > "1" or api_instance.major == "1" and \
-       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:
+        logging.warning(logf(
+            "Kubernetes version too old, CSIDriver v1 requires >= 1.22",
+            major=k8s_major, minor=k8s_minor
+        ))
 
     filename = os.path.join(MANIFESTS_DIR, "csi.yaml")
     docker_user = os.environ.get("DOCKER_USER", "kadalu")

manifests/kadalu-operator-microk8s.yaml

@@ -144,7 +144,6 @@ metadata:
 rules:
   - apiGroups:
       - storage.k8s.io
-      - csi.storage.k8s.io
     resources:
       - csidrivers
       - storageclasses

manifests/kadalu-operator-openshift.yaml

@@ -144,7 +144,6 @@ metadata:
 rules:
   - apiGroups:
       - storage.k8s.io
-      - csi.storage.k8s.io
     resources:
       - csidrivers
       - storageclasses

manifests/kadalu-operator-rke.yaml

@@ -144,7 +144,6 @@ metadata:
 rules:
   - apiGroups:
       - storage.k8s.io
-      - csi.storage.k8s.io
     resources:
       - csidrivers
       - storageclasses

manifests/kadalu-operator.yaml

@@ -144,7 +144,6 @@ metadata:
 rules:
   - apiGroups:
       - storage.k8s.io
-      - csi.storage.k8s.io
     resources:
       - csidrivers
       - storageclasses

requirements/operator-requirements.txt

@@ -16,7 +16,7 @@ google-auth==2.36.0
     # via kubernetes
 idna==3.10
     # via requests
-kubernetes==29.0.0
+kubernetes==31.0.0
     # via Kadalu (setup.py)
 oauthlib==3.2.2
     # via requests-oauthlib