Enable status sub resource by inspection of Kube version

kubedb · Sep 29, 2018 · f2204fb · f2204fb
1 parent 9aba48f
commit f2204fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/chart/kubedb/README.md b/chart/kubedb/README.md
@@ -67,7 +67,7 @@ The following table lists the configurable parameters of the KubeDB chart and th
 | `apiserver.enableValidatingWebhook` | Enable validating webhooks for KubeDB CRDs                         | `true`             |
 | `apiserver.enableMutatingWebhook`   | Enable mutating webhooks for KubeDB CRDs                           | `true`             |
 | `apiserver.ca`                      | CA certificate used by main Kubernetes api server                  | ``                 |
-| `apiserver.enableStatusSubresource` | If true, uses status sub resource for crds                         | `false`            |
+| `apiserver.disableStatusSubresource` | If true, disables status sub resource for crds. Otherwise enables based on Kubernetes version | `false`            |
 | `enableAnalytics`                   | Send usage events to Google Analytics                              | `true`             |
 
 

diff --git a/chart/kubedb/templates/deployment.yaml b/chart/kubedb/templates/deployment.yaml
@@ -1,3 +1,6 @@
+# GKE returns Major:"1", Minor:"10+"
+{{- $major := default "0" .Capabilities.KubeVersion.Major | trimSuffix "+" | int64 -}}
+{{- $minor := default "0" .Capabilities.KubeVersion.Minor | trimSuffix "+" | int64 -}}
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
@@ -46,7 +49,9 @@ spec:
         - --audit-log-path=-
         - --tls-cert-file=/var/serving-cert/tls.crt
         - --tls-private-key-file=/var/serving-cert/tls.key
-        - --enable-status-subresource={{ .Values.apiserver.enableStatusSubresource }}
+{{- if and (not .Values.apiserver.disableStatusSubresource) (ge $major 1) (ge $minor 11) }}
+        - --enable-status-subresource=true
+{{- end }}
         - --enable-analytics={{ .Values.enableAnalytics }}
         env:
         - name: OPERATOR_NAMESPACE

diff --git a/chart/kubedb/values.yaml b/chart/kubedb/values.yaml
@@ -71,8 +71,9 @@ apiserver:
   enableValidatingWebhook: true
   # CA certificate used by main Kubernetes api server
   ca:
-  # If true, uses status sub resource for crds.
-  enableStatusSubresource: false
+  # If true, disables status sub resource for crds.
+  # Otherwise, enables status sub resource for Kubernetes version >= 1.11 and disables for other versions.
+  disableStatusSubresource: false
 
 # Send usage events to Google Analytics
 enableAnalytics: true