kubernetes · k8s-ci-robot · Jul 31, 2020 · Jul 29, 2020 · Jul 29, 2020 · Jul 29, 2020
diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go
@@ -28,8 +28,6 @@ import (
 
 // Config is the configuration for the nodeup binary
 type Config struct {
-	// Tags enable/disable chunks of the model
-	Tags []string `json:",omitempty"`
 	// Assets are locations where we can find files to be installed
 	// TODO: Remove once everything is in containers?
 	Assets map[architectures.Architecture][]string `json:",omitempty"`

diff --git a/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/.../data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
@@ -309,9 +309,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/...additional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
@@ -235,9 +235,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml
 

diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
@@ -324,9 +324,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -595,9 +592,6 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
     nonMasqueradeCIDR: 100.64.0.0/10
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml
 

diff --git a/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/.../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
@@ -323,9 +323,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
@@ -237,9 +237,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...s/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml b/...s/integration/update_cluster/containerd-cloudformation/cloudformation.json.extracted.yaml
@@ -303,9 +303,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
     nonMasqueradeCIDR: 100.64.0.0/10
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -547,9 +544,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
       node-role.kubernetes.io/node: ""
     nonMasqueradeCIDR: 100.64.0.0/10
     podManifestPath: /etc/kubernetes/manifests
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/...iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/...te_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
@@ -228,9 +228,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/...integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
@@ -313,9 +313,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -564,9 +561,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
     nonMasqueradeCIDR: 100.64.0.0/10
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/...ng_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/...pdate_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
@@ -228,9 +228,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml
 

diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
@@ -313,9 +313,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -564,9 +561,6 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat
     nonMasqueradeCIDR: 100.64.0.0/10
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/...nallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/...update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
@@ -228,9 +228,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/...data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
@@ -314,9 +314,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/...er/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
@@ -228,9 +228,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/...te_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
@@ -312,9 +312,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
@@ -228,9 +228,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml
 

diff --git a/...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
@@ -318,9 +318,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _gce
 channels:
 - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
@@ -318,9 +318,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _gce
 channels:
 - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/...le_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
@@ -318,9 +318,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _gce
 channels:
 - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/...ce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
@@ -233,9 +233,6 @@ KubeletConfig:
   nonMasqueradeCIDR: 100.64.0.0/10
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
-Tags:
-- _automatic_upgrades
-- _gce
 channels:
 - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml
 

diff --git a/tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/launch_templates/cloudformation.json.extracted.yaml
@@ -316,9 +316,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1amasterslaunchtemplatese
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -654,9 +651,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1bmasterslaunchtemplatese
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -992,9 +986,6 @@ Resources.AWSAutoScalingLaunchConfigurationmasterustest1cmasterslaunchtemplatese
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
     registerSchedulable: false
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
   etcdManifests:
@@ -1245,9 +1236,6 @@ Resources.AWSAutoScalingLaunchConfigurationnodeslaunchtemplatesexamplecom.Proper
     nonMasqueradeCIDR: 100.64.0.0/10
     podInfraContainerImage: k8s.gcr.io/pause:3.2
     podManifestPath: /etc/kubernetes/manifests
-  Tags:
-  - _automatic_upgrades
-  - _aws
   channels:
   - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
 

diff --git a/.../aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data b/.../aws_launch_configuration_master-us-test-1a.masters.launchtemplates.example.com_user_data
@@ -315,9 +315,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/.../aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data b/.../aws_launch_configuration_master-us-test-1b.masters.launchtemplates.example.com_user_data
@@ -315,9 +315,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
 etcdManifests:

diff --git a/.../aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data b/.../aws_launch_configuration_master-us-test-1c.masters.launchtemplates.example.com_user_data
@@ -315,9 +315,6 @@ KubeletConfig:
   podInfraContainerImage: k8s.gcr.io/pause:3.2
   podManifestPath: /etc/kubernetes/manifests
   registerSchedulable: false
-Tags:
-- _automatic_upgrades
-- _aws
 channels:
 - memfs://clusters.example.com/launchtemplates.example.com/addons/bootstrap-channel.yaml
 etcdManifests: