Merge pull request #67383 from stlaz/enc_config_promotion

Introduce apiserver.config.k8s.io/v1 and use standard method for parsing encryption config file
This commit is contained in:
k8s-ci-robot
2018-11-16 16:31:30 -08:00
committed by GitHub
19 changed files with 1154 additions and 88 deletions

View File

@@ -219,8 +219,8 @@ fi
ENCRYPTION_PROVIDER_CONFIG="${ENCRYPTION_PROVIDER_CONFIG:-}"
if [[ -z "${ENCRYPTION_PROVIDER_CONFIG}" ]]; then
ENCRYPTION_PROVIDER_CONFIG=$(cat << EOM | base64 | tr -d '\r\n'
kind: EncryptionConfig
apiVersion: v1
kind: EncryptionConfiguration
apiVersion: apiserver.config.k8s.io/v1
resources:
- resources:
- secrets