Skip to content

Commit

Permalink
Merge pull request #15074 from hakman/automated-cherry-pick-of-#15072…
Browse files Browse the repository at this point in the history 
…-upstream-release-1.25

Automated cherry pick of #15072: Update containerd to v1.6.16
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Jan 29, 2023
2 parents 8759531 + 3d3b289 commit 66fae42
Show file tree
Hide file tree
Showing 116 changed files with 255 additions and 253 deletions.
2 changes: 1 addition & 1 deletion pkg/model/components/containerd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
// Set version based on Kubernetes version
if fi.ValueOf(containerd.Version) == "" {
if b.IsKubernetesGTE("1.23") {
containerd.Version = fi.PtrTo("1.6.15")
containerd.Version = fi.PtrTo("1.6.16")
containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.1.4"),
}
Expand Down
4 changes: 2 additions & 2 deletions ...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 @@ -133,7 +133,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
encryptionConfig: null
Expand Down Expand Up @@ -269,7 +269,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: vfReOa+s+upRXcIo3dvChVr0RcyoHyBlkFbkOFfgRho=
NodeupConfigHash: Hi2HUBLh5IsF3IqyGIs/m1hiJ3xAzAoNMiKEkdpL7YE=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions .../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 @@ -133,7 +133,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
kubeProxy:
Expand Down Expand Up @@ -169,7 +169,7 @@ CloudProvider: aws
ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: 7RwyNoWQq7FywJKdfIwBOwy4DJWev+7lhNX3gKGKxoA=
NodeupConfigHash: xiofjJFfLE544AEVNXubVUCvN+h2nSR/xVLddwECbaE=
__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -23,7 +23,7 @@ spec:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
dnsZone: Z1AFAKE1ZON3YO
docker:
skipInstall: true
Expand Down
6 changes: 3 additions & 3 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 @@ -58,15 +58,15 @@ Assets:
- 4756ff345dd80704b749d87efb8eb294a143a1f4a251ec586197d26ad20ea518@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubelet
- 2d0f5ba6faa787878b642c151ccb2c3390ce4c1e6c8e2b59568b3869ba407c4f@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
- 191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz
- 2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-amd64.tar.gz
- db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/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:
- a546fb7ccce69c4163e4a0b19a31f30ea039b4e4560c23fd6e3016e2b2dfd0d9@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/arm64/kubelet
- 1d77d6027fc8dfed772609ad9bd68f611b7e4ce73afa949f27084ad3a92b15fe@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
- d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-arm64.tar.gz
- c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-arm64.tar.gz
- dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/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
Expand Down Expand Up @@ -279,7 +279,7 @@ containerdConfig:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
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
6 changes: 3 additions & 3 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 @@ -3,13 +3,13 @@ Assets:
- 4756ff345dd80704b749d87efb8eb294a143a1f4a251ec586197d26ad20ea518@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubelet
- 2d0f5ba6faa787878b642c151ccb2c3390ce4c1e6c8e2b59568b3869ba407c4f@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
- 191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz
- 2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-amd64.tar.gz
- db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
arm64:
- a546fb7ccce69c4163e4a0b19a31f30ea039b4e4560c23fd6e3016e2b2dfd0d9@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/arm64/kubelet
- 1d77d6027fc8dfed772609ad9bd68f611b7e4ce73afa949f27084ad3a92b15fe@https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
- d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-arm64.tar.gz
- c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-arm64.tar.gz
- dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64
CAs:
kubernetes-ca: |
Expand Down Expand Up @@ -70,4 +70,4 @@ containerdConfig:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
4 changes: 2 additions & 2 deletions .../complex/data/aws_launch_template_master-us-test-1a.masters.complex.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
encryptionConfig: null
Expand Down Expand Up @@ -277,7 +277,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/complex.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: /5my+Uaf2PT+Kvr3o0nGmIkd6Va1+i3UoyLe9SBFOG4=
NodeupConfigHash: 3VHeUZYCJz3cQpS3SGhb7De1dOOVBhGmLxPNfGHRGFw=

__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...ation/update_cluster/complex/data/aws_launch_template_nodes.complex.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
kubeProxy:
Expand Down Expand Up @@ -177,7 +177,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/complex.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: cHugAD0dPp7pSElroEYgLXZqPdyjPbn+7NGIQ1iG5Dk=
NodeupConfigHash: TUon7+ekx9yvClC0hK+HDbRUJ3N0VDnXO7W33oOz8uM=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
dnsZone: Z1AFAKE1ZON3YO
docker:
skipInstall: true
Expand Down
6 changes: 3 additions & 3 deletions ...egration/update_cluster/complex/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ Assets:
- 3d98ac8b4fb8dc99f9952226f2565951cc366c442656a889facc5b1b2ec2ba52@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/amd64/kubelet
- 94d686bb6772f6fb59e3a32beff908ab406b79acdfb2427abdc4ac3ce1bb98d7@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
- 191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz
- 2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-amd64.tar.gz
- db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/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:
- 8f066c9a048dd1704bf22ccf6e994e2fa2ea1175c9768a786f6cb6608765025e@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/arm64/kubelet
- 449278789de283648e4076ade46816da249714f96e71567e035e9d17e1fff06d@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
- d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-arm64.tar.gz
- c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-arm64.tar.gz
- dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/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
Expand Down Expand Up @@ -279,7 +279,7 @@ containerdConfig:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
etcdManifests:
- memfs://clusters.example.com/complex.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/complex.example.com/manifests/etcd/events-master-us-test-1a.yaml
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/update_cluster/complex/data/aws_s3_object_nodeupconfig-nodes_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Assets:
- 3d98ac8b4fb8dc99f9952226f2565951cc366c442656a889facc5b1b2ec2ba52@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/amd64/kubelet
- 94d686bb6772f6fb59e3a32beff908ab406b79acdfb2427abdc4ac3ce1bb98d7@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
- 191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz
- 2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-amd64.tar.gz
- db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
arm64:
- 8f066c9a048dd1704bf22ccf6e994e2fa2ea1175c9768a786f6cb6608765025e@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/arm64/kubelet
- 449278789de283648e4076ade46816da249714f96e71567e035e9d17e1fff06d@https://storage.googleapis.com/kubernetes-release/release/v1.24.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
- d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-arm64.tar.gz
- c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-arm64.tar.gz
- dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64
CAs:
kubernetes-ca: |
Expand Down Expand Up @@ -67,7 +67,7 @@ containerdConfig:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
packages:
- nfs-common
useInstanceIDForNodeName: true
4 changes: 2 additions & 2 deletions .../karpenter/data/aws_launch_template_karpenter-nodes-default.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
kubeProxy:
Expand Down Expand Up @@ -168,7 +168,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: karpenter-nodes-default
InstanceGroupRole: Node
NodeupConfigHash: jD+W8GSR/U9SVxOXlB5dzZSTNZMBVfFR9APnFPMF14U=
NodeupConfigHash: atlu1Za2fdE/eyVDyvs+qUak978lyvu0bQCpP5r1uWI=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...data/aws_launch_template_karpenter-nodes-single-machinetype.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
kubeProxy:
Expand Down Expand Up @@ -168,7 +168,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: karpenter-nodes-single-machinetype
InstanceGroupRole: Node
NodeupConfigHash: Bd48IcNKavvW/CfaT9Coibd4Mvqd3x9mDl+AlDfePE8=
NodeupConfigHash: gJruAX7fL0jZXHYpI2axS1ehVwI9qfwiEmWmER00YzI=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...arpenter/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 @@ -133,7 +133,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
encryptionConfig: null
Expand Down Expand Up @@ -262,7 +262,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: TEfNxqwi3AV/gm2Z2N0Vviyi5nOjch1gg6LkH0avqlk=
NodeupConfigHash: KqtmHAyb5QEqrZdnlRO/5edLJUK0mO1U63FUcbY+VPA=
__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...ion/update_cluster/karpenter/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ containerd:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
docker:
skipInstall: true
kubeProxy:
Expand Down Expand Up @@ -168,7 +168,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: uiGRFbDm0e380ykAE0fMWlxTiYL59TUZ8sWu9wCKLT8=
NodeupConfigHash: ZEB65c9hKRxrX+scdhGcwAV8m/ES8wvSY+S+m2CSPj8=
__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
dnsZone: Z1AFAKE1ZON3YO
docker:
skipInstall: true
Expand Down
6 changes: 3 additions & 3 deletions .../update_cluster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-default_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Assets:
- 7f9183fce12606818612ce80b6c09757452c4fb50aefea5fc5843951c5020e24@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/amd64/kubelet
- e23cc7092218c95c22d8ee36fb9499194a36ac5b5349ca476886b7edc0203885@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
- 191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz
- 2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-amd64.tar.gz
- db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
arm64:
- 69572a7b3d179d4a479aa2e0f90e2f091d8d84ef33a35422fc89975dc137a590@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/arm64/kubelet
- 24db547bbae294c5c44f2b4a777e45f0e2f3d6295eace0d0c4be2b2dfa45330d@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
- d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-arm64.tar.gz
- c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-arm64.tar.gz
- dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64
CAs:
kubernetes-ca: |
Expand Down Expand Up @@ -75,5 +75,5 @@ containerdConfig:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
useInstanceIDForNodeName: true
6 changes: 3 additions & 3 deletions ...ster/karpenter/data/aws_s3_object_nodeupconfig-karpenter-nodes-single-machinetype_content
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Assets:
- 7f9183fce12606818612ce80b6c09757452c4fb50aefea5fc5843951c5020e24@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/amd64/kubelet
- e23cc7092218c95c22d8ee36fb9499194a36ac5b5349ca476886b7edc0203885@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/amd64/kubectl
- 962100bbc4baeaaa5748cdbfce941f756b1531c2eadb290129401498bfac21e7@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-amd64-v0.9.1.tgz
- 191bb4f6e4afc237efc5c85b5866b6fdfed731bde12cceaa6017a9c7f8aeda02@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-amd64.tar.gz
- 2415b431a900275c14942f87f751e1e13d513c1c2f062322b5ca5a9a2190f22a@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-amd64.tar.gz
- db772be63147a4e747b4fe286c7c16a2edc4a8458bd3092ea46aaee77750e8ce@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.amd64
arm64:
- 69572a7b3d179d4a479aa2e0f90e2f091d8d84ef33a35422fc89975dc137a590@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/arm64/kubelet
- 24db547bbae294c5c44f2b4a777e45f0e2f3d6295eace0d0c4be2b2dfa45330d@https://storage.googleapis.com/kubernetes-release/release/v1.25.0/bin/linux/arm64/kubectl
- ef17764ffd6cdcb16d76401bac1db6acc050c9b088f1be5efa0e094ea3b01df0@https://storage.googleapis.com/k8s-artifacts-cni/release/v0.9.1/cni-plugins-linux-arm64-v0.9.1.tgz
- d63e4d27c51e33cd10f8b5621c559f09ece8a65fec66d80551b36cac9e61a07d@https://github.com/containerd/containerd/releases/download/v1.6.15/containerd-1.6.15-linux-arm64.tar.gz
- c2bf51fde02ec9cf8b9c18721bc4f53bd1f19fb2bb3251f41ece61af7347e082@https://github.com/containerd/containerd/releases/download/v1.6.16/containerd-1.6.16-linux-arm64.tar.gz
- dbb71e737eaef454a406ce21fd021bd8f1b35afb7635016745992bbd7c17a223@https://github.com/opencontainers/runc/releases/download/v1.1.4/runc.arm64
CAs:
kubernetes-ca: |
Expand Down Expand Up @@ -68,5 +68,5 @@ containerdConfig:
logLevel: info
runc:
version: 1.1.4
version: 1.6.15
version: 1.6.16
useInstanceIDForNodeName: true
Loading

0 comments on commit 66fae42

Please sign in to comment.