Maybe need to allow the "clusterconfigs"?

Signed-off-by: Kimmo Lehto <klehto@mirantis.com>
k0sproject · Dec 3, 2021 · 497f9aa · 497f9aa
1 parent 166b35d
commit 497f9aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/apis/k0s.k0sproject.io/v1beta1/clusterconfig_types.go b/pkg/apis/k0s.k0sproject.io/v1beta1/clusterconfig_types.go
@@ -271,7 +271,7 @@ func (c *ClusterConfig) Validate() []error {
 		errors = append(errors, fmt.Errorf("expected apiVersion: %s but found %s", ClusterConfigAPIVersion, c.APIVersion))
 	}
 
-	if c.Kind != ClusterConfigKind {
+	if c.Kind != ClusterConfigKind && c.Kind != "clusterconfigs" {
 		errors = append(errors, fmt.Errorf("expected kind: %s but found %s", ClusterConfigKind, c.Kind))
 	}
 

diff --git a/pkg/component/controller/clusterConfig.go b/pkg/component/controller/clusterConfig.go
@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	resourceType = v1.TypeMeta{APIVersion: "k0s.k0sproject.io/v1beta1", Kind: "ClusterConfig"}
+	resourceType = v1.TypeMeta{APIVersion: "k0s.k0sproject.io/v1beta1", Kind: "clusterconfigs"}
 	cOpts        = v1.CreateOptions{TypeMeta: resourceType}
 	getOpts      = v1.GetOptions{TypeMeta: resourceType}
 )