Merge pull request #168 from makhov/fix-k0s-config-crd-description

Fix k0s config CRD description

Author: makhov

api/k0smotron.io/v1beta1/k0smotroncluster_types.go

@@ -68,6 +68,7 @@ type ClusterSpec struct {
 	// k0sConfig defines the k0s configuration. Note, that some fields will be overwritten by k0smotron.
 	// If empty, will be used default configuration. @see https://docs.k0sproject.io/stable/configuration/
 	//+kubebuilder:validation:Optional
+	//+kubebuilder:pruning:PreserveUnknownFields
 	K0sConfig *unstructured.Unstructured `json:"k0sConfig,omitempty"`
 	// CertificateRefs defines the certificate references.
 	CertificateRefs []CertificateRef `json:"certificateRefs,omitempty"`

config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml

@@ -68,6 +68,7 @@ spec:
                   fields will be overwritten by k0smotron. If empty, will be used
                   default configuration. @see https://docs.k0sproject.io/stable/configuration/
                 type: object
+                x-kubernetes-preserve-unknown-fields: true
               k0sImage:
                 default: k0sproject/k0s
                 description: K0sImage defines the k0s image to be deployed. If empty

config/crd/bases/k0smotron.io_clusters.yaml

@@ -72,6 +72,7 @@ spec:
                   fields will be overwritten by k0smotron. If empty, will be used
                   default configuration. @see https://docs.k0sproject.io/stable/configuration/
                 type: object
+                x-kubernetes-preserve-unknown-fields: true
               k0sImage:
                 default: k0sproject/k0s
                 description: K0sImage defines the k0s image to be deployed. If empty

inttest/basic/basic_test.go

@@ -157,7 +157,12 @@ metadata:
 					"name": "configmap",
 					"configMap": { "name": "manifest-cm" }
 				}
-			]
+			],
+			"k0sConfig": {
+				"apiVersion": "k0s.k0sproject.io/v1beta1",
+				"kind": "ClusterConfig",
+				"spec": {}
+			}
 		}
 	  }
 `)