Add containerdExtraConfigToml to EKSConfig

This depends on awslabs/amazon-eks-ami#790 being
merged and released.

Author: codablock

bootstrap/eks/api/v1beta1/eksconfig_types.go

@@ -36,6 +36,10 @@ type EKSConfigSpec struct {
 	// This is expected to be a json string.
 	// +optional
 	DockerConfigJson *string `json:"dockerConfigJson,omitempty"`
+	// ContainerdExtraConfigToml Extra configuration to append to the containerd configuration. Useful if you want a custom config differing from the default one in the AMI.
+	// This is expected to be a toml string.
+	// +optional
+	ContainerdExtraConfigToml *string `json:"containerdExtraConfigToml,omitempty"`
 	// APIRetryAttempts is the number of retry attempts for AWS API call.
 	// +optional
 	APIRetryAttempts *int `json:"apiRetryAttempts,omitempty"`

bootstrap/eks/controllers/eksconfig_controller.go

@@ -196,6 +196,7 @@ func (r *EKSConfigReconciler) joinWorker(ctx context.Context, cluster *clusterv1
 		ContainerRuntime: config.Spec.ContainerRuntime,
 		DNSClusterIP:     config.Spec.DNSClusterIP,
 		DockerConfigJson: config.Spec.DockerConfigJson,
+		ContainerdExtraConfigToml: config.Spec.ContainerdExtraConfigToml,
 		APIRetryAttempts: config.Spec.APIRetryAttempts,
 		UseMaxPods:       config.Spec.UseMaxPods,
 	}

bootstrap/eks/internal/userdata/args.go

@@ -34,6 +34,7 @@ const argsTemplate = `{{- define "args" -}}
 {{- if .PauseConatinerVersion }} --pause-container-version {{.PauseConatinerVersion}}{{- end -}}
 {{- if .DNSClusterIP }} --dns-cluster-ip {{.DNSClusterIP}}{{- end -}}
 {{- if .DockerConfigJson }} --docker-config-json {{.DockerConfigJson}}{{- end -}}
+{{- if .ContainerdExtraConfigToml }} --containerd-extra-config-toml '{{.ContainerdExtraConfigToml}}'{{- end -}}
 {{- end -}}`
 
 const kubeletArgsTemplate = `{{- define "kubeletArgsTemplate" -}}

bootstrap/eks/internal/userdata/node.go

@@ -35,6 +35,7 @@ type NodeInput struct {
 	ContainerRuntime      *string
 	DNSClusterIP          *string
 	DockerConfigJson      *string
+	ContainerdExtraConfigToml *string
 	APIRetryAttempts      *int
 	PauseContainerAccount *string
 	PauseConatinerVersion *string