From dfb2f37b00bff2a665786899c5ca5a41e2f61f69 Mon Sep 17 00:00:00 2001 From: Rita Zhang Date: Mon, 26 Nov 2018 16:53:40 -0800 Subject: [PATCH] Fix issue caused by updating azure.json (#4279) --- .circleci/config.yml | 8 ++++---- parts/k8s/artifacts/kubernetesazurekms.service | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5dda4ed60f..bd4848dfd9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,7 +72,7 @@ jobs: echo 'export ORCHESTRATOR_RELEASE=1.10' >> $BASH_ENV echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV echo 'export CREATE_VNET=true' >> $BASH_ENV - echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV + echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV echo 'export RETAIN_SSH=false' >> $BASH_ENV @@ -98,7 +98,7 @@ jobs: echo 'export ORCHESTRATOR_RELEASE=1.11' >> $BASH_ENV echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV echo 'export CREATE_VNET=true' >> $BASH_ENV - echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV + echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV echo 'export RETAIN_SSH=false' >> $BASH_ENV @@ -124,7 +124,7 @@ jobs: echo 'export ORCHESTRATOR_RELEASE=1.12' >> $BASH_ENV echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV echo 'export CREATE_VNET=true' >> $BASH_ENV - echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV + echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV echo 'export RETAIN_SSH=false' >> $BASH_ENV @@ -150,7 +150,7 @@ jobs: echo 'export ORCHESTRATOR_RELEASE=1.13' >> $BASH_ENV echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV echo 'export CREATE_VNET=true' >> $BASH_ENV - echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV + echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV echo 'export RETAIN_SSH=false' >> $BASH_ENV diff --git a/parts/k8s/artifacts/kubernetesazurekms.service b/parts/k8s/artifacts/kubernetesazurekms.service index 356d244dc7..c68c0eeb1d 100644 --- a/parts/k8s/artifacts/kubernetesazurekms.service +++ b/parts/k8s/artifacts/kubernetesazurekms.service @@ -13,7 +13,7 @@ ExecStart=/usr/bin/docker run \ --volume=/etc/kubernetes:/etc/kubernetes \ --volume=/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \ --volume=/var/lib/waagent:/var/lib/waagent \ - microsoft/k8s-azure-kms:v0.0.4 + microsoft/k8s-azure-kms:v0.0.5 [Install] WantedBy=multi-user.target