Merge pull request #1569 from TimJones/chart-wait-for-resources

Check for supporting API instead of specific K8S version

cluster/charts/rook/templates/wait-on-resources-job.yaml

@@ -1,4 +1,3 @@
-{{- if and .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -23,7 +22,7 @@ spec:
           command:
             - ./kubectl
             - get
-            {{- if printf "%s.%s" .Capabilities.KubeVersion.Major .Capabilities.KubeVersion.Minor | semverCompare ">=1.7" }}
+            {{- if .Capabilities.APIVersions.Has "apiextensions.k8s.io/v1beta1" }}
             - customresourcedefinitions
             - clusters.rook.io
             - pools.rook.io
@@ -42,4 +41,3 @@ spec:
     {{- if .Values.rbacEnable }}
       serviceAccountName: rook-operator
     {{- end }}
-{{- end }}