diff --git a/api/k0smotron.io/v1beta1/k0smotroncluster_types.go b/api/k0smotron.io/v1beta1/k0smotroncluster_types.go index d7cbb95c8..1e9b83f24 100644 --- a/api/k0smotron.io/v1beta1/k0smotroncluster_types.go +++ b/api/k0smotron.io/v1beta1/k0smotroncluster_types.go @@ -59,13 +59,9 @@ type ClusterSpec struct { //+kubebuilder:validation:Optional Persistence PersistenceSpec `json:"persistence,omitempty"` // KineDataSourceURL defines the kine datasource URL. - // KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - // and one of them must be set if replicas > 1. //+kubebuilder:validation:Optional KineDataSourceURL string `json:"kineDataSourceURL,omitempty"` // KineDataSourceSecretName defines the name of kine datasource URL secret. - // KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - // and one of them must be set if replicas > 1. //+kubebuilder:validation:Optional KineDataSourceSecretName string `json:"kineDataSourceSecretName,omitempty"` // k0sConfig defines the k0s configuration. Note, that some fields will be overwritten by k0smotron. diff --git a/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml b/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml index 5c6a41553..9541b905c 100644 --- a/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml +++ b/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml @@ -157,16 +157,11 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true kineDataSourceSecretName: - description: |- - KineDataSourceSecretName defines the name of kine datasource URL secret. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceSecretName defines the name of kine datasource + URL secret. type: string kineDataSourceURL: - description: |- - KineDataSourceURL defines the kine datasource URL. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceURL defines the kine datasource URL. type: string manifests: description: |- diff --git a/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml b/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml index 7b2fc1b0f..7b56a1dea 100644 --- a/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml +++ b/config/clusterapi/controlplane/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml @@ -183,16 +183,12 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true kineDataSourceSecretName: - description: |- - KineDataSourceSecretName defines the name of kine datasource URL secret. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceSecretName defines the name of + kine datasource URL secret. type: string kineDataSourceURL: - description: |- - KineDataSourceURL defines the kine datasource URL. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceURL defines the kine datasource + URL. type: string manifests: description: |- diff --git a/config/clusterapi/k0smotron.io/bases/k0smotron.io_clusters.yaml b/config/clusterapi/k0smotron.io/bases/k0smotron.io_clusters.yaml index a79420b8c..c6734e459 100644 --- a/config/clusterapi/k0smotron.io/bases/k0smotron.io_clusters.yaml +++ b/config/clusterapi/k0smotron.io/bases/k0smotron.io_clusters.yaml @@ -160,16 +160,11 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true kineDataSourceSecretName: - description: |- - KineDataSourceSecretName defines the name of kine datasource URL secret. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceSecretName defines the name of kine datasource + URL secret. type: string kineDataSourceURL: - description: |- - KineDataSourceURL defines the kine datasource URL. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceURL defines the kine datasource URL. type: string manifests: description: |- diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml index 5c6a41553..9541b905c 100644 --- a/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml +++ b/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanes.yaml @@ -157,16 +157,11 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true kineDataSourceSecretName: - description: |- - KineDataSourceSecretName defines the name of kine datasource URL secret. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceSecretName defines the name of kine datasource + URL secret. type: string kineDataSourceURL: - description: |- - KineDataSourceURL defines the kine datasource URL. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceURL defines the kine datasource URL. type: string manifests: description: |- diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml index 7b2fc1b0f..7b56a1dea 100644 --- a/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml +++ b/config/crd/bases/controlplane.cluster.x-k8s.io_k0smotroncontrolplanetemplates.yaml @@ -183,16 +183,12 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true kineDataSourceSecretName: - description: |- - KineDataSourceSecretName defines the name of kine datasource URL secret. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceSecretName defines the name of + kine datasource URL secret. type: string kineDataSourceURL: - description: |- - KineDataSourceURL defines the kine datasource URL. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceURL defines the kine datasource + URL. type: string manifests: description: |- diff --git a/config/crd/bases/k0smotron.io_clusters.yaml b/config/crd/bases/k0smotron.io_clusters.yaml index a79420b8c..c6734e459 100644 --- a/config/crd/bases/k0smotron.io_clusters.yaml +++ b/config/crd/bases/k0smotron.io_clusters.yaml @@ -160,16 +160,11 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true kineDataSourceSecretName: - description: |- - KineDataSourceSecretName defines the name of kine datasource URL secret. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceSecretName defines the name of kine datasource + URL secret. type: string kineDataSourceURL: - description: |- - KineDataSourceURL defines the kine datasource URL. - KineDataSourceURL or KineDataSourceSecretName are required for HA controlplane setup - and one of them must be set if replicas > 1. + description: KineDataSourceURL defines the kine datasource URL. type: string manifests: description: |- diff --git a/docs/resource-reference.md b/docs/resource-reference.md index fb22ed975..ef0ff2eae 100644 --- a/docs/resource-reference.md +++ b/docs/resource-reference.md @@ -2814,18 +2814,14 @@ If empty, will be used default configuration. @see https://docs.k0sproject.io/st