Merge pull request #230 from gianlucam76/release-0.10

Release 0.10

Author: gianlucam76

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # KUBEBUILDER_ENVTEST_KUBERNETES_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.26.0
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.27.1
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -25,7 +25,7 @@ ARCH ?= amd64
 OS ?= $(shell uname -s | tr A-Z a-z)
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= v0.10.0
+TAG ?= v0.10.1
 
 # Get cluster-api version and build ldflags
 clusterapi := $(shell go list -m sigs.k8s.io/cluster-api)
@@ -162,7 +162,7 @@ endif
 # K8S_VERSION for the Kind cluster can be set as environment variable. If not defined,
 # this default value is used
 ifndef K8S_VERSION
-K8S_VERSION := v1.26.0
+K8S_VERSION := v1.27.0
 endif
 
 KIND_CONFIG ?= kind-cluster.yaml
@@ -209,7 +209,7 @@ create-cluster: $(KIND) $(CLUSTERCTL) $(KUBECTL) $(ENVSUBST) ## Create a new kin
 	$(KIND) get kubeconfig --name $(WORKLOAD_CLUSTER_NAME) > test/fv/workload_kubeconfig
 
 	@echo "install calico on workload cluster"
-	$(KUBECTL) --kubeconfig=./test/fv/workload_kubeconfig apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.24.1/manifests/calico.yaml
+	$(KUBECTL) --kubeconfig=./test/fv/workload_kubeconfig apply -f https://raw.githubusercontent.com/projectcalico/calico/v3.25.1/manifests/calico.yaml
 
 	@echo wait for calico pod
 	$(KUBECTL) --kubeconfig=./test/fv/workload_kubeconfig wait --for=condition=Available deployment/calico-kube-controllers -n kube-system --timeout=$(TIMEOUT)

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

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

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

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

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

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

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

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

config/default/manager_image_patch.yaml

@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: projectsveltos/addon-manager-amd64:v0.10.0
+      - image: projectsveltos/addon-manager-amd64:v0.10.1
         name: manager

config/manager/manager.yaml

@@ -59,13 +59,6 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
-        resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
-          requests:
-            cpu: 500m
-            memory: 128Mi
         volumeMounts:
         - mountPath: /tmp
           name: tmp            

config/rbac/role.yaml

@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
@@ -160,14 +159,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - config.projectsveltos.io
-  resources:
-  - gitrepositories
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - controlplane.cluster.x-k8s.io
   resources:
@@ -208,3 +199,51 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - buckets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - buckets/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - gitrepositories
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - gitrepositories/status
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - ocirepositories
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - source.toolkit.fluxcd.io
+  resources:
+  - ocirepositories/status
+  verbs:
+  - get
+  - list
+  - watch

controllers/clusterprofile_controller.go

@@ -933,7 +933,6 @@ func (r *ClusterProfileReconciler) updateMaps(clusterProfileScope *scope.Cluster
 		r.getClusterMapForEntry(&clusterName).Erase(clusterProfileInfo)
 	}
 
-	// Update list of WorklaodRoles currently referenced by ClusterSummary
 	r.ClusterProfileMap[*clusterProfileInfo] = currentClusters
 	r.ClusterProfiles[*clusterProfileInfo] = clusterProfileScope.ClusterProfile.Spec.ClusterSelector
 }

controllers/clusterprofile_predicates.go

@@ -19,8 +19,6 @@ package controllers
 import (
 	"reflect"
 
-	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/go-logr/logr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -255,97 +253,3 @@ func MachinePredicates(logger logr.Logger) predicate.Funcs {
 		},
 	}
 }
-
-// FluxSourcePredicates predicates for GitRepository/OCIRepository/Bucket.
-// ClusterProfileReconciler watches GitRepository/OCIRepository/Bucket events and
-// react to those by reconciling itself based on following predicates
-func FluxSourcePredicates(logger logr.Logger) predicate.Funcs {
-	return predicate.Funcs{
-		UpdateFunc: func(e event.UpdateEvent) bool {
-			log := logger.WithValues("predicate", "updateEvent",
-				"namespace", e.ObjectNew.GetNamespace(),
-				"source", e.ObjectNew.GetName(),
-			)
-
-			if hasArtifactChanged(e) {
-				log.V(logs.LogInfo).Info(
-					"Source artifact has changed.  Will attempt to reconcile associated ClusterProfiles.")
-				return true
-			}
-
-			// otherwise, return false
-			log.V(logs.LogInfo).Info(
-				"GitRepository did not match expected conditions.  Will not attempt to reconcile associated ClusterProfiles.")
-			return false
-		},
-		CreateFunc: func(e event.CreateEvent) bool {
-			log := logger.WithValues("predicate", "createEvent",
-				"namespace", e.Object.GetNamespace(),
-				"source", e.Object.GetName(),
-			)
-
-			log.V(logs.LogVerbose).Info(
-				"Source did match expected conditions.  Will attempt to reconcile associated ClusterProfiles.")
-			return true
-		},
-		DeleteFunc: func(e event.DeleteEvent) bool {
-			log := logger.WithValues("predicate", "deleteEvent",
-				"namespace", e.Object.GetNamespace(),
-				"source", e.Object.GetName(),
-			)
-			log.V(logs.LogVerbose).Info(
-				"Source deleted.  Will attempt to reconcile associated ClusterProfiles.")
-			return true
-		},
-		GenericFunc: func(e event.GenericEvent) bool {
-			log := logger.WithValues("predicate", "genericEvent",
-				"namespace", e.Object.GetNamespace(),
-				"source", e.Object.GetName(),
-			)
-			log.V(logs.LogVerbose).Info(
-				"Source did not match expected conditions.  Will not attempt to reconcile associated ClusterProfiles.")
-			return false
-		},
-	}
-}
-
-func hasArtifactChanged(e event.UpdateEvent) bool {
-	switch e.ObjectNew.GetObjectKind().GroupVersionKind().Kind {
-	case sourcev1.GitRepositoryKind:
-		newGitRepo := e.ObjectNew.(*sourcev1.GitRepository)
-		oldGitRepo := e.ObjectOld.(*sourcev1.GitRepository)
-		if oldGitRepo == nil ||
-			!isArtifactSame(oldGitRepo.Status.Artifact, newGitRepo.Status.Artifact) {
-
-			return true
-		}
-	case sourcev1b2.BucketKind:
-		newBucket := e.ObjectNew.(*sourcev1b2.Bucket)
-		oldBucket := e.ObjectOld.(*sourcev1b2.Bucket)
-		if oldBucket == nil ||
-			!isArtifactSame(oldBucket.Status.Artifact, newBucket.Status.Artifact) {
-
-			return true
-		}
-	case sourcev1b2.OCIRepositoryKind:
-		newOCIRepo := e.ObjectNew.(*sourcev1b2.OCIRepository)
-		oldOCIRepo := e.ObjectOld.(*sourcev1b2.OCIRepository)
-		if oldOCIRepo == nil ||
-			!isArtifactSame(oldOCIRepo.Status.Artifact, newOCIRepo.Status.Artifact) {
-
-			return true
-		}
-	}
-
-	return false
-}
-
-func isArtifactSame(oldArtifact, newArtifact *sourcev1.Artifact) bool {
-	if oldArtifact == nil && newArtifact != nil {
-		return false
-	}
-	if oldArtifact != nil && newArtifact == nil {
-		return false
-	}
-	return reflect.DeepEqual(oldArtifact, newArtifact)
-}

controllers/clusterprofile_predicates_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package controllers_test
 
 import (
-	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -432,90 +431,3 @@ var _ = Describe("ClusterProfile Predicates: MachinePredicates", func() {
 		Expect(result).To(BeFalse())
 	})
 })
-
-var _ = Describe("ClusterProfile Predicates: FluxSourcePredicates", func() {
-	var logger logr.Logger
-	var gitRepository *sourcev1.GitRepository
-
-	BeforeEach(func() {
-		logger = klogr.New()
-		gitRepository = &sourcev1.GitRepository{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      upstreamClusterNamePrefix + randomString(),
-				Namespace: "predicates" + randomString(),
-			},
-		}
-
-		Expect(addTypeInformationToObject(scheme, gitRepository)).To(Succeed())
-	})
-
-	It("Create reprocesses", func() {
-		sourcePredicate := controllers.FluxSourcePredicates(logger)
-
-		e := event.CreateEvent{
-			Object: gitRepository,
-		}
-
-		result := sourcePredicate.Create(e)
-		Expect(result).To(BeTrue())
-	})
-	It("Delete does reprocess", func() {
-		sourcePredicate := controllers.FluxSourcePredicates(logger)
-
-		e := event.DeleteEvent{
-			Object: gitRepository,
-		}
-
-		result := sourcePredicate.Delete(e)
-		Expect(result).To(BeTrue())
-	})
-	It("Update reprocesses when artifact has changed", func() {
-		sourcePredicate := controllers.FluxSourcePredicates(logger)
-
-		gitRepository.Status.Artifact = &sourcev1.Artifact{
-			Revision: randomString(),
-		}
-
-		oldGitRepository := &sourcev1.GitRepository{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      gitRepository.Name,
-				Namespace: gitRepository.Namespace,
-			},
-		}
-
-		Expect(addTypeInformationToObject(scheme, oldGitRepository)).To(Succeed())
-
-		e := event.UpdateEvent{
-			ObjectNew: gitRepository,
-			ObjectOld: oldGitRepository,
-		}
-
-		result := sourcePredicate.Update(e)
-		Expect(result).To(BeTrue())
-	})
-	It("Update does not reprocess when artifact has not changed", func() {
-		sourcePredicate := controllers.FluxSourcePredicates(logger)
-
-		gitRepository.Status.Artifact = &sourcev1.Artifact{
-			Revision: randomString(),
-		}
-
-		oldGitRepository := &sourcev1.GitRepository{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      gitRepository.Name,
-				Namespace: gitRepository.Namespace,
-			},
-		}
-		oldGitRepository.Status.Artifact = gitRepository.GetArtifact()
-
-		Expect(addTypeInformationToObject(scheme, oldGitRepository)).To(Succeed())
-
-		e := event.UpdateEvent{
-			ObjectNew: gitRepository,
-			ObjectOld: oldGitRepository,
-		}
-
-		result := sourcePredicate.Update(e)
-		Expect(result).To(BeFalse())
-	})
-})