Pass --enable-***-webhook flags to operator (#619)

Signed-off-by: Tamal Saha <[email protected]>
stashed · Nov 23, 2018 · e4da720 · e4da720
1 parent e5a91c4
commit e4da720
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/chart/stash/templates/deployment.yaml b/chart/stash/templates/deployment.yaml
@@ -50,10 +50,12 @@ spec:
         - --tls-cert-file=/var/serving-cert/tls.crt
         - --tls-private-key-file=/var/serving-cert/tls.key
         - --service-name={{ template "stash.fullname" . }}
+        - --enable-mutating-webhook={{ .Values.apiserver.enableMutatingWebhook }}
+        - --enable-validating-webhook={{ .Values.apiserver.enableValidatingWebhook }}
+        - --bypass-validating-webhook-xray={{ .Values.apiserver.bypassValidatingWebhookXray }}
 {{- if and (not .Values.apiserver.disableStatusSubresource) (ge $major 1) (ge $minor 11) }}
         - --enable-status-subresource=true
 {{- end }}
-        - --bypass-validating-webhook-xray={{ .Values.apiserver.bypassValidatingWebhookXray }}
         - --use-kubeapiserver-fqdn-for-aks={{ .Values.apiserver.useKubeapiserverFqdnForAks }}
         - --enable-analytics={{ .Values.enableAnalytics }}
         ports:

diff --git a/hack/deploy/operator.yaml b/hack/deploy/operator.yaml
@@ -33,6 +33,7 @@ spec:
         - --tls-cert-file=/var/serving-cert/tls.crt
         - --tls-private-key-file=/var/serving-cert/tls.key
         - --service-name=${STASH_SERVICE_NAME}
+        - --enable-mutating-webhook=${STASH_ENABLE_MUTATING_WEBHOOK}
         - --enable-validating-webhook=${STASH_ENABLE_VALIDATING_WEBHOOK}
         - --bypass-validating-webhook-xray=${STASH_BYPASS_VALIDATING_WEBHOOK_XRAY}
         - --enable-status-subresource=${STASH_ENABLE_STATUS_SUBRESOURCE}