Introduce v1beta1

Conversion is introduced for ClusterProfile/Profile

Author: mgianluc

Makefile

@@ -239,7 +239,7 @@ create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kin
 	$(KUBECTL) create configmap kustomize --from-file=test/kustomize.tar.gz
 
 	@echo apply reloader CRD to managed cluster
-	$(KUBECTL) --kubeconfig=./test/fv/workload_kubeconfig apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/config/crd/bases/lib.projectsveltos.io_reloaders.yaml
+	$(KUBECTL) --kubeconfig=./test/fv/workload_kubeconfig apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/manifests/apiextensions.k8s.io_v1_customresourcedefinition_reloaders.lib.projectsveltos.io.yaml
 
 .PHONY: delete-cluster
 delete-cluster: $(KIND) ## Deletes the kind cluster $(CONTROL_CLUSTER_NAME)
@@ -302,10 +302,10 @@ deploy-projectsveltos: $(KUSTOMIZE)
 	$(MAKE) load-image
 
 	@echo 'Install libsveltos CRDs'
-	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/config/crd/bases/lib.projectsveltos.io_debuggingconfigurations.yaml
-	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/config/crd/bases/lib.projectsveltos.io_sveltosclusters.yaml
-	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/config/crd/bases/lib.projectsveltos.io_clustersets.yaml
-	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/config/crd/bases/lib.projectsveltos.io_sets.yaml
+	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/manifests/apiextensions.k8s.io_v1_customresourcedefinition_debuggingconfigurations.lib.projectsveltos.io.yaml
+	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/manifests/apiextensions.k8s.io_v1_customresourcedefinition_sveltosclusters.lib.projectsveltos.io.yaml
+	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/manifests/apiextensions.k8s.io_v1_customresourcedefinition_clustersets.lib.projectsveltos.io.yaml
+	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/manifests/apiextensions.k8s.io_v1_customresourcedefinition_sets.lib.projectsveltos.io.yaml
 
 	# Install projectsveltos addon-controller components
 	@echo 'Install projectsveltos addon-controller components'

PROJECT

@@ -59,4 +59,44 @@ resources:
   group: lib
   kind: ClusterSet
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: projectsveltos.io
+  group: config
+  kind: ClusterProfile
+  path: github.com/projectsveltos/addon-controller/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: projectsveltos.io
+  group: config
+  kind: ClusterReport
+  path: github.com/projectsveltos/addon-controller/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: projectsveltos.io
+  group: config
+  kind: ClusterSummary
+  path: github.com/projectsveltos/addon-controller/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: projectsveltos.io
+  group: config
+  kind: ClusterConfiguration
+  path: github.com/projectsveltos/addon-controller/api/v1beta1
+  version: v1beta1
+- api:
+    crdVersion: v1
+    namespaced: true
+  domain: projectsveltos.io
+  group: config
+  kind: Profile
+  path: github.com/projectsveltos/addon-controller/api/v1beta1
+  version: v1beta1
 version: "3"

README.md

@@ -49,7 +49,7 @@ Here is an example of how to require that any CAPI Cluster with label *env: prod
 3. kubernetes resource(s) contained in the referenced ConfigMap: *default/contour*.
 
 ```yaml
-apiVersion: config.projectsveltos.io/v1alpha1
+apiVersion: config.projectsveltos.io/v1beta1
 kind: ClusterProfile
 metadata:
   name: deploy-kyverno
@@ -83,7 +83,7 @@ As soon as a cluster is a match for above ClusterProfile instance, all reference
 Here is an example using Kustomize:
 
 ```yaml
-apiVersion: config.projectsveltos.io/v1alpha1
+apiVersion: config.projectsveltos.io/v1beta1
 kind: ClusterProfile
 metadata:
   name: flux-system

api/v1alpha1/clusterprofile_conversion.go

@@ -0,0 +1,96 @@
+/*
+Copyright 2024. projectsveltos.io. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
+
+	configv1beta1 "github.com/projectsveltos/addon-controller/api/v1beta1"
+	libsveltosv1alpha1 "github.com/projectsveltos/libsveltos/api/v1alpha1"
+	logs "github.com/projectsveltos/libsveltos/lib/logsettings"
+)
+
+var (
+	configlog = logf.Log.WithName("conversion")
+)
+
+// ConvertTo converts v1alpha1 to the Hub version (v1beta1).
+func (src *ClusterProfile) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*configv1beta1.ClusterProfile)
+
+	configlog.V(logs.LogInfo).Info("convert ClusterProfile from v1alpha1 to v1beta1")
+
+	dst.ObjectMeta = src.ObjectMeta
+
+	var err error
+	dst.Spec, err = convertV1Alpha1SpecToV1Beta1(&src.Spec)
+	if err != nil {
+		configlog.V(logs.LogInfo).Info(fmt.Sprintf("failed to convert Spec: %v", err))
+		return err
+	}
+
+	jsonData, err := json.Marshal(src.Status) // Marshal the Status field
+	if err != nil {
+		return fmt.Errorf("error marshaling Status: %w", err)
+	}
+
+	err = json.Unmarshal(jsonData, &dst.Status) // Unmarshal to v1beta1 type
+	if err != nil {
+		return fmt.Errorf("error unmarshaling JSON: %w", err)
+	}
+
+	return nil
+}
+
+// ConvertFrom converts from the Hub version (v1beta1) to this v1alpha1.
+func (dst *ClusterProfile) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*configv1beta1.ClusterProfile)
+
+	configlog.V(logs.LogInfo).Info("convert ClusterProfile from v1beta1 to v1alpha1")
+
+	dst.ObjectMeta = src.ObjectMeta
+
+	var err error
+	dst.Spec, err = convertV1Beta1SpecToV1Alpha1(&src.Spec)
+	if err != nil {
+		configlog.V(logs.LogInfo).Info(fmt.Sprintf("failed to convert Spec: %v", err))
+		return err
+	}
+
+	labelSelector, err := src.Spec.ClusterSelector.ToSelector()
+	if err != nil {
+		return fmt.Errorf("failed to convert : %w", err)
+	}
+
+	dst.Spec.ClusterSelector = libsveltosv1alpha1.Selector(labelSelector.String())
+
+	jsonData, err := json.Marshal(src.Status) // Marshal the Status field
+	if err != nil {
+		return fmt.Errorf("error marshaling Spec: %w", err)
+	}
+
+	err = json.Unmarshal(jsonData, &dst.Status) // Unmarshal to v1beta1 type
+	if err != nil {
+		return fmt.Errorf("error unmarshaling JSON: %w", err)
+	}
+
+	return nil
+}

api/v1alpha1/clustersummary_types.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	libsveltosv1alpha1 "github.com/projectsveltos/libsveltos/api/v1alpha1"
+	libsveltosv1alpha1 "github.com/projectsveltos/libsveltos/api/v1beta1"
 )
 
 const (