update-expected.sh

kubernetes · Jun 8, 2020 · 6b6038e · 6b6038e
1 parent 324f284
commit 6b6038e
Show file tree

Hide file tree

Showing 100 changed files with 6 additions and 684 deletions.
diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt
@@ -191,11 +191,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 FileAssets:
 - content: user,token

diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt
@@ -191,11 +191,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 FileAssets:
 - content: blah blah

diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt
@@ -191,11 +191,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 FileAssets:
 - content: blah blah

diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt
@@ -176,11 +176,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 FileAssets:
 - content: user,token

diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt
@@ -176,11 +176,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 FileAssets:
 - content: blah blah

diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt
@@ -176,11 +176,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 FileAssets:
 - content: blah blah

diff --git a/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/additional_cidr/cloudformation.json.extracted.yaml
@@ -266,11 +266,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersadditionalcidrex
 
   __EOF_CLUSTER_SPEC
 
-  cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-  {}
-
-  __EOF_IG_SPEC
-
   cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
   - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -281,7 +276,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmastersadditionalcidrex
   Hooks:
   - null
   - null
-  InstanceGroupName: master-us-test-1b
   InstanceGroupRole: Master
   KubeletConfig:
     anonymousAuth: false
@@ -510,11 +504,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionalcidrexamplecom.Propert
 
   __EOF_CLUSTER_SPEC
 
-  cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-  {}
-
-  __EOF_IG_SPEC
-
   cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
   - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -525,7 +514,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionalcidrexamplecom.Propert
   Hooks:
   - null
   - null
-  InstanceGroupName: nodes
   InstanceGroupRole: Node
   KubeletConfig:
     anonymousAuth: false

diff --git a/...a/aws_launch_configuration_master-us-test-1a.masters.additionalcidr.example.com_user_data b/...a/aws_launch_configuration_master-us-test-1a.masters.additionalcidr.example.com_user_data
@@ -265,11 +265,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -280,7 +275,6 @@ ConfigBase: memfs://clusters.example.com/additionalcidr.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
 KubeletConfig:
   anonymousAuth: false

diff --git a/...a/aws_launch_configuration_master-us-test-1b.masters.additionalcidr.example.com_user_data b/...a/aws_launch_configuration_master-us-test-1b.masters.additionalcidr.example.com_user_data
@@ -265,11 +265,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -280,7 +275,6 @@ ConfigBase: memfs://clusters.example.com/additionalcidr.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: master-us-test-1b
 InstanceGroupRole: Master
 KubeletConfig:
   anonymousAuth: false

diff --git a/...a/aws_launch_configuration_master-us-test-1c.masters.additionalcidr.example.com_user_data b/...a/aws_launch_configuration_master-us-test-1c.masters.additionalcidr.example.com_user_data
@@ -265,11 +265,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -280,7 +275,6 @@ ConfigBase: memfs://clusters.example.com/additionalcidr.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: master-us-test-1c
 InstanceGroupRole: Master
 KubeletConfig:
   anonymousAuth: false

diff --git a/.../additional_cidr/data/aws_launch_configuration_nodes.additionalcidr.example.com_user_data b/.../additional_cidr/data/aws_launch_configuration_nodes.additionalcidr.example.com_user_data
@@ -182,11 +182,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -197,7 +192,6 @@ ConfigBase: memfs://clusters.example.com/additionalcidr.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: nodes
 InstanceGroupRole: Node
 KubeletConfig:
   anonymousAuth: false

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
@@ -275,11 +275,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda
 
   __EOF_CLUSTER_SPEC
 
-  cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-  {}
-
-  __EOF_IG_SPEC
-
   cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
   - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -290,7 +285,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amastersadditionaluserda
   Hooks:
   - null
   - null
-  InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
   KubeletConfig:
     anonymousAuth: false
@@ -539,11 +533,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro
 
   __EOF_CLUSTER_SPEC
 
-  cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-  {}
-
-  __EOF_IG_SPEC
-
   cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
   - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -554,7 +543,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodesadditionaluserdataexamplecom.Pro
   Hooks:
   - null
   - null
-  InstanceGroupName: nodes
   InstanceGroupRole: Node
   KubeletConfig:
     anonymousAuth: false

diff --git a/...e/data/aws_launch_configuration_master-us-test-1a.masters.crosszone.example.com_user_data b/...e/data/aws_launch_configuration_master-us-test-1a.masters.crosszone.example.com_user_data
@@ -266,11 +266,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -281,7 +276,6 @@ ConfigBase: memfs://clusters.example.com/crosszone.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
 KubeletConfig:
   anonymousAuth: false

diff --git a/...er/api_elb_cross_zone/data/aws_launch_configuration_nodes.crosszone.example.com_user_data b/...er/api_elb_cross_zone/data/aws_launch_configuration_nodes.crosszone.example.com_user_data
@@ -182,11 +182,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -197,7 +192,6 @@ ConfigBase: memfs://clusters.example.com/crosszone.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: nodes
 InstanceGroupRole: Node
 KubeletConfig:
   anonymousAuth: false

diff --git a/.../aws_launch_configuration_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../aws_launch_configuration_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -263,11 +263,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -278,7 +273,6 @@ ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
 KubeletConfig:
   anonymousAuth: false

diff --git a/...ional_user-data/data/aws_launch_configuration_nodes.bastionuserdata.example.com_user_data b/...ional_user-data/data/aws_launch_configuration_nodes.bastionuserdata.example.com_user_data
@@ -190,11 +190,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -205,7 +200,6 @@ ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: nodes
 InstanceGroupRole: Node
 KubeletConfig:
   anonymousAuth: false

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -268,11 +268,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterscomplexexampleco
 
   __EOF_CLUSTER_SPEC
 
-  cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-  {}
-
-  __EOF_IG_SPEC
-
   cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
   - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -283,7 +278,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterscomplexexampleco
   Hooks:
   - null
   - null
-  InstanceGroupName: master-us-test-1a
   InstanceGroupRole: Master
   KubeletConfig:
     anonymousAuth: false
@@ -512,11 +506,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodescomplexexamplecom.Properties.Use
 
   __EOF_CLUSTER_SPEC
 
-  cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-  {}
-
-  __EOF_IG_SPEC
-
   cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
   Assets:
   - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -527,7 +516,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodescomplexexamplecom.Properties.Use
   Hooks:
   - null
   - null
-  InstanceGroupName: nodes
   InstanceGroupRole: Node
   KubeletConfig:
     anonymousAuth: false

diff --git a/...lex/data/aws_launch_configuration_master-us-test-1a.masters.complex.example.com_user_data b/...lex/data/aws_launch_configuration_master-us-test-1a.masters.complex.example.com_user_data
@@ -267,11 +267,6 @@ masterKubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -282,7 +277,6 @@ ConfigBase: memfs://clusters.example.com/complex.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: master-us-test-1a
 InstanceGroupRole: Master
 KubeletConfig:
   anonymousAuth: false

diff --git a/.../update_cluster/complex/data/aws_launch_configuration_nodes.complex.example.com_user_data b/.../update_cluster/complex/data/aws_launch_configuration_nodes.complex.example.com_user_data
@@ -182,11 +182,6 @@ kubelet:
 
 __EOF_CLUSTER_SPEC
 
-cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
-{}
-
-__EOF_IG_SPEC
-
 cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
 Assets:
 - c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
@@ -197,7 +192,6 @@ ConfigBase: memfs://clusters.example.com/complex.example.com
 Hooks:
 - null
 - null
-InstanceGroupName: nodes
 InstanceGroupRole: Node
 KubeletConfig:
   anonymousAuth: false