Add support for containerd container runtime - generated

k8s/crds/kops.k8s.io_clusters.yaml

@@ -331,6 +331,37 @@ spec:
               description: ConfigStore is the VFS path to where the configuration
                 (Cluster, InstanceGroups etc) is stored
               type: string
+            containerRuntime:
+              description: Container runtime to use for Kubernetes
+              type: string
+            containerd:
+              description: Component configurations
+              properties:
+                address:
+                  description: Address of containerd's GRPC server (default "/run/containerd/containerd.sock")
+                  type: string
+                configFile:
+                  description: Complete containerd config file provided by the user
+                  type: string
+                logLevel:
+                  description: Logging level [trace, debug, info, warn, error, fatal,
+                    panic] (default "warn")
+                  type: string
+                root:
+                  description: Directory for persistent data (default "/var/lib/containerd")
+                  type: string
+                skipInstall:
+                  description: Prevents kops from installing and modifying containerd
+                    in any way (default "false")
+                  type: boolean
+                state:
+                  description: Directory for execution state files (default "/run/containerd")
+                  type: string
+                version:
+                  description: Consumed by nodeup and used to pick the containerd
+                    version
+                  type: string
+              type: object
             dnsControllerGossipConfig:
               description: DNSControllerGossipConfig for the cluster assuming the
                 use of gossip DNS
@@ -354,7 +385,7 @@ spec:
                 of the zone (containing dots), or can be an identifier for the zone.
               type: string
             docker:
-              description: Component configurations
+              description: DockerConfig is the configuration for docker
               properties:
                 authorizationPlugins:
                   description: AuthorizationPlugins is a list of authorization plugins

nodeup/pkg/model/BUILD.bazel

@@ -5,6 +5,7 @@ go_library(
     srcs = [
         "architecture.go",
         "cloudconfig.go",
+        "containerd.go",
         "context.go",
         "convenience.go",
         "directories.go",
@@ -82,6 +83,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = [
+        "containerd_test.go",
         "docker_test.go",
         "kube_apiserver_test.go",
         "kube_proxy_test.go",

nodeup/pkg/model/resources/BUILD.bazel

@@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = ["docker.go"],
+    srcs = [
+        "containerd.go",
+        "docker.go",
+    ],
     importpath = "k8s.io/kops/nodeup/pkg/model/resources",
     visibility = ["//visibility:public"],
 )

pkg/apis/kops/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
         "channel.go",
         "cluster.go",
         "componentconfig.go",
+        "containerdconfig.go",
         "doc.go",
         "dockerconfig.go",
         "instancegroup.go",

pkg/apis/kops/v1alpha1/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
         "bastion.go",
         "cluster.go",
         "componentconfig.go",
+        "containerdconfig.go",
         "conversion.go",
         "defaults.go",
         "doc.go",

pkg/apis/kops/v1alpha2/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
         "bastion.go",
         "cluster.go",
         "componentconfig.go",
+        "containerdconfig.go",
         "defaults.go",
         "doc.go",
         "dockerconfig.go",