From 9d72eb8d0955fdf4fbc18f42b408ccb6d45492da Mon Sep 17 00:00:00 2001
From: Tim Jones <timniverse@gmail.com>
Date: Tue, 20 Feb 2018 22:04:11 +0100
Subject: [PATCH] Ensure Helm waits for CRD\TPRs to be available before
 returning

Signed-off-by: Tim Jones <timniverse@gmail.com>
---
 .../rook/templates/wait-on-resources-job.yaml | 43 +++++++++++++++++++
 cluster/charts/rook/values.yaml.tmpl          |  5 +++
 2 files changed, 48 insertions(+)
 create mode 100644 cluster/charts/rook/templates/wait-on-resources-job.yaml

diff --git a/cluster/charts/rook/templates/wait-on-resources-job.yaml b/cluster/charts/rook/templates/wait-on-resources-job.yaml
new file mode 100644
index 000000000..eadff6c6a
--- /dev/null
+++ b/cluster/charts/rook/templates/wait-on-resources-job.yaml
@@ -0,0 +1,43 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: rook-operator-wait-resources
+  annotations:
+    helm.sh/hook: post-install
+    "helm.sh/hook-delete-policy": hook-succeeded
+  labels:
+    app: rook-operator-wait-resources
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+spec:
+  template:
+    metadata:
+      labels:
+        app: rook-operator-wait-resources
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    spec:
+      containers:
+        - name: hyperkube
+          image: "{{ .Values.hyperkube.repository }}:{{ .Values.hyperkube.tag }}"
+          imagePullPolicy: "{{ .Values.hyperkube.pullPolicy }}"
+          command:
+            - ./kubectl
+            - get
+            {{- if printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor | semverCompare ">=1.7" }}
+            - customresourcedefinitions
+            - clusters.rook.io
+            - pools.rook.io
+            - objectstores.rook.io
+            - filesystems.rook.io
+            - volumeattachments.rook.io
+            {{- else }}
+            - thirdpartyresources
+            - cluster.rook.io
+            - pool.rook.io
+            - objectstore.rook.io
+            - filesystem.rook.io
+            - volumeattachment.rook.io
+            {{- end }}
+      restartPolicy: OnFailure
+    {{- if .Values.rbacEnable }}
+      serviceAccountName: rook-operator
+    {{- end }}
diff --git a/cluster/charts/rook/values.yaml.tmpl b/cluster/charts/rook/values.yaml.tmpl
index a75caaf43..6a2d3f6c1 100644
--- a/cluster/charts/rook/values.yaml.tmpl
+++ b/cluster/charts/rook/values.yaml.tmpl
@@ -8,6 +8,11 @@ image:
   tag: %%VERSION%%
   pullPolicy: IfNotPresent
 
+hyperkube:
+  repository: k8s.gcr.io/hyperkube
+  tag: v1.7.12
+  pullPolicy: IfNotPresent
+
 resources:
   limits:
     cpu: 100m