Support custom cluster profile

Signed-off-by: Tamal Saha <tamal@appscode.com>
kluster-manager · Oct 15, 2024 · bffd474 · bffd474
1 parent df59fd9
commit bffd474
Show file tree

Hide file tree

Showing 23 changed files with 356 additions and 354 deletions.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	kmodules.xyz/client-go v0.30.27
 	kmodules.xyz/fake-apiserver v0.0.4
-	kmodules.xyz/resource-metadata v0.19.0
+	kmodules.xyz/resource-metadata v0.19.1-0.20241015215310-ad436b1d1d41
 	kubepack.dev/lib-app v0.0.23-0.20241009153800-31c7b82c96b3
 	kubepack.dev/lib-helm v0.29.12
 	open-cluster-management.io/api v0.14.0

diff --git a/go.sum b/go.sum
@@ -1064,8 +1064,8 @@ kmodules.xyz/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3q
 kmodules.xyz/go-containerregistry v0.0.12/go.mod h1:KgeNg0hDsgeda+qc0NzWk0iVRdF0+ZIg/oRzGoYh78I=
 kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI=
 kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
-kmodules.xyz/resource-metadata v0.19.0 h1:fr4GzHmeUj/25awK4TnNLWHwjfTIsTMdm4yUP22ACkU=
-kmodules.xyz/resource-metadata v0.19.0/go.mod h1:+oaGJj871hYXqUWDFgqf4Tc8Lz5F8rBco+Bq34DqLus=
+kmodules.xyz/resource-metadata v0.19.1-0.20241015215310-ad436b1d1d41 h1:GZgpttIJNtT/YB3Sz8ISi8jphVBSjETembt0DcUlDZ0=
+kmodules.xyz/resource-metadata v0.19.1-0.20241015215310-ad436b1d1d41/go.mod h1:ZVjgAj622Fp+8bdmAgHv6PNQHkXXqhR6aQpJg3lO8Bo=
 kmodules.xyz/resource-metrics v0.30.4 h1:8HBPtYmo9ETY91gsc55JE8Z986+3ZuRq57M0wZ9npqI=
 kmodules.xyz/resource-metrics v0.30.4/go.mod h1:w9+rz7/s/kGP1GWzYSuRdCn+l7EwpesmESSEHkLBnIQ=
 kubepack.dev/kubepack v0.29.2-0.20240914155715-3a591859b705 h1:fFn0CdYpDKTUFA4t6AV9DSVJLMwLZy8Q6RKPhNgLO+g=

diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/openapi_generated.go
diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/register.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/register.go
@@ -50,8 +50,6 @@ func Resource(resource string) schema.GroupResource {
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&ChartPresetQuery{},
-		&ClusterProfile{},
-		&ClusterProfileList{},
 		&ClusterStatus{},
 		&ResourceCalculator{},
 		&ResourceDescriptor{},

diff --git a/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/resource-metadata/apis/meta/v1alpha1/zz_generated.deepcopy.go
diff --git a/...pis/meta/v1alpha1/clusterprofile_types.go → .../apis/ui/v1alpha1/clusterprofile_types.go b/...pis/meta/v1alpha1/clusterprofile_types.go → .../apis/ui/v1alpha1/clusterprofile_types.go
@@ -28,12 +28,14 @@ const (
 
 // ClusterProfileSpec defines the desired state of ClusterProfile
 type ClusterProfileSpec struct {
-	Title               string                 `json:"title"`
-	Description         string                 `json:"description"`
-	Provider            string                 `json:"provider,omitempty"`
-	RequiredFeatureSets map[string]FeatureList `json:"requiredFeatureSets,omitempty"`
+	Title               string              `json:"title"`
+	Description         string              `json:"description"`
+	Provider            string              `json:"provider,omitempty"`
+	RequiredFeatureSets map[string]Features `json:"requiredFeatureSets,omitempty"`
 }
 
+type Features []string
+
 // ClusterProfile is the Schema for the clusterprofiles API
 
 // +genclient