Merge pull request #24 from Cray-HPE/CASM-2670

Fixes CASMPET-5174: replace wait-for-pods with kubectl command
Cray-HPE · Nov 22, 2021 · ebc564e · ebc564e
2 parents 141d382 + 02190c8
commit ebc564e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/kubernetes/cray-istio-deploy/Chart.yaml b/kubernetes/cray-istio-deploy/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 1.26.1
+version: 1.26.2
 name: cray-istio-deploy
 description: Creates the IstioOperator instance that deploys the Istio control plane.
 keywords:

diff --git a/kubernetes/cray-istio-deploy/templates/rbac.yaml b/kubernetes/cray-istio-deploy/templates/rbac.yaml
@@ -31,8 +31,8 @@ rules:
 - apiGroups: ["apiextensions.k8s.io"]
   resources: ["customresourcedefinitions"]
   verbs: ["get", "list"]
-- apiGroups: [""]
-  resources: ["pods"]
+- apiGroups: ["", "apps"]
+  resources: ["pods", "deployments"]
   verbs: ["get", "list"]
 ---
 kind: ClusterRoleBinding

diff --git a/kubernetes/cray-istio-deploy/templates/wait-jobs.yaml b/kubernetes/cray-istio-deploy/templates/wait-jobs.yaml
@@ -55,4 +55,4 @@ spec:
             - '/bin/sh'
           args:
             - '-c'
-            - '/usr/local/bin/wait-for-pods istiod'
+            - 'kubectl rollout status deployment -n istio-system istiod --timeout=15m'
diff --git a/kubernetes/cray-istio/Chart.yaml b/kubernetes/cray-istio/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 2.4.1
+version: 2.4.2
 name: cray-istio
 description: Cray Istio for cluster service mesh including service gateway/sidecars, monitoring etc.
 keywords:

diff --git a/kubernetes/cray-istio/templates/ingress-gateway/wait-jobs.yaml b/kubernetes/cray-istio/templates/ingress-gateway/wait-jobs.yaml
@@ -27,5 +27,5 @@ spec:
             - '/bin/sh'
           args:
             - '-c'
-            - '/usr/local/bin/wait-for-pods {{ $name }}'
+            - 'kubectl rollout status deployment -n istio-system {{ $name }} --timeout=15m'
 {{- end }}
diff --git a/kubernetes/cray-istio/templates/rbac.yaml b/kubernetes/cray-istio/templates/rbac.yaml
@@ -9,8 +9,8 @@ kind: ClusterRole
 metadata:
   name: cray-istio-jobs-role
 rules:
-- apiGroups: [""]
-  resources: ["pods"]
+- apiGroups: ["", "apps"]
+  resources: ["pods", "deployments"]
   verbs: ["get", "list"]
 ---
 kind: ClusterRoleBinding