diff --git a/cmd/kops-controller/pkg/server/node_config.go b/cmd/kops-controller/pkg/server/node_config.go index 771360acaf..305a06ecf6 100644 --- a/cmd/kops-controller/pkg/server/node_config.go +++ b/cmd/kops-controller/pkg/server/node_config.go @@ -61,6 +61,16 @@ func (s *Server) getNodeConfig(ctx context.Context, req *nodeup.BootstrapRequest nodeConfig.InstanceGroupConfig = string(b) } + { + p := s.configBase.Join("igconfig", "node", instanceGroupName, "auxconfig.yaml") + + b, err := p.ReadFile() + if err != nil { + return nil, fmt.Errorf("error loading AuxConfig %q: %v", p, err) + } + nodeConfig.AuxConfig = string(b) + } + // We populate some certificates that we know the node will need. for _, name := range []string{"ca"} { cert, _, _, err := s.keystore.FindKeypair(name) diff --git a/nodeup/pkg/model/context.go b/nodeup/pkg/model/context.go index 5317c10b45..439ef154a9 100644 --- a/nodeup/pkg/model/context.go +++ b/nodeup/pkg/model/context.go @@ -48,16 +48,16 @@ const ( // NodeupModelContext is the context supplied the nodeup tasks type NodeupModelContext struct { - Cloud fi.Cloud - Architecture architectures.Architecture - Assets *fi.AssetStore - Cluster *kops.Cluster - ConfigBase vfs.Path - Distribution distributions.Distribution - InstanceGroup *kops.InstanceGroup - KeyStore fi.CAStore - NodeupConfig *nodeup.Config - SecretStore fi.SecretStore + Cloud fi.Cloud + Architecture architectures.Architecture + Assets *fi.AssetStore + Cluster *kops.Cluster + ConfigBase vfs.Path + Distribution distributions.Distribution + KeyStore fi.CAStore + NodeupConfig *nodeup.Config + NodeupAuxConfig *nodeup.AuxConfig + SecretStore fi.SecretStore // IsMaster is true if the InstanceGroup has a role of master (populated by Init) IsMaster bool diff --git a/nodeup/pkg/model/convenience.go b/nodeup/pkg/model/convenience.go index 1c526ef828..52791080e0 100644 --- a/nodeup/pkg/model/convenience.go +++ b/nodeup/pkg/model/convenience.go @@ -23,7 +23,6 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kops/pkg/apis/kops" "k8s.io/kops/upup/pkg/fi" ) @@ -37,17 +36,6 @@ func b(v bool) *bool { return fi.Bool(v) } -// containsRole checks if a collection roles contains role v -func containsRole(v kops.InstanceGroupRole, list []kops.InstanceGroupRole) bool { - for _, x := range list { - if v == x { - return true - } - } - - return false -} - // buildDockerEnvironmentVars just converts a series of keypairs to docker environment variables switches func buildDockerEnvironmentVars(env map[string]string) []string { var list []string diff --git a/nodeup/pkg/model/file_assets.go b/nodeup/pkg/model/file_assets.go index 05818de32d..a2e5c05321 100644 --- a/nodeup/pkg/model/file_assets.go +++ b/nodeup/pkg/model/file_assets.go @@ -45,28 +45,12 @@ func (f *FileAssetsBuilder) Build(c *fi.ModelBuilderContext) error { Mode: s("0755"), }) - // do we have any instanceGroup file assets - if f.InstanceGroup.Spec.FileAssets != nil { - if err := f.buildFileAssets(c, f.InstanceGroup.Spec.FileAssets, tracker); err != nil { - return err - } - } - if f.Cluster.Spec.FileAssets != nil { - if err := f.buildFileAssets(c, f.Cluster.Spec.FileAssets, tracker); err != nil { - return err - } - } - - return nil + return f.buildFileAssets(c, f.NodeupAuxConfig.FileAssets, tracker) } // buildFileAssets is responsible for rendering the file assets to disk func (f *FileAssetsBuilder) buildFileAssets(c *fi.ModelBuilderContext, assets []kops.FileAssetSpec, tracker map[string]bool) error { for _, asset := range assets { - // @check if the file asset applies to us. If no roles applied we assume its applied to all roles - if len(asset.Roles) > 0 && !containsRole(f.NodeupConfig.InstanceGroupRole, asset.Roles) { - continue - } // @check if e have a path and if not use the default path assetPath := asset.Path if assetPath == "" { diff --git a/nodeup/pkg/model/hooks.go b/nodeup/pkg/model/hooks.go index 082beadb2a..a637529691 100644 --- a/nodeup/pkg/model/hooks.go +++ b/nodeup/pkg/model/hooks.go @@ -40,13 +40,9 @@ var _ fi.ModelBuilder = &HookBuilder{} func (h *HookBuilder) Build(c *fi.ModelBuilderContext) error { // we keep a list of hooks name so we can allow local instanceGroup hooks override the cluster ones hookNames := make(map[string]bool) - for i, spec := range []*[]kops.HookSpec{&h.InstanceGroup.Spec.Hooks, &h.Cluster.Spec.Hooks} { - for j, hook := range *spec { + for i, spec := range h.NodeupAuxConfig.Hooks { + for j, hook := range spec { isInstanceGroup := i == 0 - // filter roles if required - if len(hook.Roles) > 0 && !containsRole(h.NodeupConfig.InstanceGroupRole, hook.Roles) { - continue - } // I don't want to affect those whom are already using the hooks, so I'm going to try to keep the name for now // i.e. use the default naming convention - kops-hook-, only those using the Name or hooks in IG should alter diff --git a/nodeup/pkg/model/kubelet.go b/nodeup/pkg/model/kubelet.go index c7639cf2be..62bb6e272b 100644 --- a/nodeup/pkg/model/kubelet.go +++ b/nodeup/pkg/model/kubelet.go @@ -306,10 +306,6 @@ func (b *KubeletBuilder) buildSystemdService() *nodetasks.Service { // buildKubeletConfig is responsible for creating the kubelet configuration func (b *KubeletBuilder) buildKubeletConfig() (*kops.KubeletConfigSpec, error) { - if b.InstanceGroup == nil { - klog.Fatalf("InstanceGroup was not set") - } - kubeletConfigSpec, err := b.buildKubeletConfigSpec() if err != nil { return nil, fmt.Errorf("error building kubelet config: %v", err) @@ -429,7 +425,7 @@ func (b *KubeletBuilder) addContainerizedMounter(c *fi.ModelBuilderContext) erro // buildKubeletConfigSpec returns the kubeletconfig for the specified instanceGroup func (b *KubeletBuilder) buildKubeletConfigSpec() (*kops.KubeletConfigSpec, error) { isMaster := b.IsMaster - isAPIServer := b.InstanceGroup.Spec.Role == kops.InstanceGroupRoleAPIServer + isAPIServer := b.NodeupConfig.InstanceGroupRole == kops.InstanceGroupRoleAPIServer // Merge KubeletConfig for NodeLabels c := b.NodeupConfig.KubeletConfig diff --git a/nodeup/pkg/model/kubelet_test.go b/nodeup/pkg/model/kubelet_test.go index ea8df2329d..84c252f542 100644 --- a/nodeup/pkg/model/kubelet_test.go +++ b/nodeup/pkg/model/kubelet_test.go @@ -44,11 +44,12 @@ func Test_InstanceGroupKubeletMerge(t *testing.T) { instanceGroup.Spec.Kubelet.NvidiaGPUs = 1 instanceGroup.Spec.Role = kops.InstanceGroupRoleNode + config, auxConfig := nodeup.NewConfig(cluster, instanceGroup) b := &KubeletBuilder{ &NodeupModelContext{ - Cluster: cluster, - InstanceGroup: instanceGroup, - NodeupConfig: nodeup.NewConfig(cluster, instanceGroup), + Cluster: cluster, + NodeupConfig: config, + NodeupAuxConfig: auxConfig, }, } if err := b.Init(); err != nil { @@ -89,11 +90,12 @@ func TestTaintsApplied(t *testing.T) { cluster := &kops.Cluster{Spec: kops.ClusterSpec{KubernetesVersion: g.version}} ig := &kops.InstanceGroup{Spec: kops.InstanceGroupSpec{Role: kops.InstanceGroupRoleMaster, Taints: g.taints}} + config, auxConfig := nodeup.NewConfig(cluster, ig) b := &KubeletBuilder{ &NodeupModelContext{ - Cluster: cluster, - InstanceGroup: ig, - NodeupConfig: nodeup.NewConfig(cluster, ig), + Cluster: cluster, + NodeupConfig: config, + NodeupAuxConfig: auxConfig, }, } if err := b.Init(); err != nil { @@ -238,8 +240,7 @@ func BuildNodeupModelContext(basedir string) (*NodeupModelContext, error) { if len(model.InstanceGroups) == 0 { // We tolerate this - not all tests need an instance group } else if len(model.InstanceGroups) == 1 { - nodeUpModelContext.InstanceGroup = model.InstanceGroups[0] - nodeUpModelContext.NodeupConfig = nodeup.NewConfig(model.Cluster, nodeUpModelContext.InstanceGroup) + nodeUpModelContext.NodeupConfig, nodeUpModelContext.NodeupAuxConfig = nodeup.NewConfig(model.Cluster, model.InstanceGroups[0]) } else { return nil, fmt.Errorf("unexpected number of instance groups in %s, found %d", basedir, len(model.InstanceGroups)) } diff --git a/nodeup/pkg/model/update_service.go b/nodeup/pkg/model/update_service.go index d0013259c6..3c2e9d4dc6 100644 --- a/nodeup/pkg/model/update_service.go +++ b/nodeup/pkg/model/update_service.go @@ -49,20 +49,12 @@ func (b *UpdateServiceBuilder) Build(c *fi.ModelBuilderContext) error { } func (b *UpdateServiceBuilder) buildFlatcarSystemdService(c *fi.ModelBuilderContext) { - if b.InstanceGroup.Spec.UpdatePolicy != nil { - switch *b.InstanceGroup.Spec.UpdatePolicy { - case kops.UpdatePolicyAutomatic: - klog.Infof("UpdatePolicy set in InstanceGroup %q spec requests automatic updates; skipping creation of systemd unit %q", b.InstanceGroup.GetName(), flatcarServiceName) - return - case kops.UpdatePolicyExternal: - // Carry on with creating this systemd unit. - } - } else if fi.StringValue(b.Cluster.Spec.UpdatePolicy) != kops.UpdatePolicyExternal { - klog.Infof("UpdatePolicy in Cluster spec requests automatic updates; skipping creation of systemd unit %q", flatcarServiceName) + if b.NodeupConfig.UpdatePolicy != kops.UpdatePolicyExternal { + klog.Infof("UpdatePolicy requests automatic updates; skipping creation of systemd unit %q", flatcarServiceName) return } - for _, spec := range [][]kops.HookSpec{b.InstanceGroup.Spec.Hooks, b.Cluster.Spec.Hooks} { + for _, spec := range b.NodeupAuxConfig.Hooks { for _, hook := range spec { if hook.Name == flatcarServiceName || hook.Name == flatcarServiceName+".service" { klog.Infof("Detected kops Hook for '%s'; skipping creation", flatcarServiceName) @@ -93,16 +85,8 @@ func (b *UpdateServiceBuilder) buildFlatcarSystemdService(c *fi.ModelBuilderCont } func (b *UpdateServiceBuilder) buildDebianPackage(c *fi.ModelBuilderContext) { - if b.InstanceGroup.Spec.UpdatePolicy != nil { - switch *b.InstanceGroup.Spec.UpdatePolicy { - case kops.UpdatePolicyAutomatic: - klog.Infof("UpdatePolicy set in InstanceGroup %q spec requests automatic updates; skipping installation of packagk %q", b.InstanceGroup.GetName(), debianPackageName) - return - case kops.UpdatePolicyExternal: - // Carry on with creating this systemd unit. - } - } else if fi.StringValue(b.Cluster.Spec.UpdatePolicy) != kops.UpdatePolicyExternal { - klog.Infof("UpdatePolicy in Cluster spec requests automatic updates; skipping installation of package %q", debianPackageName) + if b.NodeupConfig.UpdatePolicy != kops.UpdatePolicyExternal { + klog.Infof("UpdatePolicy requests automatic updates; skipping installation of package %q", debianPackageName) return } diff --git a/pkg/apis/nodeup/bootstrap.go b/pkg/apis/nodeup/bootstrap.go index d1cf402a1d..7013ab1cc7 100644 --- a/pkg/apis/nodeup/bootstrap.go +++ b/pkg/apis/nodeup/bootstrap.go @@ -47,6 +47,9 @@ type NodeConfig struct { // ClusterFullConfig holds the configuration for the cluster ClusterFullConfig string `json:"clusterFullConfig,omitempty"` + // AuxConfig holds the nodeup.AuxConfig for the node's instance group. + AuxConfig string `json:"auxConfig,omitempty"` + // Certificates holds certificates that are already issued Certificates []*NodeConfigCertificate `json:"certificates,omitempty"` } diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index 4c25bd00d3..1400b2e486 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -53,6 +53,8 @@ type Config struct { // DefaultMachineType is the first-listed instance machine type, used if querying instance metadata fails. DefaultMachineType *string `json:",omitempty"` + // EnableLifecycleHook defines whether we need to complete a lifecycle hook. + EnableLifecycleHook bool `json:",omitempty"` // StaticManifests describes generic static manifests // Using this allows us to keep complex logic out of nodeup StaticManifests []*StaticManifest `json:"staticManifests,omitempty"` @@ -62,11 +64,23 @@ type Config struct { // specified, each parameter must follow the form variable=value, the way // it would appear in sysctl.conf. SysctlParameters []string `json:",omitempty"` + // UpdatePolicy determines the policy for applying upgrades automatically. + UpdatePolicy string // VolumeMounts are a collection of volume mounts. VolumeMounts []kops.VolumeMountSpec `json:",omitempty"` // ConfigServer holds the configuration for the configuration server ConfigServer *ConfigServerOptions `json:"configServer,omitempty"` + // AuxConfigHash holds a secure hash of the nodeup.AuxConfig. + AuxConfigHash string +} + +// AuxConfig is the configuration for the nodeup binary that might be too big to fit in userdata. +type AuxConfig struct { + // FileAssets are a collection of file assets for this instance group. + FileAssets []kops.FileAssetSpec `json:",omitempty"` + // Hooks are for custom actions, for example on first installation. + Hooks [][]kops.HookSpec } type ConfigServerOptions struct { @@ -97,7 +111,7 @@ type StaticManifest struct { Path string `json:"path,omitempty"` } -func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config { +func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (*Config, *AuxConfig) { role := instanceGroup.Spec.Role isMaster := role == kops.InstanceGroupRoleMaster @@ -107,6 +121,19 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config VolumeMounts: instanceGroup.Spec.VolumeMounts, } + clusterHooks := filterHooks(cluster.Spec.Hooks, instanceGroup.Spec.Role) + igHooks := filterHooks(instanceGroup.Spec.Hooks, instanceGroup.Spec.Role) + + auxConfig := AuxConfig{ + FileAssets: append(filterFileAssets(instanceGroup.Spec.FileAssets, role), filterFileAssets(cluster.Spec.FileAssets, role)...), + Hooks: [][]kops.HookSpec{igHooks, clusterHooks}, + } + + warmPool := cluster.Spec.WarmPool.ResolveDefaults(instanceGroup) + if warmPool.IsEnabled() && warmPool.EnableLifecycleHook { + config.EnableLifecycleHook = true + } + if isMaster { reflectutils.JSONMergeStruct(&config.KubeletConfig, cluster.Spec.MasterKubelet) @@ -134,9 +161,51 @@ func NewConfig(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) *Config config.KubeletConfig.Taints = append(config.KubeletConfig.Taints, instanceGroup.Spec.Taints...) + if instanceGroup.Spec.UpdatePolicy != nil { + config.UpdatePolicy = *instanceGroup.Spec.UpdatePolicy + } else if cluster.Spec.UpdatePolicy != nil { + config.UpdatePolicy = *cluster.Spec.UpdatePolicy + } else { + config.UpdatePolicy = kops.UpdatePolicyAutomatic + } + if cluster.Spec.Networking != nil && cluster.Spec.Networking.AmazonVPC != nil { config.DefaultMachineType = fi.String(strings.Split(instanceGroup.Spec.MachineType, ",")[0]) } - return &config + return &config, &auxConfig +} + +func filterFileAssets(f []kops.FileAssetSpec, role kops.InstanceGroupRole) []kops.FileAssetSpec { + var fileAssets []kops.FileAssetSpec + for _, fileAsset := range f { + if len(fileAsset.Roles) > 0 && !containsRole(role, fileAsset.Roles) { + continue + } + fileAsset.Roles = nil + fileAssets = append(fileAssets, fileAsset) + } + return fileAssets +} + +func filterHooks(h []kops.HookSpec, role kops.InstanceGroupRole) []kops.HookSpec { + var hooks []kops.HookSpec + for _, hook := range h { + if len(hook.Roles) > 0 && !containsRole(role, hook.Roles) { + continue + } + hook.Roles = nil + hooks = append(hooks, hook) + } + return hooks +} + +func containsRole(v kops.InstanceGroupRole, list []kops.InstanceGroupRole) bool { + for _, x := range list { + if v == x { + return true + } + } + + return false } diff --git a/pkg/client/simple/vfsclientset/clientset.go b/pkg/client/simple/vfsclientset/clientset.go index e15a94aa6a..46b72b381b 100644 --- a/pkg/client/simple/vfsclientset/clientset.go +++ b/pkg/client/simple/vfsclientset/clientset.go @@ -161,6 +161,9 @@ func DeleteAllClusterState(basePath vfs.Path) error { if strings.HasPrefix(relativePath, "instancegroup/") { continue } + if strings.HasPrefix(relativePath, "igconfig/") { + continue + } if strings.HasPrefix(relativePath, "manifests/") { continue } diff --git a/pkg/model/awsmodel/autoscalinggroup_test.go b/pkg/model/awsmodel/autoscalinggroup_test.go index 32369b1b19..6070996ce1 100644 --- a/pkg/model/awsmodel/autoscalinggroup_test.go +++ b/pkg/model/awsmodel/autoscalinggroup_test.go @@ -68,6 +68,9 @@ func TestRootVolumeOptimizationFlag(t *testing.T) { InstanceGroups: igs, }, }, + BootstrapScriptBuilder: &model.BootstrapScriptBuilder{ + Lifecycle: fi.LifecycleSync, + }, Cluster: cluster, } @@ -154,6 +157,9 @@ func TestAPIServerAdditionalSecurityGroupsWithNLB(t *testing.T) { InstanceGroups: igs, }, }, + BootstrapScriptBuilder: &model.BootstrapScriptBuilder{ + Lifecycle: fi.LifecycleSync, + }, Cluster: cluster, } diff --git a/pkg/model/azuremodel/BUILD.bazel b/pkg/model/azuremodel/BUILD.bazel index 54311a2a73..24b8de5e27 100644 --- a/pkg/model/azuremodel/BUILD.bazel +++ b/pkg/model/azuremodel/BUILD.bazel @@ -40,6 +40,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/kops:go_default_library", + "//pkg/model:go_default_library", "//pkg/model/defaults:go_default_library", "//upup/pkg/fi:go_default_library", "//upup/pkg/fi/cloudup/azuretasks:go_default_library", diff --git a/pkg/model/azuremodel/vmscaleset_test.go b/pkg/model/azuremodel/vmscaleset_test.go index 986287a0f2..38f8cf86a1 100644 --- a/pkg/model/azuremodel/vmscaleset_test.go +++ b/pkg/model/azuremodel/vmscaleset_test.go @@ -24,6 +24,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-01/compute" "github.com/Azure/go-autorest/autorest/to" "k8s.io/kops/pkg/apis/kops" + "k8s.io/kops/pkg/model" "k8s.io/kops/pkg/model/defaults" "k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi/fitasks" @@ -32,6 +33,9 @@ import ( func TestVMScaleSetModelBuilder_Build(t *testing.T) { b := VMScaleSetModelBuilder{ AzureModelContext: newTestAzureModelContext(), + BootstrapScriptBuilder: &model.BootstrapScriptBuilder{ + Lifecycle: fi.LifecycleSync, + }, } c := &fi.ModelBuilderContext{ Tasks: make(map[string]fi.Task), diff --git a/pkg/model/bootstrapscript.go b/pkg/model/bootstrapscript.go index 11da889e81..404f895717 100644 --- a/pkg/model/bootstrapscript.go +++ b/pkg/model/bootstrapscript.go @@ -19,7 +19,7 @@ package model import ( "bytes" "compress/gzip" - "crypto/sha1" + "crypto/sha256" "encoding/base64" "fmt" "os" @@ -43,11 +43,12 @@ import ( ) type NodeUpConfigBuilder interface { - BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, ca fi.Resource) (*nodeup.Config, error) + BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, ca fi.Resource) (*nodeup.Config, *nodeup.AuxConfig, error) } // BootstrapScriptBuilder creates the bootstrap script type BootstrapScriptBuilder struct { + Lifecycle fi.Lifecycle NodeUpAssets map[architectures.Architecture]*mirrors.MirroredAsset NodeUpConfigBuilder NodeUpConfigBuilder } @@ -65,6 +66,9 @@ type BootstrapScript struct { // caTask holds the CA task, for dependency analysis. caTask fi.Task + + // auxConfig contains the nodeup auxiliary config. + auxConfig fi.TaskDependentResource } var _ fi.Task = &BootstrapScript{} @@ -89,11 +93,19 @@ func (b *BootstrapScript) kubeEnv(ig *kops.InstanceGroup, c *fi.Context, ca fi.R } sort.Strings(alternateNames) - config, err := b.builder.NodeUpConfigBuilder.BuildConfig(ig, alternateNames, ca) + config, auxConfig, err := b.builder.NodeUpConfigBuilder.BuildConfig(ig, alternateNames, ca) if err != nil { return "", err } + auxData, err := utils.YamlMarshal(auxConfig) + if err != nil { + return "", fmt.Errorf("error converting nodeup auxiliary config to yaml: %v", err) + } + sum256 := sha256.Sum256(auxData) + config.AuxConfigHash = base64.StdEncoding.EncodeToString(sum256[:]) + b.auxConfig.Resource = fi.NewBytesResource(auxData) + data, err := utils.YamlMarshal(config) if err != nil { return "", fmt.Errorf("error converting nodeup config to yaml: %v", err) @@ -222,7 +234,15 @@ func (b *BootstrapScriptBuilder) ResourceNodeUp(c *fi.ModelBuilderContext, ig *k ca: caTask.Certificate(), } task.resource.Task = task + task.auxConfig.Task = task c.AddTask(task) + + c.AddTask(&fitasks.ManagedFile{ + Name: fi.String("auxconfig-" + ig.Name), + Lifecycle: b.Lifecycle, + Location: fi.String("igconfig/" + strings.ToLower(string(ig.Spec.Role)) + "/" + ig.Name + "/auxconfig.yaml"), + Contents: &task.auxConfig, + }) return &task.resource, nil } @@ -246,6 +266,11 @@ func (b *BootstrapScript) GetDependencies(tasks map[string]fi.Task) []fi.Task { } func (b *BootstrapScript) Run(c *fi.Context) error { + config, err := b.kubeEnv(b.ig, c, b.ca) + if err != nil { + return err + } + functions := template.FuncMap{ "NodeUpSourceAmd64": func() string { if b.builder.NodeUpAssets[architectures.ArchitectureAmd64] != nil { @@ -271,8 +296,8 @@ func (b *BootstrapScript) Run(c *fi.Context) error { } return "" }, - "KubeEnv": func() (string, error) { - return b.kubeEnv(b.ig, c, b.ca) + "KubeEnv": func() string { + return config }, "EnvironmentVariables": func() (string, error) { @@ -345,22 +370,6 @@ func (b *BootstrapScript) Run(c *fi.Context) error { } } - hooks, err := b.getRelevantHooks(cs.Hooks, b.ig.Spec.Role) - if err != nil { - return "", err - } - if len(hooks) > 0 { - spec["hooks"] = hooks - } - - fileAssets, err := b.getRelevantFileAssets(cs.FileAssets, b.ig.Spec.Role) - if err != nil { - return "", err - } - if len(fileAssets) > 0 { - spec["fileAssets"] = fileAssets - } - content, err := yaml.Marshal(spec) if err != nil { return "", fmt.Errorf("error converting cluster spec to yaml for inclusion within bootstrap script: %v", err) @@ -368,32 +377,6 @@ func (b *BootstrapScript) Run(c *fi.Context) error { return string(content), nil }, - "IGSpec": func() (string, error) { - spec := make(map[string]interface{}) - - hooks, err := b.getRelevantHooks(b.ig.Spec.Hooks, b.ig.Spec.Role) - if err != nil { - return "", err - } - if len(hooks) > 0 { - spec["hooks"] = hooks - } - - fileAssets, err := b.getRelevantFileAssets(b.ig.Spec.FileAssets, b.ig.Spec.Role) - if err != nil { - return "", err - } - if len(fileAssets) > 0 { - spec["fileAssets"] = fileAssets - } - - content, err := yaml.Marshal(spec) - if err != nil { - return "", fmt.Errorf("error converting instancegroup spec to yaml for inclusion within bootstrap script: %v", err) - } - return string(content), nil - }, - "CompressUserData": func() *bool { return b.ig.Spec.CompressUserData }, @@ -423,103 +406,6 @@ func (b *BootstrapScript) Run(c *fi.Context) error { return nil } -// getRelevantHooks returns a list of hooks to be applied to the instance group, -// with the Manifest and ExecContainer Commands fingerprinted to reduce size -func (b *BootstrapScript) getRelevantHooks(allHooks []kops.HookSpec, role kops.InstanceGroupRole) ([]kops.HookSpec, error) { - relevantHooks := []kops.HookSpec{} - for _, hook := range allHooks { - if len(hook.Roles) == 0 { - relevantHooks = append(relevantHooks, hook) - continue - } - for _, hookRole := range hook.Roles { - if role == hookRole { - relevantHooks = append(relevantHooks, hook) - break - } - } - } - - hooks := []kops.HookSpec{} - if len(relevantHooks) > 0 { - for _, hook := range relevantHooks { - if hook.Manifest != "" { - manifestFingerprint, err := b.computeFingerprint(hook.Manifest) - if err != nil { - return nil, err - } - hook.Manifest = manifestFingerprint + " (fingerprint)" - } - - if hook.ExecContainer != nil && hook.ExecContainer.Command != nil { - execContainerCommandFingerprint, err := b.computeFingerprint(strings.Join(hook.ExecContainer.Command[:], " ")) - if err != nil { - return nil, err - } - - execContainerAction := &kops.ExecContainerAction{ - Command: []string{execContainerCommandFingerprint + " (fingerprint)"}, - Environment: hook.ExecContainer.Environment, - Image: hook.ExecContainer.Image, - } - hook.ExecContainer = execContainerAction - } - - hook.Roles = nil - hooks = append(hooks, hook) - } - } - - return hooks, nil -} - -// getRelevantFileAssets returns a list of file assets to be applied to the -// instance group, with the Content fingerprinted to reduce size -func (b *BootstrapScript) getRelevantFileAssets(allFileAssets []kops.FileAssetSpec, role kops.InstanceGroupRole) ([]kops.FileAssetSpec, error) { - relevantFileAssets := []kops.FileAssetSpec{} - for _, fileAsset := range allFileAssets { - if len(fileAsset.Roles) == 0 { - relevantFileAssets = append(relevantFileAssets, fileAsset) - continue - } - for _, fileAssetRole := range fileAsset.Roles { - if role == fileAssetRole { - relevantFileAssets = append(relevantFileAssets, fileAsset) - break - } - } - } - - fileAssets := []kops.FileAssetSpec{} - if len(relevantFileAssets) > 0 { - for _, fileAsset := range relevantFileAssets { - if fileAsset.Content != "" { - contentFingerprint, err := b.computeFingerprint(fileAsset.Content) - if err != nil { - return nil, err - } - fileAsset.Content = contentFingerprint + " (fingerprint)" - } - - fileAsset.Roles = nil - fileAssets = append(fileAssets, fileAsset) - } - } - - return fileAssets, nil -} - -// computeFingerprint takes a string and returns a base64 encoded fingerprint -func (b *BootstrapScript) computeFingerprint(content string) (string, error) { - hasher := sha1.New() - - if _, err := hasher.Write([]byte(content)); err != nil { - return "", fmt.Errorf("error computing fingerprint hash: %v", err) - } - - return base64.StdEncoding.EncodeToString(hasher.Sum(nil)), nil -} - func (b *BootstrapScript) createProxyEnv(ps *kops.EgressProxySpec) string { var buffer bytes.Buffer diff --git a/pkg/model/bootstrapscript_test.go b/pkg/model/bootstrapscript_test.go index 4cc3067237..ab9e62f6b1 100644 --- a/pkg/model/bootstrapscript_test.go +++ b/pkg/model/bootstrapscript_test.go @@ -17,6 +17,7 @@ limitations under the License. package model import ( + "fmt" "strings" "testing" @@ -63,62 +64,63 @@ type nodeupConfigBuilder struct { cluster *kops.Cluster } -func (n *nodeupConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, ca fi.Resource) (*nodeup.Config, error) { - return nodeup.NewConfig(n.cluster, ig), nil +func (n *nodeupConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, ca fi.Resource) (*nodeup.Config, *nodeup.AuxConfig, error) { + config, auxConfig := nodeup.NewConfig(n.cluster, ig) + return config, auxConfig, nil } func TestBootstrapUserData(t *testing.T) { cs := []struct { Role kops.InstanceGroupRole - ExpectedFilePath string + ExpectedFileIndex int HookSpecRoles []kops.InstanceGroupRole FileAssetSpecRoles []kops.InstanceGroupRole }{ { Role: "Master", - ExpectedFilePath: "tests/data/bootstrapscript_0.txt", + ExpectedFileIndex: 0, HookSpecRoles: []kops.InstanceGroupRole{""}, FileAssetSpecRoles: []kops.InstanceGroupRole{""}, }, { Role: "Master", - ExpectedFilePath: "tests/data/bootstrapscript_0.txt", + ExpectedFileIndex: 0, HookSpecRoles: []kops.InstanceGroupRole{"Node"}, FileAssetSpecRoles: []kops.InstanceGroupRole{"Node"}, }, { Role: "Master", - ExpectedFilePath: "tests/data/bootstrapscript_1.txt", + ExpectedFileIndex: 1, HookSpecRoles: []kops.InstanceGroupRole{"Master"}, FileAssetSpecRoles: []kops.InstanceGroupRole{"Master"}, }, { Role: "Master", - ExpectedFilePath: "tests/data/bootstrapscript_2.txt", + ExpectedFileIndex: 2, HookSpecRoles: []kops.InstanceGroupRole{"Master", "Node"}, FileAssetSpecRoles: []kops.InstanceGroupRole{"Master", "Node"}, }, { Role: "Node", - ExpectedFilePath: "tests/data/bootstrapscript_3.txt", + ExpectedFileIndex: 3, HookSpecRoles: []kops.InstanceGroupRole{""}, FileAssetSpecRoles: []kops.InstanceGroupRole{""}, }, { Role: "Node", - ExpectedFilePath: "tests/data/bootstrapscript_4.txt", + ExpectedFileIndex: 4, HookSpecRoles: []kops.InstanceGroupRole{"Node"}, FileAssetSpecRoles: []kops.InstanceGroupRole{"Node"}, }, { Role: "Node", - ExpectedFilePath: "tests/data/bootstrapscript_3.txt", + ExpectedFileIndex: 3, HookSpecRoles: []kops.InstanceGroupRole{"Master"}, FileAssetSpecRoles: []kops.InstanceGroupRole{"Master"}, }, { Role: "Node", - ExpectedFilePath: "tests/data/bootstrapscript_5.txt", + ExpectedFileIndex: 5, HookSpecRoles: []kops.InstanceGroupRole{"Master", "Node"}, FileAssetSpecRoles: []kops.InstanceGroupRole{"Master", "Node"}, }, @@ -168,7 +170,16 @@ func TestBootstrapUserData(t *testing.T) { continue } - golden.AssertMatchesFile(t, actual, x.ExpectedFilePath) + golden.AssertMatchesFile(t, actual, fmt.Sprintf("tests/data/bootstrapscript_%d.txt", x.ExpectedFileIndex)) + + require.Contains(t, c.Tasks, "ManagedFile/auxconfig-testIG") + actual, err = fi.ResourceAsString(c.Tasks["ManagedFile/auxconfig-testIG"].(*fitasks.ManagedFile).Contents) + if err != nil { + t.Errorf("case %d failed to render auxconfig resource. error: %s", i, err) + continue + } + + golden.AssertMatchesFile(t, actual, fmt.Sprintf("tests/data/auxconfig_%d.txt", x.ExpectedFileIndex)) } } diff --git a/pkg/model/iam/iam_builder.go b/pkg/model/iam/iam_builder.go index e5481c8308..76644d6daa 100644 --- a/pkg/model/iam/iam_builder.go +++ b/pkg/model/iam/iam_builder.go @@ -588,6 +588,7 @@ func ReadableStatePaths(cluster *kops.Cluster, role Subject) ([]string, error) { "/addons/*", "/cluster.spec", "/config", + "/igconfig/node/*", "/instancegroup/*", "/pki/issued/*", "/pki/ssh/*", diff --git a/pkg/model/iam/tests/iam_builder_node_strict.json b/pkg/model/iam/tests/iam_builder_node_strict.json index a97b516f8d..87928f2c1b 100644 --- a/pkg/model/iam/tests/iam_builder_node_strict.json +++ b/pkg/model/iam/tests/iam_builder_node_strict.json @@ -26,6 +26,7 @@ "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/addons/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/cluster.spec", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/config", + "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/igconfig/node/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/instancegroup/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/pki/issued/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/pki/private/kube-proxy/*", diff --git a/pkg/model/iam/tests/iam_builder_node_strict_ecr.json b/pkg/model/iam/tests/iam_builder_node_strict_ecr.json index 970b939302..4ebbcfbdce 100644 --- a/pkg/model/iam/tests/iam_builder_node_strict_ecr.json +++ b/pkg/model/iam/tests/iam_builder_node_strict_ecr.json @@ -26,6 +26,7 @@ "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/addons/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/cluster.spec", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/config", + "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/igconfig/node/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/instancegroup/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/pki/issued/*", "arn:aws:s3:::kops-tests/iam-builder-test.k8s.local/pki/private/kube-proxy/*", diff --git a/pkg/model/openstackmodel/servergroup_test.go b/pkg/model/openstackmodel/servergroup_test.go index 6daf4c4608..679cd26d97 100644 --- a/pkg/model/openstackmodel/servergroup_test.go +++ b/pkg/model/openstackmodel/servergroup_test.go @@ -1012,8 +1012,8 @@ func createBuilderForCluster(cluster *kops.Cluster, instanceGroups []*kops.Insta type nodeupConfigBuilder struct { } -func (n *nodeupConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, ca fi.Resource) (*nodeup.Config, error) { - return &nodeup.Config{}, nil +func (n *nodeupConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, ca fi.Resource) (*nodeup.Config, *nodeup.AuxConfig, error) { + return &nodeup.Config{}, &nodeup.AuxConfig{}, nil } func TestServerGroupBuilder(t *testing.T) { diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml index 464d3caf3d..db520aad45 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-additional-security-groups.yaml @@ -76,6 +76,15 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: - additional-sg ID: null diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml index cc8374b575..3ab89adfa6 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-ClusterSpec.yaml @@ -75,6 +75,15 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml index cc8374b575..3ab89adfa6 100644 --- a/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/adds-cloud-labels-from-InstanceGroupSpec.yaml @@ -75,6 +75,15 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml index 54d74cd59a..cc89ed378c 100644 --- a/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/configures-server-group-affinity-with-annotations.yaml @@ -74,6 +74,15 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml index 50220020c9..208aa5228f 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-auto-zone-distribution.yaml @@ -511,6 +511,24 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: master +Lifecycle: "" +Location: igconfig/master/master/auxconfig.yaml +Name: auxconfig-master +Public: null +--- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml index bd38aed156..bd776861c1 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion-with-API-loadbalancer.yaml @@ -537,6 +537,60 @@ Loadbalancer: VipSubnet: null Name: master-public-name-https --- +Base: null +Contents: + task: + Name: master-a +Lifecycle: "" +Location: igconfig/master/master-a/auxconfig.yaml +Name: auxconfig-master-a +Public: null +--- +Base: null +Contents: + task: + Name: master-b +Lifecycle: "" +Location: igconfig/master/master-b/auxconfig.yaml +Name: auxconfig-master-b +Public: null +--- +Base: null +Contents: + task: + Name: master-c +Lifecycle: "" +Location: igconfig/master/master-c/auxconfig.yaml +Name: auxconfig-master-c +Public: null +--- +Base: null +Contents: + task: + Name: node-a +Lifecycle: "" +Location: igconfig/node/node-a/auxconfig.yaml +Name: auxconfig-node-a +Public: null +--- +Base: null +Contents: + task: + Name: node-b +Lifecycle: "" +Location: igconfig/node/node-b/auxconfig.yaml +Name: auxconfig-node-b +Public: null +--- +Base: null +Contents: + task: + Name: node-c +Lifecycle: "" +Location: igconfig/node/node-c/auxconfig.yaml +Name: auxconfig-node-c +Public: null +--- ID: null InterfaceName: cluster Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml index ac5b92b98d..c57910f211 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-bastion.yaml @@ -519,6 +519,60 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: master-a +Lifecycle: "" +Location: igconfig/master/master-a/auxconfig.yaml +Name: auxconfig-master-a +Public: null +--- +Base: null +Contents: + task: + Name: master-b +Lifecycle: "" +Location: igconfig/master/master-b/auxconfig.yaml +Name: auxconfig-master-b +Public: null +--- +Base: null +Contents: + task: + Name: master-c +Lifecycle: "" +Location: igconfig/master/master-c/auxconfig.yaml +Name: auxconfig-master-c +Public: null +--- +Base: null +Contents: + task: + Name: node-a +Lifecycle: "" +Location: igconfig/node/node-a/auxconfig.yaml +Name: auxconfig-node-a +Public: null +--- +Base: null +Contents: + task: + Name: node-b +Lifecycle: "" +Location: igconfig/node/node-b/auxconfig.yaml +Name: auxconfig-node-b +Public: null +--- +Base: null +Contents: + task: + Name: node-c +Lifecycle: "" +Location: igconfig/node/node-c/auxconfig.yaml +Name: auxconfig-node-c +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml index 578fd38953..f486c41396 100644 --- a/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/multizone-setup-3-masters-3-nodes-without-external-router.yaml @@ -441,6 +441,60 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: master-a +Lifecycle: "" +Location: igconfig/master/master-a/auxconfig.yaml +Name: auxconfig-master-a +Public: null +--- +Base: null +Contents: + task: + Name: master-b +Lifecycle: "" +Location: igconfig/master/master-b/auxconfig.yaml +Name: auxconfig-master-b +Public: null +--- +Base: null +Contents: + task: + Name: master-c +Lifecycle: "" +Location: igconfig/master/master-c/auxconfig.yaml +Name: auxconfig-master-c +Public: null +--- +Base: null +Contents: + task: + Name: node-a +Lifecycle: "" +Location: igconfig/node/node-a/auxconfig.yaml +Name: auxconfig-node-a +Public: null +--- +Base: null +Contents: + task: + Name: node-b +Lifecycle: "" +Location: igconfig/node/node-b/auxconfig.yaml +Name: auxconfig-node-b +Public: null +--- +Base: null +Contents: + task: + Name: node-c +Lifecycle: "" +Location: igconfig/node/node-c/auxconfig.yaml +Name: auxconfig-node-c +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml index 77000ab910..f71c99ea46 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml @@ -218,6 +218,33 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: bastion +Lifecycle: "" +Location: igconfig/bastion/bastion/auxconfig.yaml +Name: auxconfig-bastion +Public: null +--- +Base: null +Contents: + task: + Name: master +Lifecycle: "" +Location: igconfig/master/master/auxconfig.yaml +Name: auxconfig-master +Public: null +--- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml index 93f5982091..a9ff5165e9 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml @@ -244,6 +244,33 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: bastion +Lifecycle: "" +Location: igconfig/bastion/bastion/auxconfig.yaml +Name: auxconfig-bastion +Public: null +--- +Base: null +Contents: + task: + Name: master +Lifecycle: "" +Location: igconfig/master/master/auxconfig.yaml +Name: auxconfig-master +Public: null +--- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml index 201581f1a0..66eac143c8 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node-without-bastion-no-public-ip-association.yaml @@ -151,6 +151,24 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: master +Lifecycle: "" +Location: igconfig/master/master/auxconfig.yaml +Name: auxconfig-master +Public: null +--- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml index db8471da11..89fedf0cfe 100644 --- a/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/one-master-one-node.yaml @@ -177,6 +177,24 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: master +Lifecycle: "" +Location: igconfig/master/master/auxconfig.yaml +Name: auxconfig-master +Public: null +--- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: null ID: null Lifecycle: Sync diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml index f5d9d65c98..555f362a75 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-subnet-as-availability-zones-fallback.yaml @@ -76,6 +76,15 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: - additional-sg ID: null diff --git a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml index 60bf8e75c7..b63ae975c0 100644 --- a/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml +++ b/pkg/model/openstackmodel/tests/servergroup/uses-instance-group-zones-as-availability-zones.yaml @@ -76,6 +76,15 @@ oldFormat: false subject: cn=kubernetes type: ca --- +Base: null +Contents: + task: + Name: node +Lifecycle: "" +Location: igconfig/node/node/auxconfig.yaml +Name: auxconfig-node +Public: null +--- AdditionalSecurityGroups: - additional-sg ID: null diff --git a/pkg/model/resources/nodeup.go b/pkg/model/resources/nodeup.go index 2b88f3e73b..af8b8d2833 100644 --- a/pkg/model/resources/nodeup.go +++ b/pkg/model/resources/nodeup.go @@ -153,14 +153,6 @@ cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' __EOF_CLUSTER_SPEC {{- end }} -{{ if CompressUserData -}} -echo "{{ GzipBase64 IGSpec }}" | base64 -d | gzip -d > conf/ig_spec.yaml -{{- else -}} -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -{{ IGSpec }} -__EOF_IG_SPEC -{{- end }} - {{ if CompressUserData -}} echo "{{ GzipBase64 KubeEnv }}" | base64 -d | gzip -d > conf/kube_env.yaml {{- else -}} diff --git a/pkg/model/tests/data/auxconfig_0.txt b/pkg/model/tests/data/auxconfig_0.txt new file mode 100644 index 0000000000..db93a243ef --- /dev/null +++ b/pkg/model/tests/data/auxconfig_0.txt @@ -0,0 +1,10 @@ +FileAssets: +- content: user,token + name: tokens + path: /kube/tokens.csv +Hooks: +- - manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl start apply-to-all.service + name: apply-to-all.service +- null diff --git a/pkg/model/tests/data/auxconfig_1.txt b/pkg/model/tests/data/auxconfig_1.txt new file mode 100644 index 0000000000..2fd9a6437a --- /dev/null +++ b/pkg/model/tests/data/auxconfig_1.txt @@ -0,0 +1,28 @@ +FileAssets: +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +- content: user,token + name: tokens + path: /kube/tokens.csv +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +Hooks: +- - before: + - update-engine.service + - kubelet.service + manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl stop update-engine.service + name: disable-update-engine.service + - manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl start apply-to-all.service + name: apply-to-all.service +- - execContainer: + command: + - sh + - -c + - apt-get update + image: busybox diff --git a/pkg/model/tests/data/auxconfig_2.txt b/pkg/model/tests/data/auxconfig_2.txt new file mode 100644 index 0000000000..2fd9a6437a --- /dev/null +++ b/pkg/model/tests/data/auxconfig_2.txt @@ -0,0 +1,28 @@ +FileAssets: +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +- content: user,token + name: tokens + path: /kube/tokens.csv +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +Hooks: +- - before: + - update-engine.service + - kubelet.service + manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl stop update-engine.service + name: disable-update-engine.service + - manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl start apply-to-all.service + name: apply-to-all.service +- - execContainer: + command: + - sh + - -c + - apt-get update + image: busybox diff --git a/pkg/model/tests/data/auxconfig_3.txt b/pkg/model/tests/data/auxconfig_3.txt new file mode 100644 index 0000000000..db93a243ef --- /dev/null +++ b/pkg/model/tests/data/auxconfig_3.txt @@ -0,0 +1,10 @@ +FileAssets: +- content: user,token + name: tokens + path: /kube/tokens.csv +Hooks: +- - manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl start apply-to-all.service + name: apply-to-all.service +- null diff --git a/pkg/model/tests/data/auxconfig_4.txt b/pkg/model/tests/data/auxconfig_4.txt new file mode 100644 index 0000000000..2fd9a6437a --- /dev/null +++ b/pkg/model/tests/data/auxconfig_4.txt @@ -0,0 +1,28 @@ +FileAssets: +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +- content: user,token + name: tokens + path: /kube/tokens.csv +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +Hooks: +- - before: + - update-engine.service + - kubelet.service + manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl stop update-engine.service + name: disable-update-engine.service + - manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl start apply-to-all.service + name: apply-to-all.service +- - execContainer: + command: + - sh + - -c + - apt-get update + image: busybox diff --git a/pkg/model/tests/data/auxconfig_5.txt b/pkg/model/tests/data/auxconfig_5.txt new file mode 100644 index 0000000000..2fd9a6437a --- /dev/null +++ b/pkg/model/tests/data/auxconfig_5.txt @@ -0,0 +1,28 @@ +FileAssets: +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +- content: user,token + name: tokens + path: /kube/tokens.csv +- content: blah blah + name: iptables-restore + path: /var/lib/iptables/rules-save +Hooks: +- - before: + - update-engine.service + - kubelet.service + manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl stop update-engine.service + name: disable-update-engine.service + - manifest: |- + Type=oneshot + ExecStart=/usr/bin/systemctl start apply-to-all.service + name: apply-to-all.service +- - execContainer: + command: + - sh + - -c + - apt-get update + image: busybox diff --git a/pkg/model/tests/data/bootstrapscript_0.txt b/pkg/model/tests/data/bootstrapscript_0.txt index 78fdcfca1a..eb9633c87d 100644 --- a/pkg/model/tests/data/bootstrapscript_0.txt +++ b/pkg/model/tests/data/bootstrapscript_0.txt @@ -170,18 +170,8 @@ masterKubelet: __EOF_CLUSTER_SPEC -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -fileAssets: -- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint) - name: tokens - path: /kube/tokens.csv -hooks: -- manifest: 8BN3anFUyDlkVF/JnaJqbwpq8ME= (fingerprint) - name: apply-to-all.service - -__EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' +AuxConfigHash: /0fgYG0lsuxVGuNdtGBZA0RYxOfvLD/xOFg1eJwyfcw= InstanceGroupRole: Master KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt @@ -196,6 +186,7 @@ KubeletConfig: taints: - key1=value1:NoSchedule - key2=value2:NoExecute +UpdatePolicy: automatic __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_1.txt b/pkg/model/tests/data/bootstrapscript_1.txt index 96d66e5426..028611db8f 100644 --- a/pkg/model/tests/data/bootstrapscript_1.txt +++ b/pkg/model/tests/data/bootstrapscript_1.txt @@ -150,15 +150,6 @@ etcdClusters: version: 3.1.11 main: version: 3.1.11 -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -hooks: -- execContainer: - command: - - pkF7ytM3ENpYWZF36FoHJsqXP5Y= (fingerprint) - image: busybox kubeAPIServer: image: CoreOS kubeControllerManager: @@ -179,26 +170,8 @@ masterKubelet: __EOF_CLUSTER_SPEC -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint) - name: tokens - path: /kube/tokens.csv -hooks: -- before: - - update-engine.service - - kubelet.service - manifest: /uSPh015xYXh8dAVqXjP/ePkbrM= (fingerprint) - name: disable-update-engine.service -- manifest: 8BN3anFUyDlkVF/JnaJqbwpq8ME= (fingerprint) - name: apply-to-all.service - -__EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' +AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M= InstanceGroupRole: Master KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt @@ -213,6 +186,7 @@ KubeletConfig: taints: - key1=value1:NoSchedule - key2=value2:NoExecute +UpdatePolicy: automatic __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_2.txt b/pkg/model/tests/data/bootstrapscript_2.txt index 96d66e5426..028611db8f 100644 --- a/pkg/model/tests/data/bootstrapscript_2.txt +++ b/pkg/model/tests/data/bootstrapscript_2.txt @@ -150,15 +150,6 @@ etcdClusters: version: 3.1.11 main: version: 3.1.11 -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -hooks: -- execContainer: - command: - - pkF7ytM3ENpYWZF36FoHJsqXP5Y= (fingerprint) - image: busybox kubeAPIServer: image: CoreOS kubeControllerManager: @@ -179,26 +170,8 @@ masterKubelet: __EOF_CLUSTER_SPEC -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint) - name: tokens - path: /kube/tokens.csv -hooks: -- before: - - update-engine.service - - kubelet.service - manifest: /uSPh015xYXh8dAVqXjP/ePkbrM= (fingerprint) - name: disable-update-engine.service -- manifest: 8BN3anFUyDlkVF/JnaJqbwpq8ME= (fingerprint) - name: apply-to-all.service - -__EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' +AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M= InstanceGroupRole: Master KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt @@ -213,6 +186,7 @@ KubeletConfig: taints: - key1=value1:NoSchedule - key2=value2:NoExecute +UpdatePolicy: automatic __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_3.txt b/pkg/model/tests/data/bootstrapscript_3.txt index a320a4267d..59df46cc8e 100644 --- a/pkg/model/tests/data/bootstrapscript_3.txt +++ b/pkg/model/tests/data/bootstrapscript_3.txt @@ -155,18 +155,8 @@ kubelet: __EOF_CLUSTER_SPEC -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -fileAssets: -- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint) - name: tokens - path: /kube/tokens.csv -hooks: -- manifest: 8BN3anFUyDlkVF/JnaJqbwpq8ME= (fingerprint) - name: apply-to-all.service - -__EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' +AuxConfigHash: /0fgYG0lsuxVGuNdtGBZA0RYxOfvLD/xOFg1eJwyfcw= InstanceGroupRole: Node KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt @@ -178,6 +168,7 @@ KubeletConfig: taints: - key1=value1:NoSchedule - key2=value2:NoExecute +UpdatePolicy: automatic __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_4.txt b/pkg/model/tests/data/bootstrapscript_4.txt index a16217e4ec..ed600e6396 100644 --- a/pkg/model/tests/data/bootstrapscript_4.txt +++ b/pkg/model/tests/data/bootstrapscript_4.txt @@ -143,15 +143,6 @@ containerd: logLevel: info docker: logLevel: INFO -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -hooks: -- execContainer: - command: - - pkF7ytM3ENpYWZF36FoHJsqXP5Y= (fingerprint) - image: busybox kubeProxy: cpuLimit: 30m cpuRequest: 30m @@ -164,26 +155,8 @@ kubelet: __EOF_CLUSTER_SPEC -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint) - name: tokens - path: /kube/tokens.csv -hooks: -- before: - - update-engine.service - - kubelet.service - manifest: /uSPh015xYXh8dAVqXjP/ePkbrM= (fingerprint) - name: disable-update-engine.service -- manifest: 8BN3anFUyDlkVF/JnaJqbwpq8ME= (fingerprint) - name: apply-to-all.service - -__EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' +AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M= InstanceGroupRole: Node KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt @@ -195,6 +168,7 @@ KubeletConfig: taints: - key1=value1:NoSchedule - key2=value2:NoExecute +UpdatePolicy: automatic __EOF_KUBE_ENV diff --git a/pkg/model/tests/data/bootstrapscript_5.txt b/pkg/model/tests/data/bootstrapscript_5.txt index a16217e4ec..ed600e6396 100644 --- a/pkg/model/tests/data/bootstrapscript_5.txt +++ b/pkg/model/tests/data/bootstrapscript_5.txt @@ -143,15 +143,6 @@ containerd: logLevel: info docker: logLevel: INFO -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -hooks: -- execContainer: - command: - - pkF7ytM3ENpYWZF36FoHJsqXP5Y= (fingerprint) - image: busybox kubeProxy: cpuLimit: 30m cpuRequest: 30m @@ -164,26 +155,8 @@ kubelet: __EOF_CLUSTER_SPEC -cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' -fileAssets: -- content: E1oeAbrnQsSldrIP1BpoP2SDykM= (fingerprint) - name: iptables-restore - path: /var/lib/iptables/rules-save -- content: xYagtQLwBAAi3V8Wc2Jrojz28I0= (fingerprint) - name: tokens - path: /kube/tokens.csv -hooks: -- before: - - update-engine.service - - kubelet.service - manifest: /uSPh015xYXh8dAVqXjP/ePkbrM= (fingerprint) - name: disable-update-engine.service -- manifest: 8BN3anFUyDlkVF/JnaJqbwpq8ME= (fingerprint) - name: apply-to-all.service - -__EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' +AuxConfigHash: F6TisBT9tDbuqBlzMVgEkEvAa7tdDahjQ9pW4X5S49M= InstanceGroupRole: Node KubeletConfig: kubeconfigPath: /etc/kubernetes/igconfig.txt @@ -195,6 +168,7 @@ KubeletConfig: taints: - key1=value1:NoSchedule - key2=value2:NoExecute +UpdatePolicy: automatic __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index 43511db762..9a9eea077b 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -171,11 +171,6 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -188,6 +183,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: apiserver @@ -210,6 +206,7 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La node-role.kubernetes.io/api-server: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml staticManifests: @@ -475,11 +472,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -496,6 +488,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -523,6 +516,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -709,11 +703,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -726,6 +715,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -748,6 +738,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a976432f9c..126f7c31a4 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data index 7be334bdba..e36161344e 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data index 20070f3946..956e382c9b 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data index 86e7b9df68..19f2079a74 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data @@ -179,11 +179,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: amd64: @@ -196,6 +191,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: bastionuserdata.example.com ConfigBase: memfs://clusters.example.com/bastionuserdata.example.com InstanceGroupName: nodes @@ -218,6 +214,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic 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 index 00c837b407..43c5f23cd3 100644 --- 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.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -289,6 +284,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a @@ -315,6 +311,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -521,11 +518,6 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -538,6 +530,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes @@ -560,6 +553,7 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data index 5d9a817ae7..5ba2183542 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_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: amd64: @@ -288,6 +283,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: master-us-test-1a @@ -314,6 +310,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data index 84c26eb11e..ddd0bda774 100644 --- a/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data +++ b/tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data @@ -179,11 +179,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: amd64: @@ -196,6 +191,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: complex.example.com ConfigBase: memfs://clusters.example.com/complex.example.com InstanceGroupName: nodes @@ -218,6 +214,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data index eebc48f80d..066e367c15 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data @@ -130,9 +130,7 @@ ensure-install-dir echo "H4sIAAAAAAAA/+xWbW/bthN/709B9I+ibxrJSvPvNqEF5jrd4jXpPLsPA4ZioMmzzJki1SOpxMM+/HCk5Kck67q+3BIgke754Xd3EtoGObZmqapywBi/di9fzMfzyTmqFpBIjIHhCw2yZEuuHQwYq7nhFcy9RV7BWHPnwJXMY4CBsMZzZQBnwXhVQ8m2FLljSjIsotcfW0BUEkr2R3TWAjplDXvOTgeR8EujQ6WM+5Bed4TsgbLZzmRWYSOytsgEqgdb4b8nvkff0/xs3QxT0u7AyD83Qw/iw4Epxjrmr37TAHvOjkySRtaePhgcaX1RCJltvLLUAnb0M984D7UcV2hDw54nDDCmbXUJLeiSKbO0g21XS1ZkZ9nTgbRindDl1qqZGOe51h2CwAjcRH8dLJkJWg/ACznWwXlAR4rQgvGu3MdMyZ5kZ1nxJCJUmbt567CA0XQyB+zwzbW211NUrdJQEcq7HLixZlPb4EbBr3bY540aBanACIjeTxhZRAMeXOZakUlY8qB9Ek1uxjYYX7KCaMGvLKrfOSV4ZQn3I33NN25EYQwYWygjR1IiOFeyYRZ/aVhoTqdoWyUBS5rTQT+YI1krRzlOU4tTVK95Da7hAi7VEsRGaIjkS1UrP+OmAozvFKASMBKCYoykKVXMeTD+ndWhhku+AB055ym1/cHfp7+xGjAmNgdhjUzMq+C5V6bahvkeFitr15H5jmsl72e/thJm4DwqQWYjbQbOBhTwU7CeUxG8kKnMXeYr7xtX5nlx+lUsX1GeDYfFoWS/dTqVPKHpf3eqng4YUzWvoGTrr11WCcyUzanrJ7xRLgGpLbLTInaKGBr8FGEJiNA3882m6b1NjAc0XE+m8fXCOm94nfrz8maPtxsjigHhYwDnV8AlYIQLyNjlZJVXFULFvcVj2Zc3HvlFfKSo1E2v8vPJDGrr4SRKnBzrfU9DnfSOFSLrWP6to9BruFuFuDTwIALC1KIv2dnZk0jZh+DEuUAI71vBG5WprmCZsHVDxczghteNBiLcsvDD+1fzt7PJZ5jIbQNGybwt8t+u125nsVs4k2mcmJIVw2H29Iygkcc149IkvOBiDUaWEWFpxYyt8Wi1BryKx3K7agT3QLAeT85nbrdsvOdidQ70d0bDI5SG+caIKaCysmRFPXT3rQGRoiSLKcRvnqYQix2TgEK3+M76pUscEMZkfmaDp3veb7x7sC+2GZ7UXYq7IdAJeBri3KZNvEcrbx8KQnhwcLiPxggSjFdc96Ui11O0N5vyk4k3YZbQGXmU56qbtN03x6Nv+bV7dH+STXS1l9devCQwFyuQQaf23mPDbWW+rD7dYinvv00inuHu0425dJu39Jm1vmT5J1B0/nq+h/NiuMex8ar2rxlhWW+v0DksQlUpU11wIzWNf58DtGl7X3CUJauhtrjJeMuVJr1nxXB4pR4bK2HpDsgPe6Ki/+47BHj2/4ePY5VvifbUA9m/bjnVMyF/yqmKecsx12qRd4XOdwK3kGrAX1tcp4vbzZZRxLDmiruPAZCnGT9cGlTOxsorbtQSnO8cgxf57isirzuuG9ScKv3qv8b/2xpPl7WijzDsNgzl2/f7TwAAAP//AQAA//9K639RtA0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml - -echo "H4sIAAAAAAAA/7RW247kthF9768QDBh+WUm8Xxp+sLOLxEa8zmL9BUWy2C2MJHZIde9Ovj6gND0zvdlFkHjmSRJ5qniq6lRRP5eCS9nvmgamoER9aRtlqDfUacsFIHORG2cjZcFYqgy3mgUanYsq6GA1SmIFAaEd5TYI6rj86bgsp7Lv+7KkDAfsDikdRoTTUDqfpv7u7DDPuGBpM44IBfvr80I7RjvSu2Hux2E+f+5XXqvJiMtKz0YtIougETmDQDRSzSjVTFrLmDBCE06JB2qNYVRIagxRjltHAwQbySvR88u40dPaMGE5C1Ip7TVwDaCAe+dAEEoIKKM5aleTZzgah4Zr5KghBgLmv9IzpYW8DBH8Ulo/D0/sSGc63ft5aE/j+TDMpV1JtivJdtvulsO/tioDCq24tMZbaXg0ThJFZKQ2KK/RYrTcM6o0UUJJ1DxEbwSicooD4088D8NyPLuVm0/zAsOMOTx/feBX+pA+zWOCUPMoOtX7PLRPuBpLu248p90tkLsHytESDCp4jJILVIECUm2JDl6jE0RR4YwVEoKAqCNBawJzqH1AQ5X06pHyY/66O1O6IdWCQh6w9HfpVPqtyi2MpyN09KbSp5yWVMv95ivhPyln8/PVwG9cP7p7HvImI2sZanQMGFoetbUowaI16DQ1imvBuWTCeSWj4oRLzQgFbaOwjvJAXiBWf4R5xrG8TKhXb19ECnm6zh2qDWeOWuZQInAqNBVRI1UYg0QZleRCWy2cc1HQgFE5wqIyllNuiBcv29iV183cARGCpoREKTQIEjiyaLiRJBAHTkuvECQ6KXkkYAgEHzWnUjqMNAYSXonede4AUh60k55IF6ghCNZJp0wUwgUA7aITlHABDCMNysRgkDJptdVBCRZfY+5Ukl/OHYfGW5BAFDr0JjoauEKjtA+ERCe11loosIYyIB6QWaW0NjEaa71kT7fLVWldSP4O80pyS05ZYBl8fbgRe4Dsj0r0G6xlpKPkGR8WpbWeBymi8MIF572VAJF47STlYIQMJlpJOHrpuPA2GgVAnecieuL/XKOtZXztoVIP2YZKMIIhV1yBlQEZp9IHhDokgRnGpQTwREmDkTijggyeCWGJUpKbSPkLxPq6Q2WN9O14Lgvm32HCfePTdMpYSoefYTqNWA/avU1zHA5/gYL7ZsIpVh5+s7oB9l+1/nUuC8we/5bT+bSdMkG1bc+lXbAsLYVb0Mc04r55v4J2f99mysZh/fWa03w/pXP5+bwc902EseCuafyhmr7LwwXzvin3ZcEpPK5/TGnZN339HtM5fMjpMoQKhE9lXVyjeff7H/uGEtIp0VXdP9tJEwzz/vrZjclDHSQ416Z5h+58OAzz4ReYw4i57JslnysrvAx+GdL8C+SwJi/l+w4uMIzV7kdKyPvhzZwCxnKz/P11cajP8teM+KP8/s0wweE/odfVG+yuaY6pLDNM+I8L5jwE3Dc//ASfyg+7pllH4ZrSD1Cz2F8g9+PgriO8fwLsmmZMh9/wguO+YbummXH5lPLdh3V4PchmHupGCvgbOBzXX+Smqaq8Kr6+r38vOY0j5vZ0N+yb777bcI9Crsi8Vn+TyLpd3bZ1tbsFPnhrTyPM+OjsW+jN4Q3sCwR+9uM5YBtzmlr8vGCeYWxrI7UOxqrOWtjVfk7zeyj/PGOGgG9/fffxmWxIvwrnlMJ7mIeIZXlIMS7+ec9OD7tVfxkPQ6X3hz9iOK+VvSr72rP7Xfu/N18PIaS59C6lpSwZTu2Du+4epnGHi38k+X8e8BhFDS/0tUs23y/gDC84L2Vzt11SN2Tv8H6/aqetty7mC+b2iDAuR39Ef1drsCb+yevDTfdtm+2sfwMAAP//AQAA///Lai0n5w0AAA==" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/7RWW4/cthV+n18hBAjyYkm8XwYpENeLxkbj2LVRFH08JA9n1NWIE5Ez9vbXF5R2dndcB0Vb75Mk8juH37l91MucseTtpmngEJSoL22jDPWGOm25AGQucuNspCwYS5XhVrNAo3NRBR2sRkmsICC0o9wGQR2XP+1LOeZt3+eSZthht0tpNyIch9z5dOhvTw7nCQvmdsYRIWN/eZ5px2hHejdM/ThMp8/9wmsxGbEs9GzUIrIIGpEzCEQj1YxSzaS1jAkjNOGUeKDWGEaFpMYQ5bh1NECwkTwTPV/GlZ7WhgnLWZBKaa+BawAF3DsHglBCQBnNUbuaPMPRODRcI0cNMRAw/5GeyS3MZYjgS279NDyyI53pdO+noT2Op90w5XYh2S4k23W7K7t/rlUGFFpxaY230vBonCSKyEhtUF6jxWi5Z1RpooSSqHmI3ghE5RQHxh957oayP7mFm09TgWHCOTx9veeX+5A+TWOCUPMoOtX7eWgfcTWWdtl4SrsrMHf3lKMlGFTwGCUXqAIFpNoSHbxGJ4iiwhkrJAQBUUeC1gTmUPuAhirp1QPlh/x1tyZ3Q6oFhXnA3N+mY+7XKrcwHvfQ0atKH+dUUi33i6+E/9g5q5+vBn7l+sHd05DXNrKWoUbHgKHlUVuLEixag05To7gWnEsmnFcyKk641IxQ0DYK6ygP5BvE6vcwTTjmbxPqxdsXkcJ8uOgO1YYzRy1zKBE4FZqKqJEqjEGijEpyoa0WzrkoaMCoHGFRGcspN8SLbzvYldeV7oAIQVNCohQaBAkcWTTcSBKIA6elVwgSnZQ8EjAEgo+aUykdRhoDCc9E76I7gJQH7aQn0gVqCIJ10ikThXABQLvoBCVcAMNIgzIxGKRMWm11UILF59CdSvJL3XFovAUJRKFDb6KjgSs0SvtASHRSa62FAmsoA+IBmVVKaxOjsdZL9ni7XDqtC8nf4ryQXJOTC5TB14cbsQeY/V6JfoW1jHSUPOHDorTW8yBFFF644Ly3EiASr52kHIyQwUQrCUcvHRfeRqMAqPNcRE/8/zdoSxmfW1TqIauoBCMYcsUVWBmQcSp9QKgiCcwwLiWAJ0oajMQZFWTwTAhLlJLcRMq/QazPKypLpC9Pn1+lKQ6715D326Z/J9987MPPyfDxzG7c3yZxa+m7v8fTu9/KO23P/4jyeENv/jK++cPm1XjKBedf4YDbxqfDccacO/wMh+OIleRmdf1HyLhtDniINQa/Wl0B+69av5lygcnjz3M6HddTDlBt21NuC+bSUrgGfUgjbpu3C2jz51WPVg7Lb9uUprtDOuWXp7LfNhHGjJum8btqejMPZ5y3Tb7LBQ/hYf1DSmXb9PV7TKfwfk7nIVQgfMrL4hLNza8ftw0lpFOiqzPzZCcdYJi2l89uTB6qCOFUB+4G3Wm3G6bda5jCiHPeNmU+VVZ4HnwZ0vQa5rAkL813HZxhGKvdj5SQt8OLKQWM+Wr5+8viUJ/5TzPij/L7F8MBdv8OvaxeYTdNs0+5THDAd2ec5yHgtvnhJ/iUf9g0zSKjS0rfQ81if4a5Hwd3kf/+EbBpmjHtfsEzjtuGbZpmwvIpzbfvF+G7b5tpqBsp4C/gcFx+r5umdvRlWur78uczp3HEuT3eDtvmu+9W3MMQVOS8VH9tkWW7um3rancNvPfWHkeY8MHZ76FXh1ewLxD42Y+ngG2c06HFzwXnCca2DmHrYKzdWQu72E9pegv5txPOEPDVm5sPT9qG9EvjHFN4C9MQMZf7FGPxT+f9cL9b+2/G3VDpffR7DKelspfO/usxQMH3aRz83baBU0mHKvWbiw5sN+1/P5Q9hJCm3LuUSi4zHNt7d90dHMYNFv9A/n884CG6Gnbo6/Ssvr+BMzzjVPLqbr34rsje4t126am23uQ4n3Fu9whj2fs9+ttam6Ugj17vb8/ft1nP+hcAAAD//wEAAP//uxtcdTsOAAA=" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data index 4ba1dd0cc0..9823da440f 100644 --- a/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data +++ b/tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data @@ -130,9 +130,7 @@ ensure-install-dir echo "H4sIAAAAAAAA/6RUbWvbMBD+7l9xFEq/dLIdurKZFrYlGy2sXUg+jjIU66KKyDpXL84C+/FDchInGYy9+Iut5950zz3nWlMQYzJLJasMgK/dxw/z8fx+YlWHNkIAaPhCo6hgybXDDKDhhkuce7Jc4lhz59BV4G3ArCbjuTJoZ8F41WAFe0QMRhET16nqlw6tVQIr+JGKdWidIgO3MMoS8LXVQSrjnvrjALAzRWxIyaRta9aVrLbqbO/8Z+4H+EHkX8cy2zftjpL8e5r4UT8dpQLYGr/5TYtwCycpYwTrRmfZSdR/XYFR6xXFEcDJM984j40YS0uhhdteAwCa5GfsUFegzJKy/VQrKNkVu84E1ateXW6l2nvjPNd6q6BVWODU0vdN0ogOzqMd309mFZRFwd5es4IVeVlGYxtm+BLQ+WRrMoBnct7wBgdVXbzja3eRAaiGS6xg9cYxWVumKI+VXrWpVFeyUcmKo6uP0lU0+rQYhsymoeDeB/88bEKdGt8uC7iejT0+I/IV5KkPCmJqqVMiOvK1G5qbPM773q6vWMHK4sBCDVem2h2ZpprrbLeQE1wEKZWRd9wIjXa3ggDYqToO7I5bUUGDDdkN4x1XOsbdlEXxoC4NCVy6I/h8B6r4dp8s4s3r88vE3C+uO/TI9/cjiHz2Wz/lkcW84zbXapFvic4Hh5NJABj0a7KraZLxI09/FqOigcwDdy8BLRc4CCWRWeSJzpbEAzdqic5vC6OvUzFr0KPLm63VZT8BAAD//wEAAP//hSaFDxAFAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml -echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml - -echo "H4sIAAAAAAAA/7SV3Y7UNhTH7+cpIiTEDUns+DviAsqqBRUook9wbB/PRiT21PbMsn36Kpmd7k5bqapUruKcD/uXv/923pSCtYy7poHFS74O2kZq6jS1yjAOONjAtDWBDl4bKjUzavA0WBukV94oFMRwAlxZyozn1DLx+rbWQxn7vtSUYY/dPqX9jHCYSufS0n89WswRK5Y244xQsL88T7QbaEd6O8V+nuLxW79xbS0z1g3PBMXDEEAhsgE8UUjVQKkahDHDwDVXhFHigBqtB8oF1ZpIy4ylHrwJ5DvhuTqf8ZTSAzds8EJK5RQwBSCBOWuBE0oISK0YKruKpxlqi5opZKggeAL6X/F0aSHXKYCrpXVxeqQjne5U7+LUHubjfoql3SDbDbI9p7u6//28y4BcSSaMdkZoFrQVRBIRqPHSKTQYDHMDlYpILgUq5oPTHFFayWBgj5z7qd4e7cbmUqwwRcz+6fCBr/Q+3cU5gV915J3sXZ7ax7r1W9ot8RS7q5C7DRnycnEoVZoNlprBokBglCvKg0IqMXiBIkjBuDKKW2sDpx6DtGQIUhtGmSaO/78WWLmuHArce0UJCYIr4MQzHIJmWhBPLFglnEQQaIVggYAm4F1QjAphMdDgif9OeBeHAlLmlRWOCOupJgjGCit14Nx6AGWD5ZQwDgMG6qUOXiMdhFFGecmH8D0cukL+1aEWtTMggEi06HSw1DOJWirnCQlWKKUUl2A0HYA4wMFIqZQOQRvjxPB4D1181/nkvmLeIM/ilAp1cuvDztgDZHcreX8uawfSUfLA83Y+lor5Eyw4Ni4th4yldPgNlsOM64S7tymGaf8DFBybBZewLuzOXVeF/T92v4+lQnT4U07Hw3mVmDyW68SXNOPYfEoedz+f/XZedbvAY4r3SzqWN8d6OzYB5oK7pnH7tfEmTyfMY1PuS8XF/xn/klIdm359n9PRf87pNPm1EO7KFtz4bz79OjaUkE7ybtXkSSYtMMXx8trNycFqMoyroDdoj/v9FPfvIPoZcxmbmo8rFZ4mV6cU30H2m1wp33dwgmle+15RQj5OL1cBQrkKP78Ep02dHzPiK/H85bTA/u+ll+hV7a5pblOpERb85YQ5Tx7H5sVruCsvdk2zHZNN0s+wqtifIPfzZC/Hu38s2DXNnPYf8ITz2Ay7polY71L++nkz9oNR4rQmkscPYHHefrTnRc7Ht5tSn7c9XWu25Dpo11h3XbbGx+bZs22++BHKb0fM4PHt+5svTzaH9Nv2HJL/CHEKWOrDh2B1T+6NfnnIlp27hRg3tva/+7YH71MsvU2plprh0D5M193DMu/+AAAA//8BAAD//32g6ZdfCAAA" | base64 -d | gzip -d > conf/kube_env.yaml +echo "H4sIAAAAAAAA/7SV327cthLG7/cphABBbrISKf4XcoDkxDiJcZLYTVAUvRySw13VErkRqXXcpy+k9dZ2W6Ao0FyJmhmSP33zkXqTM5bcbaoKRi/5MthWUlOnqVWGccDWBqatCbT12lCpmVGtp8HaIL3yRqEghhPgylJmPKeWidf7Ug65a5pc0gQ7rHcp7QaEQ59rl8bmZrY4RSyYtxMOCBmb8/NI65bWpLF9bIY+zt+alWudMmBZ8UxQPLQBFCJrwROFVLWUqlYY07Zcc0UYJQ6o0bqlXFCtibTMWOrBm0C+E54rwwlPKd1yw1ovpFROAVMAEpizFjihhIDUiqGyi3iaobaomUKGCoInoP8WT+ctTKUP4Ereutg/0JFa16pxsd8ehnnXx7xdIbcr5PaUrsvu11OXAbmSTBjtjNAsaCuIJCJQ46VTaDAY5loqFZFcClTMB6c5orSSQcseOHd92c92ZXMpFugjTv7x8J4vNz7dxiGBX3TktWzc1G8f6pZv2a6Jx9h1galekWEazw6lSrPWUtNaFAiMckV5UEglBi9QBCkYV0Zxa23g1GOQlrRBasMo08Txf9cCC9cThwL3XlFCguAKOPEM26CZFsQTC1YJJxEEWiFYIKAJeBcUo0JYDDR44r8T3tmhgJR5ZYUjwnqqCYKxwkodOLceQNlgOSWMQ4uBeqmD10hbYZRRXvI2fA+HLpB/dKhF7QwIIBItOh0s9Uyilsp5QoIVSinFJRhNWyAOsDVSKqVD0MY40T7cQ2ff1T65G5xWyJM4uUDp3fKwAzYAk9tL3pzKti2pKbnneTN/e5ti6HfvIe+7qrkSl18a/y5pNhzbC/tT5DeGXv0c5quv5UqZ4y9BHC7oxQ/D5X82b4c5F5w+wYhd5dJ4mDDnGr/BeBhwgdmclv4vZOyqEcewQLvTrCeFzV/Ovoy5QHT4bkrz4bRLTB7z08TnNGBXfUoeN/8/efW063r5xxTvxjTnN3PZd1WAIeOmqtxumXgx9Uecuirf5YKj/z3+OaXSVc3yPqTZX0/p2PulEG7zGlz5Lz596SpKSC15vej5KJNG6GN3fq2H5GAxKMalGRdo592uj7v3EP2AU+6qMs0LFR57V/oU38PkV7nSdFfDEfphmfeKEvKxf7kIEPKT8PNzsF/V+d+E+Eo8f9mPsPtz6Tn6pHZTVfuUS4QRr444Tb3HrnrxGm7zi01VrUdslfQaFhWbI0zN0Nvz1dA8FGyqaki7D3jEoavaTVVFLLdpurleD8W9UWK/JJLHD2BxWH/Sp01OR7/uUzOtPV1q1uQy2C6x+mnZEu+qZ8/W9eJHyF9nnMDj28uLz4+aQ5q1PYfkP0LsA+Zy/yFY3KM7pxnvs3nz48FDwes09O6uq2AuaVzO08btIcaVefvP/dyA9ynmxqZUcpngsL1frr6Dcdj8BgAA//8BAAD//4Od9nazCAAA" | base64 -d | gzip -d > conf/kube_env.yaml download-release echo "== nodeup node config done ==" diff --git a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml index 18717dacb3..e0e85cfc00 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -271,11 +271,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -292,6 +287,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a @@ -318,6 +314,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -522,11 +519,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -539,6 +531,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes @@ -561,6 +554,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index de83b3bdcc..944afed18f 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -486,11 +483,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -503,6 +495,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: containerd.example.com ConfigBase: memfs://clusters.example.com/containerd.example.com InstanceGroupName: nodes @@ -525,6 +518,7 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml index 45aefe6846..a877c272a4 100644 --- a/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml @@ -255,11 +255,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -276,6 +271,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L - 000000000000000000000000000000000000000000000000000000000000000b@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: docker.example.com ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: master-us-test-1a @@ -303,6 +299,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/docker.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -490,11 +487,6 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -507,6 +499,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - 000000000000000000000000000000000000000000000000000000000000000b@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: docker.example.com ConfigBase: memfs://clusters.example.com/docker.example.com InstanceGroupName: nodes @@ -530,6 +523,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat nonMasqueradeCIDR: 100.64.0.0/10 podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/docker.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data index 0ed7a9e037..31f5084460 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data index 2e81727a01..a67cb14ff1 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1b @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data index bfc6066df5..0301191537 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: master-us-test-1c @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data index d0d1c0fb58..65707decad 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data +++ b/tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existing-iam.example.com ConfigBase: memfs://tests/existing-iam.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml index 421b95ef9f..6434c6cb42 100644 --- a/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -486,11 +483,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -503,6 +495,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -525,6 +518,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data index 2ec661442b..cf8286fb6b 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data index 6d16eb8a55..a1611e8ab7 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1b @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data index 18b06a2ed7..dbfed7c5f8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: master-us-test-1c @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data index 525427d06c..5df2d05fb7 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data +++ b/tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: existingsg.example.com ConfigBase: memfs://clusters.example.com/existingsg.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic 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 index 174959e873..bd982e7486 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -486,11 +483,6 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -503,6 +495,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes @@ -525,6 +518,7 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data index a5f7b40b47..991f014102 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data index a9f1f1f0e0..de8d59787e 100644 --- a/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data +++ b/tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: externallb.example.com ConfigBase: memfs://clusters.example.com/externallb.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data index 0b2da38033..f222f835de 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data @@ -254,11 +254,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: amd64: @@ -275,6 +270,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: externalpolicies.example.com ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: master-us-test-1a @@ -301,6 +297,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data index 657ab9defc..2139c24ac1 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data +++ b/tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: externalpolicies.example.com ConfigBase: memfs://clusters.example.com/externalpolicies.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data index bc7ce1587f..054d09f4cb 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data index dda3f268ce..77d63e8a05 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1b @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data index d7fcc8b07e..12ad25c6e8 100644 --- a/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data +++ b/tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: master-us-test-1c @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic 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 index a7a4ec633d..4cd706c5e9 100644 --- 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 @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha.example.com ConfigBase: memfs://tests/ha.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script index 984b77f468..32a6472b08 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script @@ -253,11 +253,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: amd64: @@ -276,6 +271,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-a @@ -303,6 +299,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script index 241802d84d..d0c1194b59 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script @@ -253,11 +253,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: amd64: @@ -276,6 +271,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-b @@ -303,6 +299,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script index 92d288f8b1..63df2400a7 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script @@ -253,11 +253,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: amd64: @@ -276,6 +271,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: master-us-test1-c @@ -303,6 +299,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script index b3e6c32145..bf4ec5d948 100644 --- a/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script @@ -170,11 +170,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: amd64: @@ -189,6 +184,7 @@ Assets: - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: ha-gce.example.com ConfigBase: memfs://tests/ha-gce.example.com InstanceGroupName: nodes @@ -212,6 +208,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index b07e5066ff..7535e62868 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data index 309c4485e3..31839ca9b7 100644 --- a/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml index c728f470c4..e558702198 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -269,11 +269,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -290,6 +285,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-etcd.example.com ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: master-us-test-1a @@ -316,6 +312,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-etcd.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -502,11 +499,6 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -519,6 +511,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-etcd.example.com ConfigBase: memfs://clusters.example.com/minimal-etcd.example.com InstanceGroupName: nodes @@ -541,6 +534,7 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-etcd.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml index 1dcf3b0032..9e1f9a99f1 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -259,11 +259,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -280,6 +275,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -306,6 +302,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -492,11 +489,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -509,6 +501,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -531,6 +524,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 783bd55562..b066519176 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -258,11 +258,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: amd64: @@ -279,6 +274,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -305,6 +301,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data index 7be334bdba..e36161344e 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml index db50d6b364..0dc6235989 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -486,11 +483,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -503,6 +495,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes @@ -525,6 +518,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data index bc8571172f..672e0a2e6a 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data index ede6f4bf89..866a4c5f8b 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-ipv6.example.com ConfigBase: memfs://clusters.example.com/minimal-ipv6.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data index c4d59a919a..29eeeccd5b 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-json.example.com ConfigBase: memfs://clusters.example.com/minimal-json.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-json.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data index 1578cac124..a9774a85ca 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data +++ b/tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-json.example.com ConfigBase: memfs://clusters.example.com/minimal-json.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-json.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index 421b95ef9f..6434c6cb42 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -486,11 +483,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -503,6 +495,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -525,6 +518,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 66b0b8014c..f6c00719bc 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data index 7be334bdba..e36161344e 100644 --- a/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script index 66cca164f8..342a046b7b 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script @@ -253,11 +253,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: amd64: @@ -276,6 +271,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: master-us-test1-a @@ -303,6 +299,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script index 0a37b3db98..8978178be3 100644 --- a/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script @@ -170,11 +170,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: amd64: @@ -189,6 +184,7 @@ Assets: - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-gce.example.com ConfigBase: memfs://tests/minimal-gce.example.com InstanceGroupName: nodes @@ -212,6 +208,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script index 21c7a2d27a..1bad4ab04c 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script @@ -253,11 +253,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: amd64: @@ -276,6 +271,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-gce-private.example.com ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: master-us-test1-a @@ -303,6 +299,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script index 789aa5432c..0f1e062c27 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script +++ b/tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script @@ -170,11 +170,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: amd64: @@ -189,6 +184,7 @@ Assets: - 50c7e22cfbc3dbb4dde80840645c1482259ab25a13cfe821c7380446e6997e54@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/mounter - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal-gce-private.example.com ConfigBase: memfs://tests/minimal-gce-private.example.com InstanceGroupName: nodes @@ -212,6 +208,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data index 11a559df2c..be5c809eef 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data index 56a6424dae..00354cff90 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data @@ -170,11 +170,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: amd64: @@ -191,6 +186,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.k8s.local ConfigBase: memfs://clusters.example.com/minimal.k8s.local InstanceGroupName: nodes @@ -213,6 +209,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml index 7b8048a76a..ff6a551b40 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -568,11 +565,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -589,6 +581,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b @@ -615,6 +608,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -883,11 +877,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -904,6 +893,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c @@ -930,6 +920,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -1116,11 +1107,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -1133,6 +1119,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes @@ -1155,6 +1142,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index e8dea6699c..947b717907 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index b64dfbfbc0..1bf7a497bb 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index fd2bbe06bd..23eb56b6f7 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index da5415149b..e9ee58a4c0 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml index 7b8048a76a..ff6a551b40 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -568,11 +565,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -589,6 +581,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b @@ -615,6 +608,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -883,11 +877,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -904,6 +893,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c @@ -930,6 +920,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -1116,11 +1107,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -1133,6 +1119,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes @@ -1155,6 +1142,7 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data index e8dea6699c..947b717907 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data index b64dfbfbc0..1bf7a497bb 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1b @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data index fd2bbe06bd..23eb56b6f7 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: master-us-test-1c @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data index da5415149b..e9ee58a4c0 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: mixedinstances.example.com ConfigBase: memfs://clusters.example.com/mixedinstances.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml index e259ab2100..bd60280ea5 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml @@ -253,11 +253,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -274,6 +269,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: nthsqsresources.example.com ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a @@ -300,6 +296,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -486,11 +483,6 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -503,6 +495,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: nthsqsresources.example.com ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: nodes @@ -525,6 +518,7 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data index 6b7275ea39..80204613f7 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: nthsqsresources.example.com ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data index 736e65eeff..8c870123e3 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - 25e4465870c99167e6c466623ed8f05a1d20fbcb48cab6688109389b52d87623@https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: nthsqsresources.example.com ConfigBase: memfs://clusters.example.com/nthsqsresources.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml index 8da253d5c9..eaf12852a0 100644 --- a/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml @@ -254,11 +254,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -275,6 +270,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a @@ -301,6 +297,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -487,11 +484,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -504,6 +496,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes @@ -526,6 +519,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data index 6f8dceee26..6b74b49b73 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data index ae3050d9a9..4eb141c7e4 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: private-shared-ip.example.com ConfigBase: memfs://clusters.example.com/private-shared-ip.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data index 3ed61c16f5..b10a96ae13 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: private-shared-subnet.example.com ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data index 971c03af8a..1a5c0545f8 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: private-shared-subnet.example.com ConfigBase: memfs://clusters.example.com/private-shared-subnet.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index c5c2f83dde..1e446f7759 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -254,11 +254,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -275,6 +270,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecalico.example.com ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a @@ -301,6 +297,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -487,11 +484,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -504,6 +496,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecalico.example.com ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes @@ -526,6 +519,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data index 1541cc78af..9f56b99c0f 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecalico.example.com ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data index 15291cedc4..dfe6c6585d 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data +++ b/tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecalico.example.com ConfigBase: memfs://clusters.example.com/privatecalico.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data index 552133ee9b..1ff05f3a3e 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecanal.example.com ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data index b67ce404c8..7236cfcef0 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data +++ b/tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecanal.example.com ConfigBase: memfs://clusters.example.com/privatecanal.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index eb2b52a597..6c9124ada2 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -254,11 +254,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -275,6 +270,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a @@ -301,6 +297,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -487,11 +484,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -504,6 +496,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes @@ -526,6 +519,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 004a7ce471..d2f09f7393 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data index fc6e65cfbc..f415ed51fe 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml index fc0e7aaf56..57e84d59e1 100644 --- a/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml @@ -243,11 +243,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -264,6 +259,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a @@ -290,6 +286,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -469,11 +466,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -486,6 +478,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp - a75af21eae2913aacd521cc8a052f7b9f1cb8b195f7bffbab478833abe024b0e@https://storage.googleapis.com/kubernetes-release/release/v1.17.15/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes @@ -508,6 +501,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp nonMasqueradeCIDR: 100.64.0.0/10 podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data index 2493899819..452ba0ad7b 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data @@ -241,11 +241,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: amd64: @@ -262,6 +257,7 @@ Assets: - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: master-us-test-1a @@ -288,6 +284,7 @@ KubeletConfig: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data index c6b80a298e..94440b8737 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data +++ b/tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data @@ -163,11 +163,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: amd64: @@ -180,6 +175,7 @@ Assets: - a75af21eae2913aacd521cc8a052f7b9f1cb8b195f7bffbab478833abe024b0e@https://storage.googleapis.com/kubernetes-release/release/v1.17.15/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatecilium.example.com ConfigBase: memfs://clusters.example.com/privatecilium.example.com InstanceGroupName: nodes @@ -202,6 +198,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index 4232224b33..d24cf72366 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -257,11 +257,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -278,6 +273,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateciliumadvanced.example.com ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a @@ -304,6 +300,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml etcdManifests: @@ -492,11 +489,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La __EOF_CLUSTER_SPEC - cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' - {} - - __EOF_IG_SPEC - cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' Assets: amd64: @@ -509,6 +501,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz + AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateciliumadvanced.example.com ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes @@ -531,6 +524,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests + UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data index a02fed45e7..a2764cf1ea 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data @@ -255,11 +255,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: amd64: @@ -276,6 +271,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateciliumadvanced.example.com ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: master-us-test-1a @@ -302,6 +298,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data index 8a136a8ad2..b0c311b1c5 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data @@ -171,11 +171,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: amd64: @@ -188,6 +183,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateciliumadvanced.example.com ConfigBase: memfs://clusters.example.com/privateciliumadvanced.example.com InstanceGroupName: nodes @@ -210,6 +206,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data index 7def95d67b..5e941b82f1 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatedns1.example.com ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data index 705375529b..62f457f7de 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data +++ b/tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatedns1.example.com ConfigBase: memfs://clusters.example.com/privatedns1.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data index eacd4e99c4..bb9f57e7a1 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatedns2.example.com ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data index 81aa930d50..0bc19dfeb7 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data +++ b/tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatedns2.example.com ConfigBase: memfs://clusters.example.com/privatedns2.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data index a4825accbb..0879f1a345 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateflannel.example.com ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data index ae69633678..0b77a1b34f 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data +++ b/tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateflannel.example.com ConfigBase: memfs://clusters.example.com/privateflannel.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data index 6bbdba2a11..74868f37ff 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatekopeio.example.com ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data index 2769d4c1ab..b88b6205dc 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data +++ b/tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privatekopeio.example.com ConfigBase: memfs://clusters.example.com/privatekopeio.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data index 721dffa0e9..104121b802 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateweave.example.com ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data index c51916b1e7..0dcaf800ad 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data +++ b/tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: privateweave.example.com ConfigBase: memfs://clusters.example.com/privateweave.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 39d859b821..1b0caf89d8 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -247,11 +247,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: amd64: @@ -268,6 +263,7 @@ Assets: - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -294,6 +290,7 @@ KubeletConfig: podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data index 6595be60e2..910b673e9f 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -163,11 +163,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: amd64: @@ -180,6 +175,7 @@ Assets: - d4adf1b6b97252025cb2f7febf55daa3f42dc305822e3da133f77fd33071ec2f@https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - 264f3396630507606a8646fda6a28a98d3ced8927df84be8ee9a74ab73cc1566@https://download.docker.com/linux/static/stable/aarch64/docker-19.03.15.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -202,6 +198,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podInfraContainerImage: k8s.gcr.io/pause:3.2 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data index 7664b47c0f..9658d7bbc1 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_master-us-test-1a.masters.sharedsubnet.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: sharedsubnet.example.com ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data index 2250c9cf36..8188ae5995 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data +++ b/tests/integration/update_cluster/shared_subnet/data/aws_launch_template_nodes.sharedsubnet.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: sharedsubnet.example.com ConfigBase: memfs://clusters.example.com/sharedsubnet.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data index 87a5d1a056..83ce2fae52 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_master-us-test-1a.masters.sharedvpc.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: sharedvpc.example.com ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data index f5199cb1cc..50ea2e089c 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data +++ b/tests/integration/update_cluster/shared_vpc/data/aws_launch_template_nodes.sharedvpc.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: sharedvpc.example.com ConfigBase: memfs://clusters.example.com/sharedvpc.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data index daaee76099..10681e7d1e 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_master-us-test-1a.masters.unmanaged.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: unmanaged.example.com ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data index c41065a40d..83b0912678 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data +++ b/tests/integration/update_cluster/unmanaged/data/aws_launch_template_nodes.unmanaged.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: unmanaged.example.com ConfigBase: memfs://clusters.example.com/unmanaged.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index a976432f9c..126f7c31a4 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -252,11 +252,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: amd64: @@ -273,6 +268,7 @@ Assets: - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz - 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64 - 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64 +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a @@ -299,6 +295,7 @@ KubeletConfig: nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests registerSchedulable: false +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml etcdManifests: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data index 7be334bdba..e36161344e 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/vfs-said/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -170,11 +170,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: amd64: @@ -187,6 +182,7 @@ Assets: - a4dd7100f547a40d3e2f83850d0bab75c6ea5eb553f0a80adcf73155bef1fd0d@https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/arm64/kubectl - ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.8.7/cni-plugins-linux-arm64-v0.8.7.tgz - be8c9a5a06ebec8fb1d36e867cd00fb5777746a9812a0cae2966778ff899c525@https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz +AuxConfigHash: /O5IS/dGo83lv2DbWn4k91OYfuOqtO79vjf5pD1DQlI= ClusterName: minimal.example.com ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes @@ -209,6 +205,7 @@ KubeletConfig: node-role.kubernetes.io/node: "" nonMasqueradeCIDR: 100.64.0.0/10 podManifestPath: /etc/kubernetes/manifests +UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 57e55a901c..91895f2e42 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -489,6 +489,7 @@ func (c *ApplyClusterCmd) Run(ctx context.Context) error { return err } bootstrapScriptBuilder := &model.BootstrapScriptBuilder{ + Lifecycle: clusterLifecycle, NodeUpConfigBuilder: configBuilder, NodeUpAssets: c.NodeUpAssets, } @@ -1291,23 +1292,23 @@ func newNodeUpConfigBuilder(cluster *kops.Cluster, assetBuilder *assets.AssetBui return &configBuilder, nil } -// BuildNodeUpConfig returns the NodeUp config, in YAML format -func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, caResource fi.Resource) (*nodeup.Config, error) { +// BuildConfig returns the NodeUp config and auxiliary config. +func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAdditionalIPs []string, caResource fi.Resource) (*nodeup.Config, *nodeup.AuxConfig, error) { cluster := n.cluster if ig == nil { - return nil, fmt.Errorf("instanceGroup cannot be nil") + return nil, nil, fmt.Errorf("instanceGroup cannot be nil") } role := ig.Spec.Role if role == "" { - return nil, fmt.Errorf("cannot determine role for instance group: %v", ig.ObjectMeta.Name) + return nil, nil, fmt.Errorf("cannot determine role for instance group: %v", ig.ObjectMeta.Name) } useGossip := dns.IsGossipHostname(cluster.Spec.MasterInternalName) isMaster := role == kops.InstanceGroupRoleMaster - config := nodeup.NewConfig(cluster, ig) + config, auxConfig := nodeup.NewConfig(cluster, ig) config.Assets = make(map[architectures.Architecture][]string) for _, arch := range architectures.GetSupported() { config.Assets[arch] = []string{} @@ -1343,7 +1344,7 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit ca, err := fi.ResourceAsString(caResource) if err != nil { // CA task may not have run yet; we'll retry - return nil, fmt.Errorf("failed to read CA certificate: %w", err) + return nil, nil, fmt.Errorf("failed to read CA certificate: %w", err) } configServer := &nodeup.ConfigServerOptions{ @@ -1383,5 +1384,5 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit config.Channels = n.channels config.EtcdManifests = n.etcdManifests[role] - return config, nil + return config, auxConfig, nil } diff --git a/upup/pkg/fi/nodeup/command.go b/upup/pkg/fi/nodeup/command.go index 15b6695d6c..7f11221427 100644 --- a/upup/pkg/fi/nodeup/command.go +++ b/upup/pkg/fi/nodeup/command.go @@ -18,6 +18,8 @@ package nodeup import ( "context" + "crypto/sha256" + "encoding/base64" "errors" "fmt" "io" @@ -64,7 +66,7 @@ type NodeUpCommand struct { Target string cluster *api.Cluster config *nodeup.Config - instanceGroup *api.InstanceGroup + auxConfig *nodeup.AuxConfig } // Run is responsible for perform the nodeup process @@ -152,25 +154,32 @@ func (c *NodeUpCommand) Run(out io.Writer) error { } } + var auxConfigHash [32]byte if nodeConfig != nil { - c.instanceGroup = &api.InstanceGroup{} - if err := utils.YamlUnmarshal([]byte(nodeConfig.InstanceGroupConfig), c.instanceGroup); err != nil { - return fmt.Errorf("error parsing InstanceGroup config response: %v", err) + c.auxConfig = &nodeup.AuxConfig{} + if err := utils.YamlUnmarshal([]byte(nodeConfig.AuxConfig), c.auxConfig); err != nil { + return fmt.Errorf("error parsing AuxConfig config response: %v", err) } + auxConfigHash = sha256.Sum256([]byte(nodeConfig.AuxConfig)) } else if c.config.InstanceGroupName != "" { - instanceGroupLocation := configBase.Join("instancegroup", c.config.InstanceGroupName) + auxConfigLocation := configBase.Join("igconfig", strings.ToLower(string(c.config.InstanceGroupRole)), c.config.InstanceGroupName, "auxconfig.yaml") - c.instanceGroup = &api.InstanceGroup{} - b, err := instanceGroupLocation.ReadFile() + c.auxConfig = &nodeup.AuxConfig{} + b, err := auxConfigLocation.ReadFile() if err != nil { - return fmt.Errorf("error loading InstanceGroup %q: %v", instanceGroupLocation, err) + return fmt.Errorf("error loading AuxConfig %q: %v", auxConfigLocation, err) } - if err = utils.YamlUnmarshal(b, c.instanceGroup); err != nil { - return fmt.Errorf("error parsing InstanceGroup %q: %v", instanceGroupLocation, err) + if err = utils.YamlUnmarshal(b, c.auxConfig); err != nil { + return fmt.Errorf("error parsing AuxConfig %q: %v", auxConfigLocation, err) } + auxConfigHash = sha256.Sum256(b) } else { - klog.Warningf("No instance group defined in nodeup config") + return fmt.Errorf("no instance group defined in nodeup config") + } + + if c.config.AuxConfigHash != base64.StdEncoding.EncodeToString(auxConfigHash[:]) { + return fmt.Errorf("auxiliary config hash mismatch") } err := evaluateSpec(c) @@ -212,14 +221,14 @@ func (c *NodeUpCommand) Run(out io.Writer) error { } modelContext := &model.NodeupModelContext{ - Cloud: cloud, - Architecture: architecture, - Assets: assetStore, - Cluster: c.cluster, - ConfigBase: configBase, - Distribution: distribution, - InstanceGroup: c.instanceGroup, - NodeupConfig: c.config, + Cloud: cloud, + Architecture: architecture, + Assets: assetStore, + Cluster: c.cluster, + ConfigBase: configBase, + Distribution: distribution, + NodeupConfig: c.config, + NodeupAuxConfig: c.auxConfig, } var secretStore fi.SecretStore @@ -362,8 +371,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error { klog.Exitf("error closing target: %v", err) } - warmPool := c.cluster.Spec.WarmPool.ResolveDefaults(modelContext.InstanceGroup) - if warmPool.IsEnabled() && warmPool.EnableLifecycleHook { + if c.config.EnableLifecycleHook { if api.CloudProviderID(c.cluster.Spec.CloudProvider) == api.CloudProviderAWS { err := completeWarmingLifecycleAction(cloud.(awsup.AWSCloud), modelContext) if err != nil { @@ -375,7 +383,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error { } func completeWarmingLifecycleAction(cloud awsup.AWSCloud, modelContext *model.NodeupModelContext) error { - asgName := modelContext.InstanceGroup.GetName() + "." + modelContext.Cluster.GetName() + asgName := modelContext.NodeupConfig.InstanceGroupName + "." + modelContext.Cluster.GetName() hookName := "kops-warmpool" svc := cloud.(awsup.AWSCloud).Autoscaling() hooks, err := svc.DescribeLifecycleHooks(&autoscaling.DescribeLifecycleHooksInput{ @@ -709,7 +717,7 @@ func getNodeConfigFromServer(ctx context.Context, config *nodeup.ConfigServerOpt func getAWSConfigurationMode(c *model.NodeupModelContext) (string, error) { // Only worker nodes and apiservers can actually autoscale. // We are not adding describe permissions to the other roles - role := c.InstanceGroup.Spec.Role + role := c.NodeupConfig.InstanceGroupRole if role != api.InstanceGroupRoleNode && role != api.InstanceGroupRoleAPIServer { return "", nil }