Merge pull request #91456 from tosi3k/propagate-am-whitelist-override

Propagate KUBECTL_PRUNE_WHITELIST_OVERRIDE to master kube-env
This commit is contained in:
Kubernetes Prow Robot 2020-05-27 02:20:40 -07:00 committed by GitHub
commit c1707541d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1346,6 +1346,7 @@ ETCD_CA_CERT: $(yaml-quote ${ETCD_CA_CERT_BASE64:-})
ETCD_PEER_KEY: $(yaml-quote ${ETCD_PEER_KEY_BASE64:-})
ETCD_PEER_CERT: $(yaml-quote ${ETCD_PEER_CERT_BASE64:-})
SERVICEACCOUNT_ISSUER: $(yaml-quote ${SERVICEACCOUNT_ISSUER:-})
KUBECTL_PRUNE_WHITELIST_OVERRIDE: $(yaml-quote ${KUBECTL_PRUNE_WHITELIST_OVERRIDE:-})
EOF
# KUBE_APISERVER_REQUEST_TIMEOUT_SEC (if set) controls the --request-timeout
# flag