Merge pull request #271 from gianlucam76/main

Merge dev to main

Author: gianlucam76

Makefile

@@ -60,8 +60,8 @@ help: ## Display this help.
 # Directories.
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 TOOLS_DIR := hack/tools
-TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
 BIN_DIR := bin
+TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/$(BIN_DIR))
 
 GOBUILD=go build
 
@@ -82,37 +82,41 @@ KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 GOLANGCI_LINT_VERSION := "v1.52.2"
 
 $(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
-	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
+	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-tools/cmd/controller-gen
 
 $(ENVSUBST): $(TOOLS_DIR)/go.mod # Build envsubst from tools folder.
-	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) github.com/a8m/envsubst/cmd/envsubst
-
-$(KUSTOMIZE): $(TOOLS_DIR)/go.mod # Build kustomize from tools folder.
-	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(BIN_DIR)/kustomize sigs.k8s.io/kustomize/kustomize/v4
+	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) github.com/a8m/envsubst/cmd/envsubst
 
 $(GOLANGCI_LINT): # Build golangci-lint from tools folder.
 	cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION)
 
 $(SETUP_ENVTEST): $(TOOLS_DIR)/go.mod # Build setup-envtest from tools folder.
-	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) sigs.k8s.io/controller-runtime/tools/setup-envtest
+	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/controller-runtime/tools/setup-envtest
 
 $(GOIMPORTS):
-	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst hack/tools/,,$@) golang.org/x/tools/cmd/goimports
+	cd $(TOOLS_DIR); $(GOBUILD) -tags=tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) golang.org/x/tools/cmd/goimports
 
 $(GINKGO): $(TOOLS_DIR)/go.mod
-	cd $(TOOLS_DIR) && $(GOBUILD) -tags tools -o $(subst hack/tools/,,$@) github.com/onsi/ginkgo/v2/ginkgo
-
-$(CLUSTERCTL): $(TOOLS_DIR)/go.mod ## Build clusterctl binary
-	cd $(TOOLS_DIR); $(GOBUILD) -ldflags $(CLUSTERAPI_LDFLAGS) -o $(subst hack/tools/,,$@) sigs.k8s.io/cluster-api/cmd/clusterctl
-	mkdir -p $(HOME)/.cluster-api # create cluster api init directory, if not present
+	cd $(TOOLS_DIR) && $(GOBUILD) -tags tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) github.com/onsi/ginkgo/v2/ginkgo
 
 $(KIND): $(TOOLS_DIR)/go.mod
-	cd $(TOOLS_DIR) && $(GOBUILD) -tags tools -o $(subst hack/tools/,,$@) sigs.k8s.io/kind
+	cd $(TOOLS_DIR) && $(GOBUILD) -tags tools -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/kind
+
+$(CLUSTERCTL): $(TOOLS_DIR)/go.mod ## Build clusterctl binary
+	cd $(TOOLS_DIR); $(GOBUILD) -trimpath  -ldflags $(CLUSTERAPI_LDFLAGS) -o $(subst $(TOOLS_DIR)/hack/tools/,,$@) sigs.k8s.io/cluster-api/cmd/clusterctl
+	mkdir -p $(HOME)/.cluster-api # create cluster api init directory, if not present	
 
 $(KUBECTL):
 	curl -L https://storage.googleapis.com/kubernetes-release/release/$(K8S_LATEST_VER)/bin/$(OS)/$(ARCH)/kubectl -o $@
 	chmod +x $@
 
+KUSTOMIZE_VER := v4.5.2
+KUSTOMIZE_BIN := kustomize
+KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER))
+KUSTOMIZE_PKG := sigs.k8s.io/kustomize/kustomize/v4
+$(KUSTOMIZE): # Build kustomize from tools folder.
+	CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KUSTOMIZE_PKG) $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
+
 .PHONY: tools
 tools: $(CONTROLLER_GEN) $(ENVSUBST) $(KUSTOMIZE) $(SETUP_ENVTEST) $(GOLANGCI_LINT) $(GOIMPORTS) $(GINKGO) $(CLUSTERCTL) $(KIND) $(KUBECTL) ## build all tools
 
@@ -182,7 +186,7 @@ kind-test: test create-cluster fv ## Build docker image; start kind cluster; loa
 
 .PHONY: fv
 fv: $(GINKGO) ## Run Sveltos Controller tests using existing cluster
-	cd test/fv; ../../$(GINKGO) -nodes $(NUM_NODES) --label-filter='FV' --v --trace --randomize-all
+	cd test/fv; $(GINKGO) -nodes $(NUM_NODES) --label-filter='FV' --v --trace --randomize-all
 
 .PHONY: create-cluster
 create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kind cluster designed for development
