From e7fa3fa82c4af311e4a36300c40b203239bb55f1 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Sun, 13 Jun 2021 10:14:37 +0200 Subject: [PATCH] Set containerd config on nodeup.Config instead of clusterspec This allows us to set a default containerd config per IG (e.g add a different config for GPU IGs) Can also be considered a cleanup as we no longer use containerd.overrideConfig as a mechanism for bringing the default containerd config from cloudup to nodeup. --- nodeup/pkg/model/containerd.go | 13 +- pkg/apis/nodeup/config.go | 3 + pkg/model/components/containerd.go | 18 --- .../cloudformation.json.extracted.yaml | 96 ++++++------- ...t-1a.masters.minimal.example.com_user_data | 32 ++--- ...mplate_nodes.minimal.example.com_user_data | 32 ++--- ...ters.bastionuserdata.example.com_user_data | 32 ++--- ...odes.bastionuserdata.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...t-1a.masters.complex.example.com_user_data | 32 ++--- ...mplate_nodes.complex.example.com_user_data | 32 ++--- ...-1a.masters.compress.example.com_user_data | 4 +- ...plate_nodes.compress.example.com_user_data | 4 +- .../cloudformation.json.extracted.yaml | 104 +++++++------- .../cloudformation.json.extracted.yaml | 64 ++++----- ...masters.existing-iam.example.com_user_data | 32 ++--- ...masters.existing-iam.example.com_user_data | 32 ++--- ...masters.existing-iam.example.com_user_data | 32 ++--- ...e_nodes.existing-iam.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...a.masters.existingsg.example.com_user_data | 32 ++--- ...b.masters.existingsg.example.com_user_data | 32 ++--- ...c.masters.existingsg.example.com_user_data | 32 ++--- ...ate_nodes.existingsg.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...a.masters.externallb.example.com_user_data | 32 ++--- ...ate_nodes.externallb.example.com_user_data | 32 ++--- ...ers.externalpolicies.example.com_user_data | 32 ++--- ...des.externalpolicies.example.com_user_data | 32 ++--- ...s-test-1a.masters.ha.example.com_user_data | 32 ++--- ...s-test-1b.masters.ha.example.com_user_data | 32 ++--- ...s-test-1c.masters.ha.example.com_user_data | 32 ++--- ...ch_template_nodes.ha.example.com_user_data | 32 ++--- ...ha-gce-example-com_metadata_startup-script | 32 ++--- ...ha-gce-example-com_metadata_startup-script | 32 ++--- ...ha-gce-example-com_metadata_startup-script | 32 ++--- ...ha-gce-example-com_metadata_startup-script | 32 ++--- ...t-1a.masters.minimal.example.com_user_data | 32 ++--- ...mplate_nodes.minimal.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- .../cloudformation.json.extracted.yaml | 64 ++++----- ...t-1a.masters.minimal.example.com_user_data | 32 ++--- ...mplate_nodes.minimal.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...masters.minimal-ipv6.example.com_user_data | 32 ++--- ...e_nodes.minimal-ipv6.example.com_user_data | 32 ++--- ...masters.minimal-json.example.com_user_data | 32 ++--- ...e_nodes.minimal-json.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...t-1a.masters.minimal.example.com_user_data | 32 ++--- ...mplate_nodes.minimal.example.com_user_data | 32 ++--- ...al-gce-example-com_metadata_startup-script | 32 ++--- ...al-gce-example-com_metadata_startup-script | 32 ++--- ...rivate-example-com_metadata_startup-script | 32 ++--- ...rivate-example-com_metadata_startup-script | 32 ++--- ...est-1a.masters.minimal.k8s.local_user_data | 32 ++--- ...template_nodes.minimal.k8s.local_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 128 +++++++++--------- ...sters.mixedinstances.example.com_user_data | 32 ++--- ...sters.mixedinstances.example.com_user_data | 32 ++--- ...sters.mixedinstances.example.com_user_data | 32 ++--- ...nodes.mixedinstances.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 128 +++++++++--------- ...sters.mixedinstances.example.com_user_data | 32 ++--- ...sters.mixedinstances.example.com_user_data | 32 ++--- ...sters.mixedinstances.example.com_user_data | 32 ++--- ...nodes.mixedinstances.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...ters.nthsqsresources.example.com_user_data | 32 ++--- ...odes.nthsqsresources.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...rs.private-shared-ip.example.com_user_data | 32 ++--- ...es.private-shared-ip.example.com_user_data | 32 ++--- ...rivate-shared-subnet.example.com_user_data | 32 ++--- ...rivate-shared-subnet.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...asters.privatecalico.example.com_user_data | 32 ++--- ..._nodes.privatecalico.example.com_user_data | 32 ++--- ...masters.privatecanal.example.com_user_data | 32 ++--- ...e_nodes.privatecanal.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...asters.privatecilium.example.com_user_data | 32 ++--- ..._nodes.privatecilium.example.com_user_data | 32 ++--- .../cloudformation.json.extracted.yaml | 64 ++++----- ...rivateciliumadvanced.example.com_user_data | 32 ++--- ...rivateciliumadvanced.example.com_user_data | 32 ++--- ....masters.privatedns1.example.com_user_data | 32 ++--- ...te_nodes.privatedns1.example.com_user_data | 32 ++--- ....masters.privatedns2.example.com_user_data | 32 ++--- ...te_nodes.privatedns2.example.com_user_data | 32 ++--- ...sters.privateflannel.example.com_user_data | 32 ++--- ...nodes.privateflannel.example.com_user_data | 32 ++--- ...asters.privatekopeio.example.com_user_data | 32 ++--- ..._nodes.privatekopeio.example.com_user_data | 32 ++--- ...masters.privateweave.example.com_user_data | 32 ++--- ...e_nodes.privateweave.example.com_user_data | 32 ++--- ...masters.sharedsubnet.example.com_user_data | 32 ++--- ...e_nodes.sharedsubnet.example.com_user_data | 32 ++--- ...1a.masters.sharedvpc.example.com_user_data | 32 ++--- ...late_nodes.sharedvpc.example.com_user_data | 32 ++--- ...1a.masters.unmanaged.example.com_user_data | 32 ++--- ...late_nodes.unmanaged.example.com_user_data | 32 ++--- ...t-1a.masters.minimal.example.com_user_data | 32 ++--- ...mplate_nodes.minimal.example.com_user_data | 32 ++--- upup/pkg/fi/cloudup/BUILD.bazel | 2 + upup/pkg/fi/cloudup/apply_cluster.go | 36 +++++ upup/pkg/fi/cloudup/containerd_test.go | 23 ++++ 107 files changed, 2028 insertions(+), 1987 deletions(-) diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go index cf19009b19..97698b509d 100644 --- a/nodeup/pkg/model/containerd.go +++ b/nodeup/pkg/model/containerd.go @@ -77,7 +77,7 @@ func (b *ContainerdBuilder) Build(c *fi.ModelBuilderContext) error { } // If there are containerd configuration overrides, apply them - b.buildOverrideConfigFile(c) + b.buildConfigFile(c) if installContainerd { if err := b.installContainerd(c); err != nil { @@ -296,16 +296,11 @@ func (b *ContainerdBuilder) buildSysconfigFile(c *fi.ModelBuilderContext) error return nil } -// buildOverrideConfigFile is responsible for creating the containerd configuration file -func (b *ContainerdBuilder) buildOverrideConfigFile(c *fi.ModelBuilderContext) { - containerdConfigOverride := "" - if b.Cluster.Spec.Containerd != nil { - containerdConfigOverride = fi.StringValue(b.Cluster.Spec.Containerd.ConfigOverride) - } - +// buildConfigFile is responsible for creating the containerd configuration file +func (b *ContainerdBuilder) buildConfigFile(c *fi.ModelBuilderContext) { c.AddTask(&nodetasks.File{ Path: b.containerdConfigFilePath(), - Contents: fi.NewStringResource(containerdConfigOverride), + Contents: fi.NewStringResource(b.NodeupConfig.ContainerdConfig), Type: nodetasks.FileType_File, }) } diff --git a/pkg/apis/nodeup/config.go b/pkg/apis/nodeup/config.go index 1400b2e486..674aadcf8a 100644 --- a/pkg/apis/nodeup/config.go +++ b/pkg/apis/nodeup/config.go @@ -73,6 +73,9 @@ type Config struct { ConfigServer *ConfigServerOptions `json:"configServer,omitempty"` // AuxConfigHash holds a secure hash of the nodeup.AuxConfig. AuxConfigHash string + + // ContainerdConfig config holds the configuration for containerd + ContainerdConfig string `json:"containerdConfig,omitempty"` } // AuxConfig is the configuration for the nodeup binary that might be too big to fit in userdata. diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go index 27ef7396c9..01d0e3ea4b 100644 --- a/pkg/model/components/containerd.go +++ b/pkg/model/components/containerd.go @@ -54,24 +54,6 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error { } // Set default log level to INFO containerd.LogLevel = fi.String("info") - // Build config file for containerd running in CRI mode - if fi.StringValue(containerd.ConfigOverride) == "" { - config, _ := toml.Load("") - config.SetPath([]string{"version"}, int64(2)) - for name, endpoints := range containerd.RegistryMirrors { - config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "registry", "mirrors", name, "endpoint"}, endpoints) - } - config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "runc", "runtime_type"}, "io.containerd.runc.v2") - // only enable systemd cgroups for kubernetes >= 1.20 - config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "runc", "options", "SystemdCgroup"}, b.IsKubernetesGTE("1.20")) - if UsesKubenet(clusterSpec.Networking) { - // Using containerd with Kubenet requires special configuration. - // This is a temporary backwards-compatible solution for kubenet users and will be deprecated when Kubenet is deprecated: - // https://github.com/containerd/containerd/blob/master/docs/cri/config.md#cni-config-template - config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "cni", "conf_template"}, "/etc/containerd/config-cni.template") - } - containerd.ConfigOverride = fi.String(config.String()) - } } else if clusterSpec.ContainerRuntime == "docker" { // Docker version should always be available diff --git a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml index c388a74b69..4cccddc970 100644 --- a/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -209,6 +193,22 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true staticManifests: - key: kube-apiserver-healthcheck path: manifests/static/kube-apiserver-healthcheck.yaml @@ -346,22 +346,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -519,6 +503,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml @@ -659,22 +659,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -741,6 +725,22 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 5c4a01ce99..a838ff675c 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml 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 6d831afe58..03f6d8aadd 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 f32b81c1e3..1a644e0975 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/bastionuserdata.example.com/manifests/etcd/events.yaml 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 d7949fd19e..12ea402cdc 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 @@ -135,22 +135,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -217,6 +201,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/bastionuserdata.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml index ea29558c2b..32b9b4305d 100644 --- a/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml @@ -136,22 +136,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -314,6 +298,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties. UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/complex.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/complex.example.com/manifests/etcd/events.yaml @@ -474,22 +474,6 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -556,6 +540,22 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 7e8aee3704..519f9f2666 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 @@ -135,22 +135,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -313,6 +297,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/complex.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/complex.example.com/manifests/etcd/events.yaml 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 94469eb290..849342bfbf 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 @@ -135,22 +135,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -217,6 +201,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/complex.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 dcb0860fa8..893fb4c503 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 @@ -128,9 +128,9 @@ function download-release() { echo "== nodeup node config starting ==" 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/+xWTXPbNhC961dgppPJJSbFxE1bTg5V5LRWY6WslI9eIWBFoQIBZgFQVn99ZwFSH47VTKfHdjxjW7uLxe7btw8S2gY5tWat6nLEGN+5N6+X0+XsBlUHSCbGwPCVBlmyNdcORow13PAalt4ir2GquXPgSuYxwEhY47kygItgvGqgZAeLPDolJda2voMOdMmUWdsRYx2gU9aUrMius5cjacU2leC2qp0Z57nW/TVgBO5br6zpa2cmaD0CL+RUB+cBHR2EDox3qYtD9hfZdVa8iG0o87hvG1YwqWZLwB4ErrXdVag6paEmKGIVjHFjzb6xwU2C3xwB4q2aBKnACIi3XzHKiAY8uMx1IpOw5kH7FJqumdpgfMkKsgW/saj+5NTg3Eoo2UTv+N5NqIwRYytl5ERKBOdKNs7iz4ixOMwKbackYEnDHA3Tm8hGOeqx0qFWpq/qHW/AtVzAnVqD2AsN0XynGuUX3NSA8TMVqARMhKAao6kixJwH4z9aHRq44yvQ0XOTWjtlx6n9vdWAsbElCGtkcs6D516Z+lDmJ1htrN1G50eulbzsfmclLMB5VILSRtsCnA0o4LdgPScQvJAJ5r7zjfetK/O8eP5dhK8or8fj4jzy1w4QlRxGmCc2ffPo0ecjxlTDayjZ9nuX1QIzZXOa+hVvlUtE6orseREnRQ4NvkJYAyIMw3y/b4fbZsYDGq5nVfx4a503vEnzeXN/4juuEdWA8DmA8xvgEjDSBWSccsrK6xqh5t7iw9g39x75bfyXqlL3w5HfrxbQWA9XMeLq4bmf0YY2nXt4ILoexn9wVHoDjx8hLy08iIBQWfQlu75+ES2nFJw5F4jhwyh4qzLVA5YJ27QEZgb3vGk1kOGLDL98erv8sJj9gxS5bcEomXdF/sdu644Ze8GZVXFjSlaMx9nLa6JGHmXGpU14zcUWjCwjw5LETK3xaLUGnEdFPUiN4B6I1tPZzcIdxcZ7LjY3QL8XtDxCaVjujagAlZUlK5qxuyQDIlVJGVOJP7xMJRZHJxGFBPtR/EQU2oAwpfQLGzyJ/qB4F7gvDh1eNX2LxyXQiXga4t4mJT6xHfo+Z3hwcK5HUwQJxiuuB6jo6grt/b78auNtWCR2Rh/1uek3bdj+kj39ke/c08tNtvGqk75O6qWApdiADDqN90IOd4j5d/j0wlJefptETWvZv+/M7Z2HRh7sC2t9yfKvsOjm3fKE58X4xGPjqzp8zIjL+vAK3cAq1LUy9S03UtP6Dz1Al9T7lqMsWQONxX3GO640nXtVjMdz9cxYCWt3Zn4yGBX9dT8hwKtvnzyLKH8ROljPYv9+5IRnYn7FCcW845hrtcp7oPNjwBdMNeB3Frfpxe13yyhyWDPn7nMA5GnHz0WD4GytnHOj1uB8fzF4kR+/ReRN73WjhhPSb/8f/H9t8PSy1vQlDHuFoX6Hef8FAAD//wEAAP//MYvDU9kLAAA=" | base64 -d | gzip -d > conf/cluster_spec.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 +echo "H4sIAAAAAAAA/7RW74/bxhH9rr+CMBDkS0ju7x9CDMT1obHROHZtFEVRBMXs7qzEHsVVuJTsK/rHF0tKd5LroE1y90nk7pvHNzszT/siZ5zyelVVsAtKlIe6UoZ6Q522XAAyF7lxNlIWjKXKcKtZoNG5qIIOVqMkVhAQ2lFug6COy++207TP67bNUxphg80mpU2PsO9y49OuvT04HAecMNcj9ggZ2/PvkTaMNqR13dD23XD41M665pAep1mejVpEFkEjcgaBaKSaUaqZtJYxYYQmnBIP1BrDqJDUGKIct44GCDaSJ5Lnp36Rp7VhwnIWpFLaa+AaQAH3zoEglBBQRnPUrhye4WgcGq6Ro4YYCJj/Kc/kGsapi+CnXPuhe1BHGtPo1g9dve8Pm27I9SyynkXWy3Yzbf61VBlQaMWlNd5Kw6NxkigiI7VBeY0Wo+WeUaWJEkqi5iF6IxCVUxwYf9C56abtwc3afBom6AYcw+XjSV9uQ/o49AlCOUfRqNaPXf2AK7nU88al7GaCsTlJjpZgUMFjlFygChSQakt08BqdIIoKZ6yQEAREHQlaE5hD7QMaqqRX95Lvz6+5NbnpUikojB3m9jbtc7tUuYZ+v4WGXlV6P6YplXJ/84X0Hzpn4fli4lfU93SXKS9tZC1DjY4BQ8ujthYlWLQGnaZGcS04l0w4r2RUnHCpGaGgbRTWUR7II+TqtzAM2OfHSfXM9lmmMO7OvkO14cxRyxxKBE6FpiJqpApjkCijklxoq4VzLgoaMCpHWFTGcsoN8eJxB7vouvIdECFoSkiUQoMggSOLhhtJAnHgtPQKQaKTkkcChkDwUXMqpcNIYyDhieSdfQeQ8qCd9ES6QA1BsE46ZaIQLgBoF52ghAtgGGlQJgaDlEmrrQ5KsPgUvlNEfu47Do23IIEodOhNdDRwhUZpHwiJTmqttVBgDWVAPCCzSmltYjTWeske/l3OndaE5G9xnEUuh5MnmDpfflyPLcDot0q0C6xmpKHkQg+L0lrPgxRReOGC895KgEi8dpJyMEIGE60kHL10XHgbjQKgznMRPfG/b9DmMj61qZSPLKYSjGDIFVdgZUDGqfQBoZgkMMO4lACeKGkwEmdUkMEzISxRSnITKX+EXJ/WVOZMXxw+vUxD7DavIG/XVftWvv7Qhu+T4f2R3bi/DuLW0rd/i4e3P09vtT3+M8r9Db35c//6+eplf8gTjj/CDteVT7v9iDk3+Al2+x6LyNVC/QfIuK52uIslB79EXQHbL0a/HvIEg8fvx3TYL1/ZQYmtD7meME81hWvQ+9Tjunozg1Z/Wvxo0TBf24Y03O3SIb84TNt1FaHPuKoqvymhN2N3xHFd5bs84S7cr79PaVpXbXnv0yG8G9OxCwUIH/O8OGdz8+OHdUUJaZRoysxc7KQddMP6/Nr0yUMxIRzKwN2gO2w23bB5BUPocczrahoPRRUeOz91aXgFY5gPL413DRyh60vct5SQN903QwoY89XyV+fFrvzmP46I38qvvul2sPlv6Hn1Cruqqm3K0wA7fHvEcewCrquvv4OP+etVVc02Oh/pOyin2B5hbPvOne2/fQCsqqpPmx/wiP26YquqGnD6mMbbd7Pxndpm6MpGCvgDOOzn63VVlY4+T0t5nm8+Y+p7HOv9bbeunj1bcPdDUJDjXP2lRebtQluX1eYaeGKr9z0MeE/2S+iF8Ar2GQI/+f4QsI5j2tX4acJxgL4uQ1g76Et3lsLO8UMa3kD++YAjBHz5+ub9RduQdm6cfQpvYOgi5ul0xDj5y3nfnXZL/4246Yq8D36L4TBX9tzZf9kHmPBd6jt/t67gMKVdsfrV2QfWq/rXD2ULIaQhty6lKU8j7OsTXXMHu371cEM9jV3171VVHXHMXRqq5xVbrarq76d/vp9W84GeX5tnXWoeCJrNuPfNkTZ+7J6doP8f+GL9Pu5XRzbjYZi6HeYLit9OUh78TxdEVXXa+sd0t8fqefUZYcE3R/ZsdRXzuz7fpH0xlHwto6o+LI73cra76vliQDj5+y78jZ1y36alf0NbbHBpkkcgwyMOU17olhvMldhbvFvP5lCXKxmORxzrLUI/bf0W/W0ZsnmyHlhP16Bfjlm+9R8AAAD//wEAAP//Y8xV/QQQAAA=" | 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 99deaaa46c..ea3e2e5d84 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 @@ -128,9 +128,9 @@ function download-release() { echo "== nodeup node config starting ==" 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/3yS0W7bPAyF7/0UvCl601+2i/7BJvRiW7KhAZYuSJ6AsRhXiEymouQsbz/YTZplA3Zl+Bzah/zIJkh2U+Gtb20BgAf9+mU9Xc9n0fcUBwmAGDeBnIUtBqUCoEPGltZJIrY0DahKaiHFTEUjnNAzxVXm5Duy8K64i+mGHwdpv1NPwYLnrRQAPUX1whZq82AmhZNm99aC7vx+zpowhFPMLm9oGeXncbCbkDVRnM5nKwt1VZmPE1OZqqzrwdznFb1m0jR6XQHwIpoYO/rRU4zekYXbT3jQ2wLAd9iShd0HNW0TjZdySPpvP0b1tbmvTXXV+v3YSqA00mPhYydZP+f0csHVtFHy/kQU9KiJOveur0SShXKcQ7JbRum9GwrxoJfhZs/rt9kmD6YydfWbIx16tudXE6TBUJy3NqNNblvP7ROyCxTPewKg3jfJCz9hdBY66iQeDfbow/DdY11VC3/H4mirV/LNWfTDU79Fosf/b+5Gcn+VntWr2n+vYODZjAe5xIFi2WMsg9+UJ9DlpeCPTQAwpYPE3TLk1vMzjufHfjCEF6ivmSI6uhzKCLMqR5x7cQtkvyVNp2BKzRgWmRJp2Z1cLX4BAAD//wEAAP//GWuHvzUDAAA=" | base64 -d | gzip -d > conf/cluster_spec.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 +echo "H4sIAAAAAAAA/7SVbY/cthHH3+tTEAcEeZOVSJHiwyIG4vrQ2Gjsc20URVEExZAc7rGWxA3J3fMV/fCFtLu527RAm7Z+JWqe+NPwz9HLUrCWbUMITF6KZbEhUjOnmVWGC8DeBq6tCaz32jCpuVG9Z8HaIL3yRuFAjaAglGXceMEsH767r3Vftl1Xasqww3aX0m5E2MfSujR1nw4W84wVyybjiFCwuzyPrO1ZSzsb526M8+Fzt3KtKSPWFc8EJUIfQCHyHjxVyFTPmOoHY/peaKEoZ9QBM1r3TAxMayotN5Z58CbQL4Tn6njCU0r3wvDeD1Iqp4ArAAncWQuCMkpBasVR2aV5mqO2qLlCjgqCp6D/LZ4uG8g1BnC1bNwcn+hoq1vVuTlu9uNhF+eyWSE3K+Tm5G7r7m+nUwYUSvLBaGcGzYO2A5V0CMx46RQaDIa7nklFpZADKu6D0wJRWsmh50+cu1jvD3Zlc2muEGfM/vnyzFc6nx7mMYFf+iha2bkcN09xy7dsVsdz7LZCbldkyNNFoUxp3ltmeosDAmdCMREUMonBDzgEOXChjBLW2iCYxyAt7YPUhjOuqRP/XwksXFcKBeG9YpSGQSgQ1HPsg+Z6oJ5asGpwEmFAOww8UNAUvAuKs2GwGFjw1H8hvItCARn3yg6ODtYzTRGMHazUQQjrAZQNVjDKBfQYmJc6eI2sH4wyykvRhy+h0AXylwq1qJ2BAahEi04HyzyXqKVyntJgB6WUEhKMZj1QB9gbKZXSIWhj3NA/zaGL7lqf3CfMK+SpOaVCjW552BE7gOzupehOYZuetoyeeV4ePr9Kc4i711Dut6S7G9587Pz3SfPx2N/aP87ik2F3fwqHu5/qnTLHv4Zhf8tufz++edG8Gg+lYn4HE26JS9M+YyktfoZpP+IC05xK/wYKbsmEU1ig3SnrKrD7l9lv5lJhdvh9Tof9aZc5eSzXjg9pxC15lzw2vztp9bTrOvznND9O6VBeHur9lgQYCzaEuN2SeJvjEfOWlMdScfI/2z+kVLekW97HdPDvczpGvwTCQ1mNK//tu49bwihtpWiXfj7zpAnivL28tmNysAgU5+UwbtEedrs4717D7EfMZUtqPixUeIyuxjS/huzXdqX82MIR4rjkfcsofRu/WRoQypX5q4sxrt35bUb8dvjqmzjB7p9DL9ar2IaQ+1TqDBPeHTHn6HFLvv4OHsrXDSHrFVtb+h6WLnZHyN0Y7WU0dE8BDSFj2v2ARxy3pG8ImbE+pPzp/XopzkKZ4+JIHn8Ai+P6kz5tcrr6bUxdXs90iVmdy2Kz2NrrsMW+JTc3a735LZSfDpjB46s3tx+eHQ7t1uPZJ/8W5hiw1POHYHXPZk43nb2l+cPeQ8X3aYzucUvgUNO03KfG3cM8r8ybX6/nDrxPc+lsSrXUDPvNuVz7CNPYPP0wzvolf28IOWIuMc3kBembhpA/n8fLj83amMtrexNT+1Sg3eW9a4+sdTnenEP/s+Bn9p/zfnVmmw9zjROWZyX++yLLwv34rBAhZ9df6uMeyQvyi4JLfHvsb5qrnP9p+zbtl5tZrjEI+XgaHa/WuUFenG7yPwAAAP//AQAA//8gfXoUfAoAAA==" | 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 f92a2e394c..687142ac5d 100644 --- a/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml @@ -127,32 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true - - [plugins."io.containerd.grpc.v1.cri".registry] - - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."*"] - endpoint = ["http://HostIP2:Port2"] - - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] logLevel: info packages: hashAmd64: "0000000000000000000000000000000000000000000000000000000000000000" @@ -317,6 +291,32 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true + + [plugins."io.containerd.grpc.v1.cri".registry] + + [plugins."io.containerd.grpc.v1.cri".registry.mirrors] + + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."*"] + endpoint = ["http://HostIP2:Port2"] + + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] + endpoint = ["https://registry-1.docker.io"] etcdManifests: - memfs://clusters.example.com/containerd.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/containerd.example.com/manifests/etcd/events.yaml @@ -457,32 +457,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true - - [plugins."io.containerd.grpc.v1.cri".registry] - - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."*"] - endpoint = ["http://HostIP2:Port2"] - - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] - endpoint = ["https://registry-1.docker.io"] logLevel: info packages: hashAmd64: "0000000000000000000000000000000000000000000000000000000000000000" @@ -557,6 +531,32 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true + + [plugins."io.containerd.grpc.v1.cri".registry] + + [plugins."io.containerd.grpc.v1.cri".registry.mirrors] + + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."*"] + endpoint = ["http://HostIP2:Port2"] + + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] + endpoint = ["https://registry-1.docker.io"] __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml index 46d3b429b2..e42779fcbd 100644 --- a/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/containerd.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/containerd.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -521,6 +505,22 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat UpdatePolicy: automatic channels: - memfs://clusters.example.com/containerd.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 3e579ff388..bffdd2f039 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/existing-iam.example.com/manifests/etcd/main.yaml - memfs://tests/existing-iam.example.com/manifests/etcd/events.yaml 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 1294d72007..dbbc93acfa 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/existing-iam.example.com/manifests/etcd/main.yaml - memfs://tests/existing-iam.example.com/manifests/etcd/events.yaml 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 8218765c7b..84e116bd44 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/existing-iam.example.com/manifests/etcd/main.yaml - memfs://tests/existing-iam.example.com/manifests/etcd/events.yaml 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 f91cc2f6b8..74123dfe36 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/existing-iam.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 d9a2235368..e4271c1347 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 @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -521,6 +505,22 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 5ffba37a2a..5269de3daf 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events.yaml 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 e335f07565..68a9ec4601 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events.yaml 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 2c9ed84aeb..4b49398138 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/existingsg.example.com/manifests/etcd/events.yaml 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 7e538d7350..6cd136f727 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/existingsg.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml index edf94b4c96..f1530276b5 100644 --- a/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/externallb.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/externallb.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -521,6 +505,22 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 1ac64f7b09..c89e6c1742 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/externallb.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/externallb.example.com/manifests/etcd/events.yaml 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 a2b22dedc2..a2f6fe847f 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/externallb.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 894b53fc04..92f1c6be07 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -300,6 +284,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/externalpolicies.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/externalpolicies.example.com/manifests/etcd/events.yaml 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 d3e870f79c..4697173f78 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/externalpolicies.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 7978569422..d773aa1160 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/ha.example.com/manifests/etcd/main.yaml - memfs://tests/ha.example.com/manifests/etcd/events.yaml 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 67888797b1..cf3d3403f3 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/ha.example.com/manifests/etcd/main.yaml - memfs://tests/ha.example.com/manifests/etcd/events.yaml 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 d10ef07706..cd755fac8c 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/ha.example.com/manifests/etcd/main.yaml - memfs://tests/ha.example.com/manifests/etcd/events.yaml 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 4cd362620a..fed3131265 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 d86febcabc..45de5fdd62 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: ha-gce-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -302,6 +286,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/ha-gce.example.com/manifests/etcd/main.yaml - memfs://tests/ha-gce.example.com/manifests/etcd/events.yaml 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 a4c8c96b44..0ad189a7d4 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: ha-gce-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -302,6 +286,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/ha-gce.example.com/manifests/etcd/main.yaml - memfs://tests/ha-gce.example.com/manifests/etcd/events.yaml 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 70bfc7b799..e99aa16b08 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: ha-gce-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -302,6 +286,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/ha-gce.example.com/manifests/etcd/main.yaml - memfs://tests/ha-gce.example.com/manifests/etcd/events.yaml 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 348d6a5951..4b0ad71afe 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: ha-gce-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -211,6 +195,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/ha-gce.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 2e0df2bff3..5fb25b56d2 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml 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 1734db6e36..9fc484d673 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 b2b80401d7..d37d724f51 100644 --- a/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -315,6 +299,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-etcd.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal-etcd.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-etcd.example.com/manifests/etcd/events.yaml @@ -455,22 +455,6 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -537,6 +521,22 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-etcd.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 66983d581d..7528f7e5e9 100644 --- a/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -305,6 +289,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml @@ -445,22 +445,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -527,6 +511,22 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 710d2e744f..f768e990e8 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -304,6 +288,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml 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 6d831afe58..03f6d8aadd 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 b5a91b163d..05a3ac7ce6 100644 --- a/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -521,6 +505,22 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 fb18a420e0..fcc8246f7e 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-ipv6.example.com/manifests/etcd/events.yaml 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 7180d3e799..b26751c660 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-ipv6.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 2a64a6c354..515f86a93d 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-json.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal-json.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal-json.example.com/manifests/etcd/events.yaml 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 b44b8240a2..3506017c00 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal-json.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml index d9a2235368..e4271c1347 100644 --- a/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -521,6 +505,22 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 2ecf51b0b9..c2144d7fa9 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml 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 6d831afe58..03f6d8aadd 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 feddc9fbb8..405a747643 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: minimal-gce-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -302,6 +286,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/minimal-gce.example.com/manifests/etcd/main.yaml - memfs://tests/minimal-gce.example.com/manifests/etcd/events.yaml 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 d56bb807a8..20e20da267 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: minimal-gce-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -211,6 +195,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/minimal-gce.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 f0bbb5f524..716c117c84 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: minimal-gce-private-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -302,6 +286,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://tests/minimal-gce-private.example.com/manifests/etcd/main.yaml - memfs://tests/minimal-gce-private.example.com/manifests/etcd/events.yaml 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 91a0bd774b..b95a77db73 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 @@ -126,22 +126,6 @@ cloudConfig: nodeTags: minimal-gce-private-example-com-k8s-io-role-node containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -211,6 +195,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://tests/minimal-gce-private.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 d16731e343..794ba8ea1a 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.k8s.local/manifests/etcd/events.yaml 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 5a08d3c6ce..64183943eb 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -212,6 +196,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.k8s.local/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 ea2b757295..35dd5dab0e 100644 --- a/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -611,6 +595,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml @@ -751,22 +751,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -923,6 +907,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml @@ -1063,22 +1063,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -1145,6 +1129,22 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 c9fa77452a..92ec0cbeff 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml 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 e394effd46..6a686a0c8d 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml 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 4676f562cd..ec1429fd4b 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml 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 999ecd51b0..1af1586852 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 ea2b757295..35dd5dab0e 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 @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -611,6 +595,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml @@ -751,22 +751,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -923,6 +907,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml @@ -1063,22 +1063,6 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -1145,6 +1129,22 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 c9fa77452a..92ec0cbeff 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml 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 e394effd46..6a686a0c8d 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml 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 4676f562cd..ec1429fd4b 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/mixedinstances.example.com/manifests/etcd/events.yaml 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 999ecd51b0..1af1586852 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/mixedinstances.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 2ff12704c4..25be28e883 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 @@ -127,22 +127,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -299,6 +283,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/nthsqsresources.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/nthsqsresources.example.com/manifests/etcd/events.yaml @@ -439,22 +439,6 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -521,6 +505,22 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 e88d676fa8..53a7335d73 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/nthsqsresources.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/nthsqsresources.example.com/manifests/etcd/events.yaml 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 08557cc0da..e71c03ecc2 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/nthsqsresources.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 51cb073ff5..af8ba6032d 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 @@ -128,22 +128,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -300,6 +284,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/events.yaml @@ -440,22 +440,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -522,6 +506,22 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 47bdfd1c21..20206ff666 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/private-shared-ip.example.com/manifests/etcd/events.yaml 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 6ef18231ef..093e9100ea 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-ip.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 89c7902d3a..3309875c80 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/private-shared-subnet.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/private-shared-subnet.example.com/manifests/etcd/events.yaml 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 fc4eef01f4..713b902cd0 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/private-shared-subnet.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml index e7baee5ca5..a2fd65419f 100644 --- a/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml @@ -128,22 +128,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -300,6 +284,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/events.yaml @@ -440,22 +440,6 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -522,6 +506,22 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 f102047c1e..e163c63358 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecalico.example.com/manifests/etcd/events.yaml 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 4982b21901..cc07ed7c79 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecalico.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 df422bb08d..d45803c1d4 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatecanal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecanal.example.com/manifests/etcd/events.yaml 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 4d5bb35fc3..b4e5bc5068 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecanal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml index 9cd301df48..fab22a6d89 100644 --- a/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml @@ -128,22 +128,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -300,6 +284,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/events.yaml @@ -440,22 +440,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -522,6 +506,22 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 c446059a45..2639828692 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatecilium.example.com/manifests/etcd/events.yaml 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 373f61e2c4..51ef5fc60a 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatecilium.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml index bc7970dc15..6567ff4683 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml @@ -128,22 +128,6 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -303,6 +287,22 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/events.yaml @@ -444,22 +444,6 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -527,6 +511,22 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml + containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 85a594ad06..a077f105bc 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -301,6 +285,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateciliumadvanced.example.com/manifests/etcd/events.yaml 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 1fd32df4e1..de9c3e7fc9 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -209,6 +193,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateciliumadvanced.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 259a77a231..cfcb4c0cb2 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatedns1.example.com/manifests/etcd/events.yaml 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 373ae8bb0d..e342e2c075 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns1.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 1796d986be..5455b17e36 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatedns2.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatedns2.example.com/manifests/etcd/events.yaml 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 b726589351..cc041df0f2 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatedns2.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 3e05f766df..45aed74c12 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateflannel.example.com/manifests/etcd/events.yaml 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 8fa0d6a77d..925b0d6100 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateflannel.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 060e94d0ad..423257bea4 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privatekopeio.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privatekopeio.example.com/manifests/etcd/events.yaml 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 0fc1f4a599..f20c492027 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privatekopeio.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 ce7a0d0695..9d17fc5feb 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/privateweave.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/privateweave.example.com/manifests/etcd/events.yaml 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 ad9878279e..b28f609b94 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/privateweave.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 a09f2b9b0a..11f25c754e 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/sharedsubnet.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/sharedsubnet.example.com/manifests/etcd/events.yaml 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 53e3b4dd75..7e7c34b22a 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedsubnet.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 7e49334149..743f7b1021 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/sharedvpc.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/sharedvpc.example.com/manifests/etcd/events.yaml 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 1de8181799..920259913d 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/sharedvpc.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 04649faa4d..e043414e9d 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/unmanaged.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/unmanaged.example.com/manifests/etcd/events.yaml 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 480ce4ae7c..741ea89b29 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/unmanaged.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV 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 5c4a01ce99..a838ff675c 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -298,6 +282,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main.yaml - memfs://clusters.example.com/minimal.example.com/manifests/etcd/events.yaml 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 6d831afe58..03f6d8aadd 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 @@ -126,22 +126,6 @@ cloudConfig: manageStorageClasses: true containerRuntime: containerd containerd: - configOverride: | - version = 2 - - [plugins] - - [plugins."io.containerd.grpc.v1.cri"] - - [plugins."io.containerd.grpc.v1.cri".containerd] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true logLevel: info version: 1.4.6 docker: @@ -208,6 +192,22 @@ KubeletConfig: UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml +containerdConfig: | + version = 2 + + [plugins] + + [plugins."io.containerd.grpc.v1.cri"] + + [plugins."io.containerd.grpc.v1.cri".containerd] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true __EOF_KUBE_ENV diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel index ec149b75a1..399444cf5c 100644 --- a/upup/pkg/fi/cloudup/BUILD.bazel +++ b/upup/pkg/fi/cloudup/BUILD.bazel @@ -80,6 +80,7 @@ go_library( "//vendor/github.com/aws/aws-sdk-go/aws:go_default_library", "//vendor/github.com/aws/aws-sdk-go/service/ec2:go_default_library", "//vendor/github.com/blang/semver/v4:go_default_library", + "//vendor/github.com/pelletier/go-toml:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -115,6 +116,7 @@ go_test( "//:go_default_library", "//pkg/apis/kops:go_default_library", "//pkg/apis/kops/validation:go_default_library", + "//pkg/apis/nodeup:go_default_library", "//pkg/assets:go_default_library", "//pkg/client/simple/vfsclientset:go_default_library", "//pkg/diff:go_default_library", diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 91895f2e42..aea69c6974 100644 --- a/upup/pkg/fi/cloudup/apply_cluster.go +++ b/upup/pkg/fi/cloudup/apply_cluster.go @@ -29,6 +29,7 @@ import ( "strings" "github.com/blang/semver/v4" + "github.com/pelletier/go-toml" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" kopsbase "k8s.io/kops" @@ -1384,5 +1385,40 @@ func (n *nodeUpConfigBuilder) BuildConfig(ig *kops.InstanceGroup, apiserverAddit config.Channels = n.channels config.EtcdManifests = n.etcdManifests[role] + if cluster.Spec.Containerd == nil { + cluster.Spec.Containerd = &kops.ContainerdConfig{} + } + config.ContainerdConfig = buildContainerdConfig(cluster) + return config, auxConfig, nil + +} + +func buildContainerdConfig(cluster *kops.Cluster) string { + if cluster.Spec.ContainerRuntime != "containerd" { + return "" + } + + containerd := cluster.Spec.Containerd + if fi.StringValue(containerd.ConfigOverride) != "" { + return *cluster.Spec.Containerd.ConfigOverride + } + + // Build config file for containerd running in CRI mode + + config, _ := toml.Load("") + config.SetPath([]string{"version"}, int64(2)) + for name, endpoints := range containerd.RegistryMirrors { + config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "registry", "mirrors", name, "endpoint"}, endpoints) + } + config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "runc", "runtime_type"}, "io.containerd.runc.v2") + // only enable systemd cgroups for kubernetes >= 1.20 + config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "runc", "options", "SystemdCgroup"}, cluster.IsKubernetesGTE("1.20")) + if components.UsesKubenet(cluster.Spec.Networking) { + // Using containerd with Kubenet requires special configuration. + // This is a temporary backwards-compatible solution for kubenet users and will be deprecated when Kubenet is deprecated: + // https://github.com/containerd/containerd/blob/master/docs/cri/config.md#cni-config-template + config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "cni", "conf_template"}, "/etc/containerd/config-cni.template") + } + return config.String() } diff --git a/upup/pkg/fi/cloudup/containerd_test.go b/upup/pkg/fi/cloudup/containerd_test.go index 4ee3e470da..12a1b99bc7 100644 --- a/upup/pkg/fi/cloudup/containerd_test.go +++ b/upup/pkg/fi/cloudup/containerd_test.go @@ -22,6 +22,8 @@ import ( "reflect" "testing" + "k8s.io/kops/pkg/apis/kops" + "k8s.io/kops/pkg/apis/nodeup" "k8s.io/kops/util/pkg/architectures" ) @@ -325,3 +327,24 @@ func TestContainerdVersionsHashesAmd64(t *testing.T) { }) } } + +func TestContainerdConfig(t *testing.T) { + cluster := &kops.Cluster{ + Spec: kops.ClusterSpec{ + ContainerRuntime: "containerd", + Containerd: &kops.ContainerdConfig{}, + KubernetesVersion: "1.21.0", + Networking: &kops.NetworkingSpec{ + Kubenet: &kops.KubenetNetworkingSpec{}, + }, + }, + } + config := &nodeup.Config{} + + config.ContainerdConfig = buildContainerdConfig(cluster) + + if config.ContainerdConfig == "" { + t.Errorf("got unexpected empty containerd config") + } + +}