Update containerd config tests

Author: rifelpet

nodeup/pkg/model/containerd_test.go

@@ -48,6 +48,10 @@ func TestContainerdBuilder_Complex(t *testing.T) {
 	runContainerdBuilderTest(t, "complex", distributions.DistributionUbuntu2604)
 }
 
+func TestContainerdBuilder_V3(t *testing.T) {
+	runContainerdBuilderTest(t, "v3", distributions.DistributionUbuntu2604)
+}
+
 func TestContainerdBuilder_BuildFlags(t *testing.T) {
 	grid := []struct {
 		config   kops.ContainerdConfig
@@ -177,6 +181,41 @@ func runContainerdBuilderTest(t *testing.T, key string, distro distributions.Dis
 	testutils.ValidateTasks(t, filepath.Join(basedir, "tasks.yaml"), context)
 }
 
+func TestUseContainerdConfigV3(t *testing.T) {
+	tests := []struct {
+		name    string
+		version string
+		want    bool
+		wantErr bool
+	}{
+		{name: "empty defaults to v2", version: "", want: false},
+		{name: "1.7.0 is v2", version: "1.7.0", want: false},
+		{name: "1.999.999 is v2", version: "1.999.999", want: false},
+		{name: "2.0.0 boundary is v3", version: "2.0.0", want: true},
+		{name: "2.0.0 with v prefix is v3", version: "v2.0.0", want: true},
+		{name: "2.1.6 is v3", version: "2.1.6", want: true},
+		{name: "3.0.0 is v3", version: "3.0.0", want: true},
+		{name: "unparseable returns error", version: "not-a-semver", wantErr: true},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := useContainerdConfigV3(tc.version)
+			if tc.wantErr {
+				if err == nil {
+					t.Fatalf("useContainerdConfigV3(%q) error = nil, want non-nil", tc.version)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("useContainerdConfigV3(%q) error = %v, want nil", tc.version, err)
+			}
+			if got != tc.want {
+				t.Errorf("useContainerdConfigV3(%q) = %v, want %v", tc.version, got, tc.want)
+			}
+		})
+	}
+}
+
 func TestContainerdConfig(t *testing.T) {
 	b := &ContainerdBuilder{
 		NodeupModelContext: &NodeupModelContext{
@@ -241,7 +280,8 @@ func TestAppendGPURuntimeContainerdConfig(t *testing.T) {
 		t.Fatalf("Unexpected error: %v", err)
 	}
 
-	if err := appendNvidiaGPURuntimeConfig(config); err != nil {
+	runtimesPath := []string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes"}
+	if err := appendNvidiaGPURuntimeConfig(config, runtimesPath); err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
 

nodeup/pkg/model/tests/containerdbuilder/complex/cluster.yaml

@@ -17,6 +17,12 @@ spec:
       plugins."io.containerd.grpc.v1.cri".containerd.runtimes.test-handler.test_int: 1
       plugins."io.containerd.grpc.v1.cri".containerd.runtimes.test-handler.test_intstr: "1"
       plugins."io.containerd.grpc.v1.cri".containerd.runtimes.test-handler.test_str: test
+    registryMirrors:
+      docker.io:
+        - https://registry-1.docker.io
+      registry.k8s.io:
+        - https://mirror.example.com
+        - https://backup.example.com
   etcdClusters:
     - etcdMembers:
         - instanceGroup: master-us-test-1a

nodeup/pkg/model/tests/containerdbuilder/complex/tasks.yaml

@@ -1,3 +1,24 @@
+contents: |2
+
+  [host]
+
+    [host."https://registry-1.docker.io"]
+      capabilities = ["pull", "resolve"]
+path: /etc/containerd/certs.d/docker.io/hosts.toml
+type: file
+---
+contents: |2
+
+  [host]
+
+    [host."https://backup.example.com"]
+      capabilities = ["pull", "resolve"]
+
+    [host."https://mirror.example.com"]
+      capabilities = ["pull", "resolve"]
+path: /etc/containerd/certs.d/registry.k8s.io/hosts.toml
+type: file
+---
 contents: |
   {
       "cniVersion": "1.0.0",
@@ -48,6 +69,9 @@ contents: |
             test_int = 1
             test_intstr = "1"
             test_str = "test"
+
+      [plugins."io.containerd.grpc.v1.cri".registry]
+        config_path = "/etc/containerd/certs.d"
 path: /etc/containerd/config.toml
 type: file
 ---

nodeup/pkg/model/tests/containerdbuilder/v3/cluster.yaml

@@ -0,0 +1,46 @@
+apiVersion: kops.k8s.io/v1alpha2
+kind: Cluster
+metadata:
+  name: minimal.example.com
+spec:
+  kubernetesApiAccess:
+    - 0.0.0.0/0
+  channel: stable
+  cloudProvider: aws
+  configBase: memfs://clusters.example.com/minimal.example.com
+  containerRuntime: containerd
+  containerd:
+    version: 2.1.6
+    sandboxImage: registry.k8s.io/pause:3.10.1
+    selinuxEnabled: true
+    nri:
+      enabled: true
+    configAdditions:
+      plugins."io.containerd.cri.v1.runtime".containerd.runtimes.test-handler.test_str: test
+    registryMirrors:
+      docker.io:
+        - https://registry-1.docker.io
+  etcdClusters:
+    - etcdMembers:
+        - instanceGroup: master-us-test-1a
+          name: master-us-test-1a
+      name: main
+    - etcdMembers:
+        - instanceGroup: master-us-test-1a
+          name: master-us-test-1a
+      name: events
+  iam:
+    legacy: false
+  kubernetesVersion: v1.32.0
+  masterPublicName: api.minimal.example.com
+  networkCIDR: 172.20.0.0/16
+  networking:
+    kubenet: {}
+  nonMasqueradeCIDR: 100.64.0.0/10
+  sshAccess:
+    - 0.0.0.0/0
+  subnets:
+    - cidr: 172.20.32.0/19
+      name: us-test-1a
+      type: Public
+      zone: us-test-1a