Skip to content

Commit

Permalink
Merge pull request #16302 from zetaab/updaterunc
Browse files Browse the repository at this point in the history 
Update runc & containerd
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Feb 1, 2024
2 parents 6a1783b + 31b099f commit b8e3c43
Show file tree
Hide file tree
Showing 22 changed files with 70 additions and 68 deletions.
8 changes: 4 additions & 4 deletions pkg/model/components/containerd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
Version: fi.PtrTo("1.1.5"),
}
case b.IsKubernetesGTE("1.27.2"):
containerd.Version = fi.PtrTo("1.7.12")
containerd.Version = fi.PtrTo("1.7.13")
containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.11"),
Version: fi.PtrTo("1.1.12"),
}
default:
containerd.Version = fi.PtrTo("1.6.27")
containerd.Version = fi.PtrTo("1.6.28")
containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.11"),
Version: fi.PtrTo("1.1.12"),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ClusterName: additionalobjects.example.com
ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: 3x9YleCx3CP5RIWPHs/kzZYZUr/xTrw8qdfchscXp1c=
NodeupConfigHash: zySKKwcHaidV8Ru3Hs/eudM6UMbDfNzO5xQCh93AFZY=
__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion .../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ ConfigServer:
- https://kops-controller.internal.additionalobjects.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: GmgyTkTUc6WACVvaXMJidQYlfg3wvDWJpmmtGFfFGMY=
NodeupConfigHash: 9lqYl0XzYRLcuWa0VfANMs+K2eNMR2g0LtG9VPf1Qxo=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
containerd:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
Expand Down
12 changes: 6 additions & 6 deletions ...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ Assets:
- 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- 6a24d8b996533fa1b0d7348fe9813a78cd01fa16cff865a961ad0d556f5cd665@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-amd64.tar.gz
- 77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.amd64
- c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
- aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64:
- 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet
- f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 8a1b35a521d071a8828f63fe007a51e5b7ac863a1195f5dee32543b1a9d5f2b6@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-arm64.tar.gz
- 9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.arm64
- 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
- 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
- 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64
CAs:
Expand Down Expand Up @@ -319,8 +319,8 @@ configStore:
containerdConfig:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
etcdManifests:
- memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://tests/additionalobjects.example.com/manifests/etcd/events-master-us-test-1a.yaml
Expand Down
12 changes: 6 additions & 6 deletions ...ntegration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Assets:
- 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- 6a24d8b996533fa1b0d7348fe9813a78cd01fa16cff865a961ad0d556f5cd665@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-amd64.tar.gz
- 77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.amd64
- c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
- aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
arm64:
- 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet
- f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 8a1b35a521d071a8828f63fe007a51e5b7ac863a1195f5dee32543b1a9d5f2b6@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-arm64.tar.gz
- 9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.arm64
- 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
- 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
CAs: {}
ClusterName: additionalobjects.example.com
Hooks:
Expand Down Expand Up @@ -55,7 +55,7 @@ UpdatePolicy: automatic
containerdConfig:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
usesLegacyGossip: false
usesNoneDNS: false
2 changes: 1 addition & 1 deletion ...mal-1.27/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://tests/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: h7wAt/AcrlbbziCbh9+Z/TLcVBQU60qhQXd5ikcpkSI=
NodeupConfigHash: 8DRDnCTUUyE4xNcM3MG29sS2pTVJoBTPCAqa43CPgg0=
__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion .../update_cluster/minimal-1.27/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: SsvqUrKf0hotiOFp0i0cQSgZ07K0zPXKFLyJVcoUblA=
NodeupConfigHash: PUjajIvfNAkCPuL4IvsrLc2Yl5Ws9bbAgE8rFwlAYeo=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
containerd:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
Expand Down
12 changes: 6 additions & 6 deletions ...ion/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ Assets:
- 4f38ee903f35b300d3b005a9c6bfb9a46a57f92e89ae602ef9c129b91dc6c5a5@https://dl.k8s.io/release/v1.27.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.2/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- 6a24d8b996533fa1b0d7348fe9813a78cd01fa16cff865a961ad0d556f5cd665@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-amd64.tar.gz
- 77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.amd64
- c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
- aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64:
- 810cd9a611e9f084e57c9ee466e33c324b2228d4249ff38c2588a0cc3224f10d@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubelet
- 1b0966692e398efe71fe59f913eaec44ffd4468cc1acd00bf91c29fa8ff8f578@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 8a1b35a521d071a8828f63fe007a51e5b7ac863a1195f5dee32543b1a9d5f2b6@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-arm64.tar.gz
- 9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.arm64
- 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
- 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
- 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64
CAs:
Expand Down Expand Up @@ -317,8 +317,8 @@ configStore:
containerdConfig:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
etcdManifests:
- memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_nodeupconfig-nodes_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Assets:
- 4f38ee903f35b300d3b005a9c6bfb9a46a57f92e89ae602ef9c129b91dc6c5a5@https://dl.k8s.io/release/v1.27.2/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.27.2/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- 6a24d8b996533fa1b0d7348fe9813a78cd01fa16cff865a961ad0d556f5cd665@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-amd64.tar.gz
- 77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.amd64
- c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
- aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
arm64:
- 810cd9a611e9f084e57c9ee466e33c324b2228d4249ff38c2588a0cc3224f10d@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubelet
- 1b0966692e398efe71fe59f913eaec44ffd4468cc1acd00bf91c29fa8ff8f578@https://dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.27.2/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 8a1b35a521d071a8828f63fe007a51e5b7ac863a1195f5dee32543b1a9d5f2b6@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-arm64.tar.gz
- 9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.arm64
- 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
- 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
CAs: {}
ClusterName: minimal.example.com
Hooks:
Expand Down Expand Up @@ -55,7 +55,7 @@ UpdatePolicy: automatic
containerdConfig:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
usesLegacyGossip: false
usesNoneDNS: false
2 changes: 1 addition & 1 deletion ...mal-1.28/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://tests/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: tY5kfBben9XfetOtOP5aI8n+9gNaYtNnwun5LdZ2mLI=
NodeupConfigHash: RisoJl36ATo1Px3sFBZk1G/RHrGjobvvgJxV4ESLRNM=
__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion .../update_cluster/minimal-1.28/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: Kkf+v7Vz+BsRI40xWU4+LWSvUSbG3wccAXJE0ohYIb8=
NodeupConfigHash: yC6Wyu1NOPhHFAHkqpK3imqPHQvBRWCkmLTyk9xYd9s=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
containerd:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
Expand Down
12 changes: 6 additions & 6 deletions ...ion/update_cluster/minimal-1.28/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,17 @@ Assets:
- 4717660fd1466ec72d59000bb1d9f5cdc91fac31d491043ca62b34398e0799ce@https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl
- 5035d7814c95cd3cedbc5efb447ef25a4942ef05caab2159746d55ce1698c74a@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/amd64/ecr-credential-provider-linux-amd64
- f3a841324845ca6bf0d4091b4fc7f97e18a623172158b72fc3fdcdb9d42d2d37@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-amd64-v1.2.0.tgz
- 6a24d8b996533fa1b0d7348fe9813a78cd01fa16cff865a961ad0d556f5cd665@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-amd64.tar.gz
- 77ae134de014613c44d25e6310a57a219a7a91155cd47d069a0f22a2cad5caea@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.amd64
- c2371c009dd8b7738663333d91e5ab50d204f8bcae24201f45d59060d12c3a23@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-amd64.tar.gz
- aadeef400b8f05645768c1476d1023f7875b78f52c7ff1967a6dbce236b8cbd8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.amd64
- f90ed6dcef534e6d1ae17907dc7eb40614b8945ad4af7f0e98d2be7cde8165c6@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-amd64
- 9992e7eb2a2e93f799e5a9e98eb718637433524bc65f630357201a79f49b13d0@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-amd64
arm64:
- 05dd12e35783cab4960e885ec0e7d0e461989b94297e7bea9018ccbd15c4dce9@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubelet
- f5484bd9cac66b183c653abed30226b561f537d15346c605cc81d98095f1717c@https://dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.28.0/bin/linux/arm64/kubectl
- b3d567bda9e2996fc1fbd9d13506bd16763d3865b5c7b0b3c4b48c6088c04481@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.27.1/linux/arm64/ecr-credential-provider-linux-arm64
- 525e2b62ba92a1b6f3dc9612449a84aa61652e680f7ebf4eff579795fe464b57@https://storage.googleapis.com/k8s-artifacts-cni/release/v1.2.0/cni-plugins-linux-arm64-v1.2.0.tgz
- 8a1b35a521d071a8828f63fe007a51e5b7ac863a1195f5dee32543b1a9d5f2b6@https://github.com/containerd/containerd/releases/download/v1.7.12/containerd-1.7.12-linux-arm64.tar.gz
- 9f1ee53f06b78cc4a115ca6ae4eec10567999539ce828a22c5351edba043ed12@https://github.com/opencontainers/runc/releases/download/v1.1.11/runc.arm64
- 118759e398f35337109592b4d237538872dc12a207d38832b9d04515d0acbc4d@https://github.com/containerd/containerd/releases/download/v1.7.13/containerd-1.7.13-linux-arm64.tar.gz
- 879f910a05c95c10c64ad8eb7d5e3aa8e4b30e65587b3d68e009a3565aed5bb8@https://github.com/opencontainers/runc/releases/download/v1.1.12/runc.arm64
- 2f599c3d54f4c4bdbcc95aaf0c7b513a845d8f9503ec5b34c9f86aa1bc34fc0c@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/protokube-linux-arm64
- 9d842e3636a95de2315cdea2be7a282355aac0658ef0b86d5dc2449066538f13@https://artifacts.k8s.io/binaries/kops/1.21.0-alpha.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.21.0-alpha.1/channels-linux-arm64
CAs:
Expand Down Expand Up @@ -317,8 +317,8 @@ configStore:
containerdConfig:
logLevel: info
runc:
version: 1.1.11
version: 1.7.12
version: 1.1.12
version: 1.7.13
etcdManifests:
- memfs://tests/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://tests/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
Expand Down
Loading

0 comments on commit b8e3c43

Please sign in to comment.