From 4f3693b6354957c994f27ee91a6066630769a38c Mon Sep 17 00:00:00 2001
From: jayflory <jayflory@jayflory.jayflory>
Date: Sun, 10 May 2020 15:01:14 -0700
Subject: [PATCH] For k8s version 1.18

---
 deploy/gk-deploy                                    | 4 +++-
 deploy/kube-templates/deploy-heketi-deployment.yaml | 6 +++++-
 deploy/kube-templates/gluster-s3-storageclass.yaml  | 2 +-
 deploy/kube-templates/gluster-s3-template.yaml      | 2 +-
 deploy/kube-templates/glusterfs-daemonset.yaml      | 9 ++++++++-
 deploy/kube-templates/heketi-deployment.yaml        | 5 ++++-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/deploy/gk-deploy b/deploy/gk-deploy
index e3735e14..fbe05d70 100755
--- a/deploy/gk-deploy
+++ b/deploy/gk-deploy
@@ -754,9 +754,11 @@ if [[ ${GLUSTER} -eq 1 ]] && [[ ${EXISTS_GLUSTERFS} -eq 0 ]] && [[ ${EXISTS_HEKE
   fi
   while read -r node; do
     debug "Marking '${node}' as a GlusterFS node."
+    output "Marking '${node}' as a GlusterFS node."
     eval_output "${CLI} label nodes ${node} storagenode=${DAEMONSET_LABEL} --overwrite 2>&1"
     if [[ ${?} -ne 0 ]]; then
       output "Failed to label node '${node}'"
+      output "${CLI} label nodes ${node} storagenode=${DAEMONSET_LABEL} --overwrite 2>&1"
       exit 1
     fi
   done <<< "$(echo -e "${NODES}")"
@@ -921,7 +923,7 @@ while [[ "x${heketi_service}" == "x" ]] || [[ "${heketi_service}" == "<none>" ]]
   heketi_service=$(${CLI} describe svc/heketi | grep "Endpoints:" | awk '{print $2}')
 done
 
-heketi_pod=$(${CLI} get pod --no-headers --show-all --selector="heketi" | awk '{print $1}')
+heketi_pod=$(${CLI} get pod --no-headers --selector="heketi" | awk '{print $1}')
 
 if [[ "${CLI}" == *oc\ * ]]; then
   heketi_service=$(${CLI} describe routes/heketi | grep "Requested Host:" | awk '{print $3}')
diff --git a/deploy/kube-templates/deploy-heketi-deployment.yaml b/deploy/kube-templates/deploy-heketi-deployment.yaml
index 94f2cf7d..34e72460 100644
--- a/deploy/kube-templates/deploy-heketi-deployment.yaml
+++ b/deploy/kube-templates/deploy-heketi-deployment.yaml
@@ -17,7 +17,7 @@ spec:
     targetPort: 8080
 ---
 kind: Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: deploy-heketi
   labels:
@@ -27,10 +27,14 @@ metadata:
     description: Defines how to deploy Heketi
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      name: deploy-heketi
   template:
     metadata:
       name: deploy-heketi
       labels:
+        name: deploy-heketi
         glusterfs: heketi-pod
         deploy-heketi: pod
     spec:
diff --git a/deploy/kube-templates/gluster-s3-storageclass.yaml b/deploy/kube-templates/gluster-s3-storageclass.yaml
index fe6ee2b5..3605ae0d 100644
--- a/deploy/kube-templates/gluster-s3-storageclass.yaml
+++ b/deploy/kube-templates/gluster-s3-storageclass.yaml
@@ -1,6 +1,6 @@
 ---
 kind: StorageClass
-apiVersion: storage.k8s.io/v1beta1
+apiVersion: storage.k8s.io/v1
 metadata:
   name: ${STORAGE_CLASS}
   labels:
diff --git a/deploy/kube-templates/gluster-s3-template.yaml b/deploy/kube-templates/gluster-s3-template.yaml
index 60045bc1..5a391a9f 100644
--- a/deploy/kube-templates/gluster-s3-template.yaml
+++ b/deploy/kube-templates/gluster-s3-template.yaml
@@ -21,7 +21,7 @@ items:
   status:
     loadBalancer: {}
 - kind: Deployment
-  apiVersion: extensions/v1beta1
+  apiVersion: apps/v1
   metadata:
     name: gluster-s3-deployment
     labels:
diff --git a/deploy/kube-templates/glusterfs-daemonset.yaml b/deploy/kube-templates/glusterfs-daemonset.yaml
index c37a5f41..4e96b40c 100644
--- a/deploy/kube-templates/glusterfs-daemonset.yaml
+++ b/deploy/kube-templates/glusterfs-daemonset.yaml
@@ -1,6 +1,6 @@
 ---
 kind: DaemonSet
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: glusterfs
   labels:
@@ -9,10 +9,14 @@ metadata:
     description: GlusterFS DaemonSet
     tags: glusterfs
 spec:
+  selector:
+    matchLabels:
+      name: glusterfs
   template:
     metadata:
       name: glusterfs
       labels:
+        name: glusterfs
         glusterfs: pod
         glusterfs-node: pod
     spec:
@@ -95,6 +99,9 @@ spec:
           successThreshold: 1
           failureThreshold: 50
       volumes:
+      - name: glusterfs-hosts
+        configMap:
+          name: hosts-file
       - name: glusterfs-heketi
         hostPath:
           path: "/var/lib/heketi"
diff --git a/deploy/kube-templates/heketi-deployment.yaml b/deploy/kube-templates/heketi-deployment.yaml
index ecc6cefa..7c3a204a 100644
--- a/deploy/kube-templates/heketi-deployment.yaml
+++ b/deploy/kube-templates/heketi-deployment.yaml
@@ -17,7 +17,7 @@ spec:
     targetPort: 8080
 ---
 kind: Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 metadata:
   name: heketi
   labels:
@@ -27,6 +27,9 @@ metadata:
     description: Defines how to deploy Heketi
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      heketi: pod
   template:
     metadata:
       name: heketi