kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10730 from olemarkus/csi-snapshot-controller 

Add snapshot-controller
This commit is contained in:
Kubernetes Prow Robot 2021-05-21 07:22:46 -07:00 committed by GitHub
parent 06835e219d 46e13c0009
commit 864d2b64cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
121 changed files with 2193 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/awsebscsidriver.go
View File

@ -31,7 +31,7 @@ var _ fi.ModelBuilder = &AWSEBSCSIDriverBuilder{}
func (b *AWSEBSCSIDriverBuilder) Build(c *fi.ModelBuilderContext) error {
csi := b.Cluster.Spec.CloudConfig.AWSEBSCSIDriver
if csi == nil {
if csi == nil || !fi.BoolValue(csi.Enabled) {
return nil
}

11
pkg/model/components/awsebscsidriver.go
View File

@ -31,8 +31,15 @@ var _ loader.OptionsBuilder = &AWSEBSCSIDriverOptionsBuilder{}
func (b *AWSEBSCSIDriverOptionsBuilder) BuildOptions(o interface{}) error {
clusterSpec := o.(*kops.ClusterSpec)
c := clusterSpec.CloudConfig.AWSEBSCSIDriver
if c == nil {
cc := clusterSpec.CloudConfig
if cc.AWSEBSCSIDriver == nil {
cc.AWSEBSCSIDriver = &kops.AWSEBSCSIDriver{
Enabled: fi.Bool(false),
}
}
c := cc.AWSEBSCSIDriver
if !fi.BoolValue(c.Enabled) {
return nil
}

30
tests/integration/update_cluster/apiservernodes/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplateapiserverapiserversminimalexamplecom.Properties.La
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:
@ -107,11 +107,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -212,11 +212,11 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_master-us-test-1a.masters.bastionuserdata.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_launch_template_nodes.bastionuserdata.example.com_user_data
View File

@ -130,6 +130,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/complex/cloudformation.json.extracted.yaml
View File

@ -39,11 +39,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscomplexexamplecom.Properties.
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -149,11 +149,11 @@ Resources.AWSEC2LaunchTemplatenodescomplexexamplecom.Properties.LaunchTemplateDa
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View File

@ -130,6 +130,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
View File

@ -130,6 +130,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/compress/data/aws_launch_template_master-us-test-1a.masters.compress.example.com_user_data
View File

@ -128,7 +128,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir
echo "H4sIAAAAAAAA/+xW648bNRD/nr/CKqr6pbebvR4FVq1EyBUu9K6EpA8kVCHHnmxMvPZ2bO9dEH88Gns3r7ujlH6ERErW8/I8fjOzQtsgx9YsVVUOGKu54RXMvUVewVhz58CVzGOAgbDGc2UAZ8F4VUPJthS5Y0qyIqK9n1pAVBJK9ueAMcZaQKesYc/Z6SASfm10qJRx79NxR8geKJvtTGYVNiJri0ygerAV/mfie/Q9zU/WzTAF7Q6M/Hsz9CDeH5hirGP+5jcNsOfsyCRpZO3pg8GR1me5kNnGK0slYEef+cZ5qOW4Qhsa9jxhgDFtq0toQZdMmaUdbKtasiI7y54OpBVrQAKBW6tmYpznWncIAiNwE+/rAMdM0HoAXsixDs4DOlKEFoyPT3vWn2RnWfEkIlSZu3nrsIDRdDIHbJMHXGt7PUXVKg0VyLKPgRtrNrUNbhT8qmRLrl0kN2oUpAIjIN5+wsgiGvDgMteKTMKSB+2TaLpmbIPxJSuIFvzKovqDU4BXlnA/0td840bkxoCxhTJyJCWCcyUbZvFLzUIdOEXbKglYMn7tKAeGLzSMZK0cxThNJU5eveI1uIYLuFRLEBuhIZIvVa38jJsKMJ7JQSVgJAT5GElTypjzYPxbq0MNl3wBOnLOU2j7jb9Pf201YAxsDsIamZhXwXOvTLV18x0sVtauI/Mt10rez35lJczAeVSCzEbaDJwNKODnYD2nJHghU5q7yFfeN67M8+L0q5i+ojwbDotDyX7qdCp5QtMXd6qeDhhTNa+gZOuvXVYJzJTNqeonvFEuAaktstMiVooYGvwUYQmI0Bfz9abpb5sYD2i4nkzj8cI6b3id6vPiZo+3ayPyAeFDAOdXwCVghAvIWOVklVcVQsW9xWPZFzce+UV8JK/UTa/yy8kMauvhJEqcHOv9QE2d9I4VIutY/o0j12u4W4W41PAgAsLUoi/Z2dmTSNmH4MS5QAjvS8EblakuYZmwdUPJzOCG140GItyy8OO7l/M3s8knmMhtA0bJvC3y36/XbmexGziTaeyYkhXDYfb0jKCRxzHjUid8x8UajCwjwtKIGVvj0WoNeBWX5XbUCO6BYD2enM/cbth4z8XqHOh3Rs0jlIb5xogpoLKyZEU9dPeNAZG8JIvJxW+eJheLHZOAQrv4zvylTRwQxmR+ZoOnfd5PvHuwL7YRntRdiLsm0Al4GmLfpkm8RytvLwpCeHBwOI/GCBKMV1z3qaKrp2hvNuVHA2/CLKEz8ijOVddpu3eOR9/ya/fo/iCbeNVeXHv+ksBcrEAGncp7jw23lfm8/HSDpbx/N4m4hs9R0URiLu3mLX1mrS9Z/hEUnb+a7+G8GO5xbNyq/TEjLOvtFjqHRagqZaoLbqSm9u9jgDZN7wuOsmQ11BY3GW+50qT3rBgOr9RjYyUs3QH5YU9U9O++R4BnXz58HLN8S7SnHsj+fckpnwn5U05ZzFuOuVaLvEt0vhO4hVQD/triOm3crreMIoY1V9x9CIA89fjh0KB0NlZecaOW4Hx3MXiR794i8rrjukHNKdMv/y/8f63wtFkregnDbsJQvH29/wIAAP//AQAA///JK3mEjg0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/+xWbW/bthN/709B9I+ibxrJSvPvNqEF5jrd4jXpPLsPA4ZioMmzzJki1SOpxMM+/HCk5Kck67q+3BIgke754Xd3EtoGObZmqapywBi/di9fzMfzyTmqFpBIjIHhCw2yZEuuHQwYq7nhFcy9RV7BWHPnwJXMY4CBsMZzZQBnwXhVQ8m2FLljSjIsotcfW0BUEkr2R3TWAjplDXvOTgeR8EujQ6WM+5Bed4TsgbLZzmRWYSOytsgEqgdb4b8nvkff0/xs3QxT0u7AyD83Qw/iw4Epxjrmr37TAHvOjkySRtaePhgcaX1RCJltvLLUAnb0M984D7UcV2hDw54nDDCmbXUJLeiSKbO0g21XS1ZkZ9nTgbRindDl1qqZGOe51h2CwAjcRH8dLJkJWg/ACznWwXlAR4rQgvGu3MdMyZ5kZ1nxJCJUmbt567CA0XQyB+zwzbW211NUrdJQEcq7HLixZlPb4EbBr3bY540aBanACIjeTxhZRAMeXOZakUlY8qB9Ek1uxjYYX7KCaMGvLKrfOSV4ZQn3I33NN25EYQwYWygjR1IiOFeyYRZ/aVhoTqdoWyUBS5rTQT+YI1krRzlOU4tTVK95Da7hAi7VEsRGaIjkS1UrP+OmAozvFKASMBKCYoykKVXMeTD+ndWhhku+AB055ym1/cHfp7+xGjAmNgdhjUzMq+C5V6bahvkeFitr15H5jmsl72e/thJm4DwqQWYjbQbOBhTwU7CeUxG8kKnMXeYr7xtX5nlx+lUsX1GeDYfFoWS/dTqVPKHpf3eqng4YUzWvoGTrr11WCcyUzanrJ7xRLgGpLbLTInaKGBr8FGEJiNA3882m6b1NjAc0XE+m8fXCOm94nfrz8maPtxsjigHhYwDnV8AlYIQLyNjlZJVXFULFvcVj2Zc3HvlFfKSo1E2v8vPJDGrr4SRKnBzrfU9DnfSOFSLrWP6to9BruFuFuDTwIALC1KIv2dnZk0jZh+DEuUAI71vBG5WprmCZsHVDxczghteNBiLcsvDD+1fzt7PJZ5jIbQNGybwt8t+u125nsVs4k2mcmJIVw2H29Iygkcc149IkvOBiDUaWEWFpxYyt8Wi1BryKx3K7agT3QLAeT85nbrdsvOdidQ70d0bDI5SG+caIKaCysmRFPXT3rQGRoiSLKcRvnqYQix2TgEK3+M76pUscEMZkfmaDp3veb7x7sC+2GZ7UXYq7IdAJeBri3KZNvEcrbx8KQnhwcLiPxggSjFdc96Ui11O0N5vyk4k3YZbQGXmU56qbtN03x6Nv+bV7dH+STXS1l9devCQwFyuQQaf23mPDbWW+rD7dYinvv00inuHu0425dJu39Jm1vmT5J1B0/nq+h/NiuMex8ar2rxlhWW+v0DksQlUpU11wIzWNf58DtGl7X3CUJauhtrjJeMuVJr1nxXB4pR4bK2HpDsgPe6Ki/+47BHj2/4ePY5VvifbUA9m/bjnVMyF/yqmKecsx12qRd4XOdwK3kGrAX1tcp4vbzZZRxLDmiruPAZCnGT9cGlTOxsorbtQSnO8cgxf57isirzuuG9ScKv3qv8b/2xpPl7WijzDsNgzl2/f7TwAAAP//AQAA//9K639RtA0AAA==" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml

2
tests/integration/update_cluster/compress/data/aws_launch_template_nodes.compress.example.com_user_data
View File

@ -128,7 +128,7 @@ function download-release() {
echo "== nodeup node config starting =="
ensure-install-dir
echo "H4sIAAAAAAAA/6RUW2vbMBR+9684FEpfOtkOXdlECxsJo4W1C+njKEOxTlwRWcc9ktwF9uOHlFuTwdjFL7a+c//OJzeWoh6TW5hWFgCdcqrFh0CsWhxb5T16CYEjFg25oIxDnkUXTIcSdojeG3XK0uR8XwZkNhol/CgAAAZkb8jBNYyKDHztbWyN84/r4x4QJ4bEPqVouW/EUIuGzcnO+c/cX+GvIv86VvB6aH+Q5N/TpI/m8SAVwMb4Lax6hGs4SpkixDA6KY6i/qsFQX0wlFYAR8/Dygfs9Lhlij1crzUAYKn9jANaCcYtqNhtVUItLsRloalZIicR+KXpb50PytqNgpZxjlOm76usERt9QB7fTmYS6qoS7y9FJaqyrpOxjzN8juhDtnUFwBP54FSHe1WdfVAv/qwAMJ1qUcLynRdtw8JQmSq96XOpoRajWlQHrY9yKxZDakQ5cquOov8Yw5OEhbI+DdrkwSdsBmQJfs3GDp8RBQllnoOinjINRidH9eL3w03uH9azXV6IStTVKwt1yji5PQpLjbIFADo1tzjBeWxb49ob5bRF3l5BABxMkxZ2o1hL6LAjXgk1KGNT3FVdVXfm3JHGhT+AT7egSW//iRGv3p6eZ+Z+cd2iB76/X0Hic33rpyqxWA6KS2vm5Ybocu9wtAkAh+GFeDnNMr5X+c/iTDKQu1P+OSIrjXuhZDKrMtPZk75TzizQh01hDE0uxg4D+rLbWH3xEwAA//8BAAD//zoJ6qHqBAAA" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/6RUbWvbMBD+7l9xFEq/dLIdurKZFrYlGy2sXUg+jjIU66KKyDpXL84C+/FDchInGYy9+Iut5950zz3nWlMQYzJLJasMgK/dxw/z8fx+YlWHNkIAaPhCo6hgybXDDKDhhkuce7Jc4lhz59BV4G3ArCbjuTJoZ8F41WAFe0QMRhET16nqlw6tVQIr+JGKdWidIgO3MMoS8LXVQSrjnvrjALAzRWxIyaRta9aVrLbqbO/8Z+4H+EHkX8cy2zftjpL8e5r4UT8dpQLYGr/5TYtwCycpYwTrRmfZSdR/XYFR6xXFEcDJM984j40YS0uhhdteAwCa5GfsUFegzJKy/VQrKNkVu84E1ateXW6l2nvjPNd6q6BVWODU0vdN0ogOzqMd309mFZRFwd5es4IVeVlGYxtm+BLQ+WRrMoBnct7wBgdVXbzja3eRAaiGS6xg9cYxWVumKI+VXrWpVFeyUcmKo6uP0lU0+rQYhsymoeDeB/88bEKdGt8uC7iejT0+I/IV5KkPCmJqqVMiOvK1G5qbPM773q6vWMHK4sBCDVem2h2ZpprrbLeQE1wEKZWRd9wIjXa3ggDYqToO7I5bUUGDDdkN4x1XOsbdlEXxoC4NCVy6I/h8B6r4dp8s4s3r88vE3C+uO/TI9/cjiHz2Wz/lkcW84zbXapFvic4Hh5NJABj0a7KraZLxI09/FqOigcwDdy8BLRc4CCWRWeSJzpbEAzdqic5vC6OvUzFr0KPLm63VZT8BAAD//wEAAP//hSaFDxAFAAA=" | base64 -d | gzip -d > conf/cluster_spec.yaml
echo "H4sIAAAAAAAA/6qu5QIAAAD//wEAAP//BrCh3QMAAAA=" | base64 -d | gzip -d > conf/ig_spec.yaml

20
tests/integration/update_cluster/containerd-custom/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n\n [plugins.\"io.containerd.grpc.v1.cri\".registry]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors]\n\n [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"*\"]\n
\ endpoint = [\"http://HostIP2:Port2\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"docker.io\"]\n
@ -147,11 +147,11 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n\n [plugins.\"io.containerd.grpc.v1.cri\".registry]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors]\n\n [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"*\"]\n
\ endpoint = [\"http://HostIP2:Port2\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"docker.io\"]\n

20
tests/integration/update_cluster/containerd/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amasterscontainerdexamplecom.Properti
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatenodescontainerdexamplecom.Properties.LaunchTemplat
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

38
tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
View File

@ -36,15 +36,15 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: docker\ncontainerd:\n configOverride:
|\n disabled_plugins = [\"cri\"]\n logLevel: info\ndocker:\n execOpt:\n -
native.cgroupdriver=systemd\n ipMasq: false\n ipTables: false\n logDriver: json-file\n
\ logLevel: info\n logOpt:\n - max-size=10m\n - max-file=5\n packages:\n hashAmd64:
000000000000000000000000000000000000000000000000000000000000000a\n hashArm64:
000000000000000000000000000000000000000000000000000000000000000b\n urlAmd64:
https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz\n urlArm64:
https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz\n storage:
overlay2,overlay,aufs\n version: 20.10.5\nencryptionConfig: null\netcdClusters:\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
docker\ncontainerd:\n configOverride: |\n disabled_plugins = [\"cri\"]\n logLevel:
info\ndocker:\n execOpt:\n - native.cgroupdriver=systemd\n ipMasq: false\n ipTables:
false\n logDriver: json-file\n logLevel: info\n logOpt:\n - max-size=10m\n -
max-file=5\n packages:\n hashAmd64: 000000000000000000000000000000000000000000000000000000000000000a\n
\ hashArm64: 000000000000000000000000000000000000000000000000000000000000000b\n
\ urlAmd64: https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz\n
\ urlArm64: https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz\n
\ storage: overlay2,overlay,aufs\n version: 20.10.5\nencryptionConfig: null\netcdClusters:\n
\ events:\n version: 3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged:
true\n anonymousAuth: false\n apiAudiences:\n - kubernetes.svc.default\n apiServerCount:
1\n authorizationMode: AlwaysAllow\n bindAddress: 0.0.0.0\n cloudProvider: aws\n
@ -144,16 +144,16 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: docker\ncontainerd:\n configOverride:
|\n disabled_plugins = [\"cri\"]\n logLevel: info\ndocker:\n execOpt:\n -
native.cgroupdriver=systemd\n ipMasq: false\n ipTables: false\n logDriver: json-file\n
\ logLevel: info\n logOpt:\n - max-size=10m\n - max-file=5\n packages:\n hashAmd64:
000000000000000000000000000000000000000000000000000000000000000a\n hashArm64:
000000000000000000000000000000000000000000000000000000000000000b\n urlAmd64:
https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz\n urlArm64:
https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz\n storage:
overlay2,overlay,aufs\n version: 20.10.5\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n
\ cpuRequest: 100m\n hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
docker\ncontainerd:\n configOverride: |\n disabled_plugins = [\"cri\"]\n logLevel:
info\ndocker:\n execOpt:\n - native.cgroupdriver=systemd\n ipMasq: false\n ipTables:
false\n logDriver: json-file\n logLevel: info\n logOpt:\n - max-size=10m\n -
max-file=5\n packages:\n hashAmd64: 000000000000000000000000000000000000000000000000000000000000000a\n
\ hashArm64: 000000000000000000000000000000000000000000000000000000000000000b\n
\ urlAmd64: https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz\n
\ urlArm64: https://download.docker.com/linux/static/stable/aarch64/docker-20.10.1.tgz\n
\ storage: overlay2,overlay,aufs\n version: 20.10.5\nkubeProxy:\n clusterCIDR:
100.96.0.0/11\n cpuRequest: 100m\n hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n
\ logLevel: 2\nkubelet:\n anonymousAuth: false\n cgroupDriver: systemd\n cgroupRoot:
/\n cloudProvider: aws\n clusterDNS: 100.64.0.10\n clusterDomain: cluster.local\n
\ enableDebuggingHandlers: true\n evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%\n

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1a.masters.existing-iam.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1b.masters.existing-iam.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_master-us-test-1c.masters.existing-iam.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_iam/data/aws_launch_template_nodes.existing-iam.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/existing_iam_cloudformation/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -140,11 +140,11 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1a.masters.existingsg.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1b.masters.existingsg.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_master-us-test-1c.masters.existingsg.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/existing_sg/data/aws_launch_template_nodes.existingsg.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/externallb/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersexternallbexamplecom.Properti
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatenodesexternallbexamplecom.Properties.LaunchTemplat
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/externallb/data/aws_launch_template_master-us-test-1a.masters.externallb.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externallb/data/aws_launch_template_nodes.externallb.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externalpolicies/data/aws_launch_template_master-us-test-1a.masters.externalpolicies.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/externalpolicies/data/aws_launch_template_nodes.externalpolicies.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1a.masters.ha.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1b.masters.ha.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_master-us-test-1c.masters.ha.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha/data/aws_launch_template_nodes.ha.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/irsa/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/irsa/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/minimal-etcd/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimaletcdexamplecom.Propert
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n etcdMembers:\n
\ - name: us-test-1a\n volumeSize: 20\n manager:\n env:\n -
@ -146,11 +146,11 @@ Resources.AWSEC2LaunchTemplatenodesminimaletcdexamplecom.Properties.LaunchTempla
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

20
tests/integration/update_cluster/minimal-gp3/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n etcdMembers:\n
\ - name: us-test-1a\n volumeSize: 20\n version: 3.4.13\n main:\n etcdMembers:\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-gp3/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/minimal-ipv6/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalipv6examplecom.Propert
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatenodesminimalipv6examplecom.Properties.LaunchTempla
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_master-us-test-1a.masters.minimal-ipv6.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-ipv6/data/aws_launch_template_nodes.minimal-ipv6.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-json/data/aws_launch_template_master-us-test-1a.masters.minimal-json.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal-json/data/aws_launch_template_nodes.minimal-json.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/minimal/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties.
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -140,11 +140,11 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/minimal/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_master-us-test1-a-minimal-gce-private-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/minimal_gce_private/data/google_compute_instance_template_nodes-minimal-gce-private-example-com_metadata_startup-script
View File

@ -120,6 +120,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
gceServiceAccount: default
manageStorageClasses: true
multizone: true

2
tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_master-us-test-1a.masters.minimal.k8s.local_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/minimal_gossip/data/aws_launch_template_nodes.minimal.k8s.local_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

40
tests/integration/update_cluster/mixed_instances/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -246,11 +246,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -351,11 +351,11 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/mixed_instances/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/mixed_instances/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

40
tests/integration/update_cluster/mixed_instances_spot/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersmixedinstancesexamplecom.Prop
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1bmastersmixedinstancesexamplecom.Prop
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -246,11 +246,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1cmastersmixedinstancesexamplecom.Prop
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -351,11 +351,11 @@ Resources.AWSEC2LaunchTemplatenodesmixedinstancesexamplecom.Properties.LaunchTem
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1a.masters.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1b.masters.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_master-us-test-1c.masters.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/mixed_instances_spot/data/aws_launch_template_nodes.mixedinstances.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/nth_sqs_resources/cloudformation.json.extracted.yaml
View File

@ -36,11 +36,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersnthsqsresourcesexamplecom.Pro
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -141,11 +141,11 @@ Resources.AWSEC2LaunchTemplatenodesnthsqsresourcesexamplecom.Properties.LaunchTe
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.20.0\n logLevel:

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_master-us-test-1a.masters.nthsqsresources.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/nth_sqs_resources/data/aws_launch_template_nodes.nthsqsresources.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/private-shared-ip/cloudformation.json.extracted.yaml
View File

@ -37,11 +37,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatesharedipexamplecom.Pro
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -142,11 +142,11 @@ Resources.AWSEC2LaunchTemplatenodesprivatesharedipexamplecom.Properties.LaunchTe
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_master-us-test-1a.masters.private-shared-ip.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/private-shared-ip/data/aws_launch_template_nodes.private-shared-ip.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_master-us-test-1a.masters.private-shared-subnet.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/private-shared-subnet/data/aws_launch_template_nodes.private-shared-subnet.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml
View File

@ -37,11 +37,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -142,11 +142,11 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatecanal/data/aws_launch_template_master-us-test-1a.masters.privatecanal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatecanal/data/aws_launch_template_nodes.privatecanal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

20
tests/integration/update_cluster/privatecilium/cloudformation.json.extracted.yaml
View File

@ -37,11 +37,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n allowPrivileged: true\n
@ -142,11 +142,11 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n logLevel:

2
tests/integration/update_cluster/privatecilium/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatecilium/data/aws_launch_template_nodes.privatecilium.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

68
tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml
View File

@ -37,31 +37,32 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: docker\ncontainerd:\n configOverride:
|\n disabled_plugins = [\"cri\"]\n logLevel: info\ndocker:\n ipMasq: false\n
\ ipTables: false\n logDriver: json-file\n logLevel: info\n logOpt:\n - max-size=10m\n
\ - max-file=5\n storage: overlay2,overlay,aufs\n version: 19.03.15\nencryptionConfig:
null\netcdClusters:\n events:\n version: 3.4.3\n main:\n version: 3.4.3\nkubeAPIServer:\n
\ allowPrivileged: true\n anonymousAuth: false\n apiServerCount: 1\n authorizationMode:
AlwaysAllow\n bindAddress: 0.0.0.0\n cloudProvider: aws\n enableAdmissionPlugins:\n
\ - NamespaceLifecycle\n - LimitRanger\n - ServiceAccount\n - PersistentVolumeLabel\n
\ - DefaultStorageClass\n - DefaultTolerationSeconds\n - MutatingAdmissionWebhook\n
\ - ValidatingAdmissionWebhook\n - NodeRestriction\n - ResourceQuota\n etcdServers:\n
\ - https://127.0.0.1:4001\n etcdServersOverrides:\n - /events#https://127.0.0.1:4002\n
\ image: k8s.gcr.io/kube-apiserver:v1.17.15\n kubeletPreferredAddressTypes:\n -
InternalIP\n - Hostname\n - ExternalIP\n logLevel: 2\n requestheaderAllowedNames:\n
\ - aggregator\n requestheaderExtraHeaderPrefixes:\n - X-Remote-Extra-\n requestheaderGroupHeaders:\n
\ - X-Remote-Group\n requestheaderUsernameHeaders:\n - X-Remote-User\n securePort:
443\n serviceClusterIPRange: 100.64.0.0/13\n storageBackend: etcd3\nkubeControllerManager:\n
\ allocateNodeCIDRs: true\n attachDetachReconcileSyncPeriod: 1m0s\n cloudProvider:
aws\n clusterCIDR: 100.96.0.0/11\n clusterName: privatecilium.example.com\n configureCloudRoutes:
false\n image: k8s.gcr.io/kube-controller-manager:v1.17.15\n leaderElection:\n
\ leaderElect: true\n logLevel: 2\n useServiceAccountCredentials: true\nkubeProxy:\n
\ clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n hostnameOverride: '@aws'\n image:
k8s.gcr.io/kube-proxy:v1.17.15\n logLevel: 2\nkubeScheduler:\n image: k8s.gcr.io/kube-scheduler:v1.17.15\n
\ leaderElection:\n leaderElect: true\n logLevel: 2\nkubelet:\n anonymousAuth:
false\n cgroupRoot: /\n cloudProvider: aws\n clusterDNS: 100.64.0.10\n clusterDomain:
cluster.local\n enableDebuggingHandlers: true\n evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
docker\ncontainerd:\n configOverride: |\n disabled_plugins = [\"cri\"]\n logLevel:
info\ndocker:\n ipMasq: false\n ipTables: false\n logDriver: json-file\n logLevel:
info\n logOpt:\n - max-size=10m\n - max-file=5\n storage: overlay2,overlay,aufs\n
\ version: 19.03.15\nencryptionConfig: null\netcdClusters:\n events:\n version:
3.4.3\n main:\n version: 3.4.3\nkubeAPIServer:\n allowPrivileged: true\n anonymousAuth:
false\n apiServerCount: 1\n authorizationMode: AlwaysAllow\n bindAddress: 0.0.0.0\n
\ cloudProvider: aws\n enableAdmissionPlugins:\n - NamespaceLifecycle\n - LimitRanger\n
\ - ServiceAccount\n - PersistentVolumeLabel\n - DefaultStorageClass\n - DefaultTolerationSeconds\n
\ - MutatingAdmissionWebhook\n - ValidatingAdmissionWebhook\n - NodeRestriction\n
\ - ResourceQuota\n etcdServers:\n - https://127.0.0.1:4001\n etcdServersOverrides:\n
\ - /events#https://127.0.0.1:4002\n image: k8s.gcr.io/kube-apiserver:v1.17.15\n
\ kubeletPreferredAddressTypes:\n - InternalIP\n - Hostname\n - ExternalIP\n
\ logLevel: 2\n requestheaderAllowedNames:\n - aggregator\n requestheaderExtraHeaderPrefixes:\n
\ - X-Remote-Extra-\n requestheaderGroupHeaders:\n - X-Remote-Group\n requestheaderUsernameHeaders:\n
\ - X-Remote-User\n securePort: 443\n serviceClusterIPRange: 100.64.0.0/13\n storageBackend:
etcd3\nkubeControllerManager:\n allocateNodeCIDRs: true\n attachDetachReconcileSyncPeriod:
1m0s\n cloudProvider: aws\n clusterCIDR: 100.96.0.0/11\n clusterName: privatecilium.example.com\n
\ configureCloudRoutes: false\n image: k8s.gcr.io/kube-controller-manager:v1.17.15\n
\ leaderElection:\n leaderElect: true\n logLevel: 2\n useServiceAccountCredentials:
true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n hostnameOverride:
'@aws'\n image: k8s.gcr.io/kube-proxy:v1.17.15\n logLevel: 2\nkubeScheduler:\n
\ image: k8s.gcr.io/kube-scheduler:v1.17.15\n leaderElection:\n leaderElect:
true\n logLevel: 2\nkubelet:\n anonymousAuth: false\n cgroupRoot: /\n cloudProvider:
aws\n clusterDNS: 100.64.0.10\n clusterDomain: cluster.local\n enableDebuggingHandlers:
true\n evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%\n
\ hostnameOverride: '@aws'\n kubeconfigPath: /var/lib/kubelet/kubeconfig\n logLevel:
2\n networkPluginName: cni\n nonMasqueradeCIDR: 100.64.0.0/10\n podInfraContainerImage:
k8s.gcr.io/pause:3.2\n podManifestPath: /etc/kubernetes/manifests\nmasterKubelet:\n
@ -137,14 +138,15 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: docker\ncontainerd:\n configOverride:
|\n disabled_plugins = [\"cri\"]\n logLevel: info\ndocker:\n ipMasq: false\n
\ ipTables: false\n logDriver: json-file\n logLevel: info\n logOpt:\n - max-size=10m\n
\ - max-file=5\n storage: overlay2,overlay,aufs\n version: 19.03.15\nkubeProxy:\n
\ clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n hostnameOverride: '@aws'\n image:
k8s.gcr.io/kube-proxy:v1.17.15\n logLevel: 2\nkubelet:\n anonymousAuth: false\n
\ cgroupRoot: /\n cloudProvider: aws\n clusterDNS: 100.64.0.10\n clusterDomain:
cluster.local\n enableDebuggingHandlers: true\n evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
docker\ncontainerd:\n configOverride: |\n disabled_plugins = [\"cri\"]\n logLevel:
info\ndocker:\n ipMasq: false\n ipTables: false\n logDriver: json-file\n logLevel:
info\n logOpt:\n - max-size=10m\n - max-file=5\n storage: overlay2,overlay,aufs\n
\ version: 19.03.15\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.17.15\n logLevel:
2\nkubelet:\n anonymousAuth: false\n cgroupRoot: /\n cloudProvider: aws\n clusterDNS:
100.64.0.10\n clusterDomain: cluster.local\n enableDebuggingHandlers: true\n evictionHard:
memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%\n
\ hostnameOverride: '@aws'\n kubeconfigPath: /var/lib/kubelet/kubeconfig\n logLevel:
2\n networkPluginName: cni\n nonMasqueradeCIDR: 100.64.0.0/10\n podInfraContainerImage:
k8s.gcr.io/pause:3.2\n podManifestPath: /etc/kubernetes/manifests\n\n__EOF_CLUSTER_SPEC\n\ncat

2
tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: docker
containerd:

2
tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: docker
containerd:

20
tests/integration/update_cluster/privateciliumadvanced/cloudformation.json.extracted.yaml
View File

@ -37,11 +37,11 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumadvancedexamplec
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nencryptionConfig: null\netcdClusters:\n cilium:\n version:
3.4.13\n events:\n version: 3.4.13\n main:\n version: 3.4.13\nkubeAPIServer:\n
@ -143,11 +143,11 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumadvancedexamplecom.Properties.La
--v=8 )\n}\n\n####################################################################################\n\n/bin/systemd-machine-id-setup
|| echo \"failed to set up ensure machine-id configured\"\n\necho \"== nodeup node
config starting ==\"\nensure-install-dir\n\ncat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'\ncloudConfig:\n
\ manageStorageClasses: true\ncontainerRuntime: containerd\ncontainerd:\n configOverride:
|\n version = 2\n\n [plugins]\n\n [plugins.\"io.containerd.grpc.v1.cri\"]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n runtime_type
= \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ awsEBSCSIDriver:\n enabled: false\n manageStorageClasses: true\ncontainerRuntime:
containerd\ncontainerd:\n configOverride: |\n version = 2\n\n [plugins]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\"]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd]\n\n
\ [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes]\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc]\n
\ runtime_type = \"io.containerd.runc.v2\"\n\n [plugins.\"io.containerd.grpc.v1.cri\".containerd.runtimes.runc.options]\n
\ SystemdCgroup = true\n logLevel: info\n version: 1.4.6\ndocker:\n
\ skipInstall: true\nkubeProxy:\n clusterCIDR: 100.96.0.0/11\n cpuRequest: 100m\n
\ enabled: false\n hostnameOverride: '@aws'\n image: k8s.gcr.io/kube-proxy:v1.21.0\n

2
tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_master-us-test-1a.masters.privateciliumadvanced.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privateciliumadvanced/data/aws_launch_template_nodes.privateciliumadvanced.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatedns1/data/aws_launch_template_master-us-test-1a.masters.privatedns1.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatedns1/data/aws_launch_template_nodes.privatedns1.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatedns2/data/aws_launch_template_master-us-test-1a.masters.privatedns2.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatedns2/data/aws_launch_template_nodes.privatedns2.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privateflannel/data/aws_launch_template_master-us-test-1a.masters.privateflannel.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privateflannel/data/aws_launch_template_nodes.privateflannel.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatekopeio/data/aws_launch_template_master-us-test-1a.masters.privatekopeio.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privatekopeio/data/aws_launch_template_nodes.privatekopeio.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privateweave/data/aws_launch_template_master-us-test-1a.masters.privateweave.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/privateweave/data/aws_launch_template_nodes.privateweave.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: containerd
containerd:

2
tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -121,6 +121,8 @@ ensure-install-dir
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig:
awsEBSCSIDriver:
enabled: false
manageStorageClasses: true
containerRuntime: docker
containerd:

Some files were not shown because too many files have changed in this diff Show More