add kms api model in test/e2e/test_cluster_configs

Azure · Jan 19, 2021 · 3972994 · 3972994
1 parent 10c53a6
commit 3972994
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_main.sh b/parts/k8s/cloud-init/artifacts/cse_main.sh
@@ -219,12 +219,12 @@ time_metric "EnsureContainerd" ensureContainerd
 time_metric "EnsureDHCPv6" ensureDHCPv6
 {{end}}
 
+{{/* configure and enable kms plugin */}}
+{{- if EnableEncryptionWithExternalKms}}
 if [[ -n ${MASTER_NODE} ]]; then
-  {{/* configure and enable kms plugin */}}
-  {{- if EnableEncryptionWithExternalKms}}
   time_metric "EnsureKMSKeyvaultKey" ensureKMSKeyvaultKey
-  {{end}}
 fi
+{{end}}
 
 time_metric "EnsureKubelet" ensureKubelet
 {{if IsAzurePolicyAddonEnabled}}

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go
diff --git a/test/e2e/test_cluster_configs/kms.json b/test/e2e/test_cluster_configs/kms.json
@@ -0,0 +1,36 @@
+{
+    "env": {},
+    "apiModel": {
+        "apiVersion": "vlabs",
+        "properties": {
+            "orchestratorProfile": {
+                "kubernetesConfig": {
+                    "enableEncryptionWithExternalKms": true,
+                    "keyVaultSku": "Premium"
+                }
+            },
+            "masterProfile": {
+                "count": 1,
+                "dnsPrefix": "",
+                "vmSize": "Standard_D2_v3"
+            },
+            "agentPoolProfiles": [
+                {
+                    "name": "agentpool1",
+                    "count": 2,
+                    "vmSize": "Standard_D2_v3"
+                }
+            ],
+            "linuxProfile": {
+                "adminUsername": "azureuser",
+                "ssh": {
+                    "publicKeys": [
+                        {
+                            "keyData": ""
+                        }
+                    ]
+                }
+            }
+        }
+    }
+}