Update chart installation instruction for Kubernetes 1.11 (#527)

stashed · Jul 8, 2018 · 3321c0c · 3321c0c
1 parent 2bfa4a0
commit 3321c0c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/chart/stash/README.md b/chart/stash/README.md
@@ -59,7 +59,7 @@ The following table lists the configurable parameters of the Stash chart and the
 | `apiserver.enableValidatingWebhook` | Enable validating webhooks for Stash CRDs                         | false              |
 | `apiserver.enableMutatingWebhook`   | Enable mutating webhooks for Kubernetes workloads                 | false              |
 | `apiserver.ca`                      | CA certificate used by main Kubernetes api server                 | ``                 |
-| `enableStatusSubresource`           | If true, uses status sub resource for crds                        | `false`            |
+| `apiserver.enableStatusSubresource` | If true, uses status sub resource for crds                        | `false`            |
 | `enableAnalytics`                   | Send usage events to Google Analytics                             | `true`             |
 
 

diff --git a/chart/stash/templates/deployment.yaml b/chart/stash/templates/deployment.yaml
@@ -42,7 +42,7 @@ 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.enableStatusSubresource }}
+        - --enable-status-subresource={{ .Values.apiserver.enableStatusSubresource }}
         - --enable-analytics={{ .Values.enableAnalytics }}
         ports:
         - containerPort: 8443

diff --git a/chart/stash/values.yaml b/chart/stash/values.yaml
@@ -52,9 +52,8 @@ apiserver:
   enableValidatingWebhook: false
   # CA certificate used by main Kubernetes api server
   ca:
+  # If true, uses status sub resource for crds.
+  enableStatusSubresource: false
 
 # Send usage events to Google Analytics
 enableAnalytics: true
-
-# If true, uses status sub resource for crds.
-enableStatusSubresource: false
diff --git a/docs/setup/install.md b/docs/setup/install.md
@@ -119,12 +119,20 @@ appscode/stash  0.7.0    0.7.0  Stash by AppsCode - Backup your Kubernetes Volum
 # Kubernetes 1.8.x
 $ helm install appscode/stash --name stash-operator --version 0.7.0 --namespace kube-system
 
-# Kubernetes 1.9.0 or later
+# Kubernetes 1.9.x - 1.10.x
 $ helm install appscode/stash --name stash-operator --version 0.7.0 \
   --namespace kube-system \
   --set apiserver.ca="$(onessl get kube-ca)" \
   --set apiserver.enableValidatingWebhook=true \
   --set apiserver.enableMutatingWebhook=true
+
+# Kubernetes 1.11.0 or later
+$ helm install appscode/stash --name stash-operator --version 0.7.0 \
+  --namespace kube-system \
+  --set apiserver.ca="$(onessl get kube-ca)" \
+  --set apiserver.enableValidatingWebhook=true \
+  --set apiserver.enableMutatingWebhook=true \
+  --set apiserver.enableStatusSubresource=true
 ```
 
 To install `onessl`, run the following commands: