From f0c3ed8965d8b87c9b40dcd39199a40869755f74 Mon Sep 17 00:00:00 2001 From: Kashif Saadat Date: Thu, 16 Nov 2017 14:53:57 +0000 Subject: [PATCH] Include encryptionConfig setting within userdata for masters. --- pkg/model/bootstrapscript.go | 1 + pkg/model/tests/data/bootstrapscript_0.txt | 1 + pkg/model/tests/data/bootstrapscript_1.txt | 1 + pkg/model/tests/data/bootstrapscript_2.txt | 1 + .../additional_user-data/cloudformation.json.extracted.yaml | 1 + .../minimal-cloudformation/cloudformation.json.extracted.yaml | 1 + 6 files changed, 6 insertions(+) diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index cbd412946e..f179301d15 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -101,6 +101,7 @@ func (b *BootstrapScript) ResourceNodeUp(ig *kops.InstanceGroup, cs *kops.Cluste spec["kubeProxy"] = cs.KubeProxy if ig.IsMaster() { + spec["encryptionConfig"] = cs.EncryptionConfig spec["kubeAPIServer"] = cs.KubeAPIServer spec["kubeControllerManager"] = cs.KubeControllerManager spec["kubeScheduler"] = cs.KubeScheduler diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 7ff3dbbe25..fb0ec4d0f5 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -158,6 +158,7 @@ cloudConfig: nodeTags: something docker: logLevel: INFO +encryptionConfig: null kubeAPIServer: image: CoreOS kubeControllerManager: diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index b46b85183a..4f5e78576a 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -158,6 +158,7 @@ cloudConfig: nodeTags: something docker: logLevel: INFO +encryptionConfig: null fileAssets: - content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) name: iptables-restore diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index b46b85183a..4f5e78576a 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -158,6 +158,7 @@ cloudConfig: nodeTags: something docker: logLevel: INFO +encryptionConfig: null fileAssets: - content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) name: iptables-restore diff --git a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml index b2be8d9160..de3fd91bf1 100644 --- a/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/additional_user-data/cloudformation.json.extracted.yaml @@ -156,6 +156,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda logLevel: warn storage: overlay,aufs version: 1.11.2 + encryptionConfig: null kubeAPIServer: address: 127.0.0.1 admissionControl: diff --git a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml index 2afec70446..05143daa6b 100644 --- a/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-cloudformation/cloudformation.json.extracted.yaml @@ -147,6 +147,7 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersminimalexampleco logLevel: warn storage: overlay,aufs version: 1.11.2 + encryptionConfig: null kubeAPIServer: address: 127.0.0.1 admissionControl: