Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Commit dfb2f37

Browse files
ritazhjackfrancis
authored andcommitted
Fix issue caused by updating azure.json (#4279)
1 parent 99df9fb commit dfb2f37

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
echo 'export ORCHESTRATOR_RELEASE=1.10' >> $BASH_ENV
7373
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
7474
echo 'export CREATE_VNET=true' >> $BASH_ENV
75-
echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
75+
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
7676
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
7777
echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
7878
echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -98,7 +98,7 @@ jobs:
9898
echo 'export ORCHESTRATOR_RELEASE=1.11' >> $BASH_ENV
9999
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
100100
echo 'export CREATE_VNET=true' >> $BASH_ENV
101-
echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
101+
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
102102
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
103103
echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
104104
echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -124,7 +124,7 @@ jobs:
124124
echo 'export ORCHESTRATOR_RELEASE=1.12' >> $BASH_ENV
125125
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
126126
echo 'export CREATE_VNET=true' >> $BASH_ENV
127-
echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
127+
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
128128
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
129129
echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
130130
echo 'export RETAIN_SSH=false' >> $BASH_ENV
@@ -150,7 +150,7 @@ jobs:
150150
echo 'export ORCHESTRATOR_RELEASE=1.13' >> $BASH_ENV
151151
echo 'export CLUSTER_DEFINITION=examples/e2e-tests/kubernetes/release/default/definition.json' >> $BASH_ENV
152152
echo 'export CREATE_VNET=true' >> $BASH_ENV
153-
echo 'export ENABLE_KMS_ENCRYPTION=false' >> $BASH_ENV
153+
echo 'export ENABLE_KMS_ENCRYPTION=true' >> $BASH_ENV
154154
echo 'export CLEANUP_ON_EXIT=${CLEANUP_ON_EXIT}' >> $BASH_ENV
155155
echo 'export CLEANUP_IF_FAIL=${CLEANUP_IF_FAIL_LINUX}' >> $BASH_ENV
156156
echo 'export RETAIN_SSH=false' >> $BASH_ENV

parts/k8s/artifacts/kubernetesazurekms.service

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ExecStart=/usr/bin/docker run \
1313
--volume=/etc/kubernetes:/etc/kubernetes \
1414
--volume=/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt \
1515
--volume=/var/lib/waagent:/var/lib/waagent \
16-
microsoft/k8s-azure-kms:v0.0.4
16+
microsoft/k8s-azure-kms:v0.0.5
1717

1818
[Install]
1919
WantedBy=multi-user.target

0 commit comments

Comments
 (0)