@@ -251,18 +255,18 @@ deploy-projectsveltos: $(KUSTOMIZE)
 	@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_addonconstraints.yaml
+	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/libsveltos/$(TAG)/config/crd/bases/lib.projectsveltos.io_addoncompliances.yaml
 
 	# Install projectsveltos addon-controller components
 	@echo 'Install projectsveltos addon-controller components'
-	cd config/manager && ../../$(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | $(ENVSUBST) | $(KUBECTL) apply -f-
 
 	# Install sveltoscluster-manager
 	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/sveltoscluster-manager/$(TAG)/manifest/manifest.yaml
 
-	# Install addon-constraint-controller
-	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/addon-constraint-controller/$(TAG)/manifest/manifest.yaml
+	# Install addon-compliance-controller
+	$(KUBECTL) apply -f https://raw.githubusercontent.com/projectsveltos/addon-compliance-controller/$(TAG)/manifest/manifest.yaml
 
 	@echo "Waiting for projectsveltos addon-controller to be available..."
 	$(KUBECTL) wait --for=condition=Available deployment/addon-controller -n projectsveltos --timeout=$(TIMEOUT)
@@ -326,7 +330,7 @@ uninstall: manifests $(KUSTOMIZE) ## Uninstall CRDs from the K8s cluster specifi
 
 .PHONY: deploy
 deploy: manifests $(KUSTOMIZE) ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && ../../$(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | $(ENVSUBST) | $(KUBECTL)  apply -f -
 
 .PHONY: undeploy

README.md

@@ -8,7 +8,13 @@
 
 <img src="https://raw.githubusercontent.com/projectsveltos/sveltos/main/docs/assets/logo.png" width="200">
 
-Please refere to sveltos [documentation](https://projectsveltos.github.io/sveltos/).
+# Useful links
+
+- Projectsveltos [documentation](https://projectsveltos.github.io/sveltos/)
+- [Quick Start](https://projectsveltos.github.io/sveltos/quick_start/)
+
+# What is the Projectsveltos?
+Projectsveltos is mainly a Kubernetes add-on controller that simplifies the deployment and management of add-ons in Kubernetes clusters. With Sveltos controller, you can easily automate the deployment process and ensure consistency across your cluster environment.
 
 ## Addon deployment: how it works
 
@@ -39,12 +45,13 @@ spec:
   - repositoryURL:    https://kyverno.github.io/kyverno/
     repositoryName:   kyverno
     chartName:        kyverno/kyverno
-    chartVersion:     v2.6.0
+    chartVersion:     v3.0.1
     releaseName:      kyverno-latest
     releaseNamespace: kyverno
     helmChartAction:  Install
     values: |
-      replicaCount: "{{ .Cluster.spec.topology.controlPlane.replicas }}"
+      admissionController:
+        replicas: 3
   policyRefs:
   - name: storage-class
     namespace: default

config/crd/bases/config.projectsveltos.io_clusterconfigurations.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: clusterconfigurations.config.projectsveltos.io
 spec:
   group: config.projectsveltos.io

config/crd/bases/config.projectsveltos.io_clusterprofiles.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: clusterprofiles.config.projectsveltos.io
 spec:
   group: config.projectsveltos.io

config/crd/bases/config.projectsveltos.io_clusterreports.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: clusterreports.config.projectsveltos.io
 spec:
   group: config.projectsveltos.io

config/crd/bases/config.projectsveltos.io_clustersummaries.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.4
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: clustersummaries.config.projectsveltos.io
 spec:
   group: config.projectsveltos.io

config/rbac/role.yaml

@@ -194,15 +194,15 @@ rules:
 - apiGroups:
   - lib.projectsveltos.io
   resources:
-  - addonconstraints
+  - addoncompliances
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - lib.projectsveltos.io
   resources:
-  - addonconstraints/status
+  - addoncompliances/status
   verbs:
   - get
   - list

config/samples/config_v1alpha1_clusterprofile.yaml

@@ -9,25 +9,24 @@ spec:
   - repositoryURL: https://kyverno.github.io/kyverno/
     repositoryName: kyverno
     chartName: kyverno/kyverno
-    chartVersion: v2.5.0
+    chartVersion: v3.0.1
     releaseName: kyverno-latest
     releaseNamespace: kyverno
-    values:
-      replicaCount: 3
-      podAnnotations:
-        annotation1: annotation-value-1
+    values: |
+      admissionController:
+        replicas: 3
     helmChartAction: Install
   - repositoryURL: https://helm.nginx.com/stable
     repositoryName: nginx-stable
     chartName: nginx-stable/nginx-ingress
-    chartVersion: 0.14.0
+    chartVersion: 0.17.1
     releaseName: nginx-latest
     releaseNamespace: nginx
     helmChartAction: Install
   - repositoryURL: https://charts.bitnami.com/bitnami
     repositoryName: bitnami
     chartName: bitnami/contour
-    chartVersion: 9.1.2
+    chartVersion: 12.1.0
     releaseName: contour
     releaseNamespace: projectcontour
     helmChartAction: Install

controllers/chartmanager/chartmanager_test.go

@@ -61,7 +61,7 @@ var _ = Describe("Chart manager", func() {
 							RepositoryURL:    "https://kyverno.github.io/kyverno/",
 							RepositoryName:   "kyverno",
 							ChartName:        "kyverno/kyverno",
-							ChartVersion:     "v2.5.0",
+							ChartVersion:     "v3.0.1",
 							ReleaseName:      "kyverno-latest",
 							ReleaseNamespace: "kyverno",
 							HelmChartAction:  configv1alpha1.HelmChartActionInstall,
@@ -70,7 +70,7 @@ var _ = Describe("Chart manager", func() {
 							RepositoryURL:    "https://helm.nginx.com/stable/",
 							RepositoryName:   "nginx-stable",
 							ChartName:        "nginx-stable/nginx-ingress",
-							ChartVersion:     "0.14.0",
+							ChartVersion:     "0.17.1",
 							ReleaseName:      "nginx-latest",
 							ReleaseNamespace: "nginx",
 							HelmChartAction:  configv1alpha1.HelmChartActionInstall,
@@ -84,8 +84,7 @@ var _ = Describe("Chart manager", func() {
 			clusterSummary,
 		}
 
-		c = fake.NewClientBuilder().WithScheme(scheme).WithObjects(initObjects...).Build()
-
+		c = fake.NewClientBuilder().WithScheme(scheme).WithStatusSubresource(initObjects...).WithObjects(initObjects...).Build()
 	})
 
 	AfterEach(func() {
@@ -308,7 +307,7 @@ var _ = Describe("Chart manager", func() {
 				},
 			},
 		}
-		Expect(c.Status().Update(context.TODO(), clusterSummary)).To(Succeed())
+		Expect(c.Update(context.TODO(), clusterSummary)).To(Succeed())
 
 		// Mark tmpClusterSummary as manager for other release
 		tmpClusterSummary := &configv1alpha1.ClusterSummary{

controllers/clusterprofile_controller.go

@@ -277,7 +277,7 @@ func (r *ClusterProfileReconciler) SetupWithManager(mgr ctrl.Manager) (controlle
 
 	// When projectsveltos cluster changes, according to SveltosClusterPredicates,
 	// one or more ClusterProfiles need to be reconciled.
-	err = c.Watch(&source.Kind{Type: &libsveltosv1alpha1.SveltosCluster{}},
+	err = c.Watch(source.Kind(mgr.GetCache(), &libsveltosv1alpha1.SveltosCluster{}),
 		handler.EnqueueRequestsFromMapFunc(r.requeueClusterProfileForCluster),
 		SveltosClusterPredicates(mgr.GetLogger().WithValues("predicate", "sveltosclusterpredicate")),
 	)
@@ -288,15 +288,15 @@ func (r *ClusterProfileReconciler) SetupWithManager(mgr ctrl.Manager) (controlle
 func (r *ClusterProfileReconciler) WatchForCAPI(mgr ctrl.Manager, c controller.Controller) error {
 	// When cluster-api cluster changes, according to ClusterPredicates,
 	// one or more ClusterProfiles need to be reconciled.
-	if err := c.Watch(&source.Kind{Type: &clusterv1.Cluster{}},
+	if err := c.Watch(source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
 		handler.EnqueueRequestsFromMapFunc(r.requeueClusterProfileForCluster),
 		ClusterPredicates(mgr.GetLogger().WithValues("predicate", "clusterpredicate")),
 	); err != nil {
 		return err
 	}
 	// When cluster-api machine changes, according to ClusterPredicates,
 	// one or more ClusterProfiles need to be reconciled.
-	if err := c.Watch(&source.Kind{Type: &clusterv1.Machine{}},
+	if err := c.Watch(source.Kind(mgr.GetCache(), &clusterv1.Machine{}),
 		handler.EnqueueRequestsFromMapFunc(r.requeueClusterProfileForMachine),
 		MachinePredicates(mgr.GetLogger().WithValues("predicate", "machinepredicate")),
 	); err != nil {