diff --git a/pkg/apis/kops/containerdconfig.go b/pkg/apis/kops/containerdconfig.go index b4eb05ec6a..210f9e8d6e 100644 --- a/pkg/apis/kops/containerdconfig.go +++ b/pkg/apis/kops/containerdconfig.go @@ -17,7 +17,7 @@ limitations under the License. package kops // NvidiaDefaultDriverPackage is the nvidia driver default version -const NvidiaDefaultDriverPackage = "nvidia-headless-510-server" +const NvidiaDefaultDriverPackage = "nvidia-headless-515-server" // ContainerdConfig is the configuration for containerd type ContainerdConfig struct { diff --git a/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml b/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml index 7c7f39d56d..206de9c4fa 100644 --- a/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml +++ b/tests/integration/update_cluster/nvidia/cloudformation.json.extracted.yaml @@ -133,7 +133,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13 docker: skipInstall: true @@ -248,7 +248,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersminimalexamplecom.Properties. ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master - NodeupConfigHash: ySOC5OHtRcUdQq7OxLK9rrP+57jmOXyoYBQBHnG27js= + NodeupConfigHash: UTcFpZYyeyuc2JFtx5w+OIhSqPJBpEXyiT91fArnWw8= __EOF_KUBE_ENV @@ -389,7 +389,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13 docker: skipInstall: true @@ -422,7 +422,7 @@ Resources.AWSEC2LaunchTemplatenodesminimalexamplecom.Properties.LaunchTemplateDa ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node - NodeupConfigHash: oJ2gP2GI0JmkePKVPaP8+ynFcX6hNDMzDcyKNpoFwQ8= + NodeupConfigHash: EAEwJUexP/I3DTt0PlHGNNMkB0rQ2nxp30KWEX24Ti8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data index 2c59624470..1d445ad268 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data @@ -132,7 +132,7 @@ containerd: logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13 docker: skipInstall: true @@ -247,7 +247,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: master-us-test-1a InstanceGroupRole: Master -NodeupConfigHash: ySOC5OHtRcUdQq7OxLK9rrP+57jmOXyoYBQBHnG27js= +NodeupConfigHash: UTcFpZYyeyuc2JFtx5w+OIhSqPJBpEXyiT91fArnWw8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data index 6d09a25f59..46c31c71e1 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data +++ b/tests/integration/update_cluster/nvidia/data/aws_launch_template_nodes.minimal.example.com_user_data @@ -132,7 +132,7 @@ containerd: logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13 docker: skipInstall: true @@ -165,7 +165,7 @@ CloudProvider: aws ConfigBase: memfs://clusters.example.com/minimal.example.com InstanceGroupName: nodes InstanceGroupRole: Node -NodeupConfigHash: oJ2gP2GI0JmkePKVPaP8+ynFcX6hNDMzDcyKNpoFwQ8= +NodeupConfigHash: EAEwJUexP/I3DTt0PlHGNNMkB0rQ2nxp30KWEX24Ti8= __EOF_KUBE_ENV diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index a81acc831e..e906041490 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -22,7 +22,7 @@ spec: logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13 dnsZone: Z1AFAKE1ZON3YO docker: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content index 418e745a9b..b3bf87d72b 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-master-us-test-1a_content @@ -262,7 +262,7 @@ KubeletConfig: shutdownGracePeriodCriticalPods: 10s NvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml @@ -270,7 +270,7 @@ containerdConfig: logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13 etcdManifests: - memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content index df1dbb827e..14ef46fd30 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_nodeupconfig-nodes_content @@ -61,7 +61,7 @@ KubeletConfig: - nvidia.com/gpu:NoSchedule NvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server UpdatePolicy: automatic channels: - memfs://clusters.example.com/minimal.example.com/addons/bootstrap-channel.yaml @@ -69,5 +69,5 @@ containerdConfig: logLevel: info nvidiaGPU: enabled: true - package: nvidia-headless-510-server + package: nvidia-headless-515-server version: 1.4.13