Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1

- name: Initialize CodeQL
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: Build
run: make build
- name: FMT
Expand All @@ -37,7 +37,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: ut
run: make test
env:
Expand All @@ -50,7 +50,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: fv
run: make create-cluster fv
env:
Expand All @@ -63,7 +63,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: fv-sharding
run: make create-cluster fv-sharding
env:
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: fv-agentless
run: make create-cluster fv-agentless
env:
Expand All @@ -89,7 +89,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: fv-pullmode
run: make create-cluster-pullmode fv-pullmode
env:
Expand All @@ -102,7 +102,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
with:
go-version: 1.26.6
go-version: 1.27.1
- name: fv
run: make create-cluster-infra fv-namespace
env:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.26.6 AS builder
FROM golang:1.27.1 AS builder

ARG BUILDOS
ARG TARGETARCH
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ KIND := $(TOOLS_BIN_DIR)/kind
KUBECTL := $(TOOLS_BIN_DIR)/kubectl
CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl

GOLANGCI_LINT_VERSION := "v2.12.2"
CLUSTERCTL_VERSION := v1.13.4
GOLANGCI_LINT_VERSION := "v2.13.2"
CLUSTERCTL_VERSION := v1.14.2

KUSTOMIZE_VER := v5.8.0
KUSTOMIZE_BIN := kustomize
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Classifier currently supports the following classification criteria:
1. Kubernetes version
2. Kubernetes resources

For instance, this Classifier instance will match any cluster whose Kubernetes version is greater than or equal to "v1.24.0" and strictly less than "v1.26.6"
For instance, this Classifier instance will match any cluster whose Kubernetes version is greater than or equal to "v1.24.0" and strictly less than "v1.27.1"

```
apiVersion: lib.projectsveltos.io/v1beta1
Expand All @@ -45,7 +45,7 @@ spec:
- comparison: GreaterThanOrEqualTo
version: 1.24.0
- comparison: LessThan
version: 1.26.6
version: 1.27.1
```

When a cluster is a match for a Classifier instances, all classifierLabels will be automatically added to the Cluster instance.
Expand All @@ -59,8 +59,8 @@ Refer to [examples](./examples/) for more complex examples.
## A simple use case: upgrade helm charts automatically when Kubernetes cluster is upgraded
Suppose you are managing several Kubernetes clusters with different versions.
And you want to deploy:
1. OPA Gatekeeper version 3.10.0 in any Kubernetes cluster whose version is >= v1.26.6
2. OPA Gatekeeper version 3.9.0 in any Kubernetes cluster whose version is >= v1.24.0 && < v1.26.6
1. OPA Gatekeeper version 3.10.0 in any Kubernetes cluster whose version is >= v1.27.1
2. OPA Gatekeeper version 3.9.0 in any Kubernetes cluster whose version is >= v1.24.0 && < v1.27.1

You can create following ClusterProfiles and Classifiers in the management cluster:
```
Expand Down Expand Up @@ -116,7 +116,7 @@ spec:
value: v3-10
kubernetesVersionConstraints:
- comparison: GreaterThanOrEqualTo
version: 1.26.6
version: 1.27.1
```

```
Expand All @@ -132,7 +132,7 @@ spec:
- comparison: GreaterThanOrEqualTo
version: 1.24.0
- comparison: LessThan
version: 1.26.6
version: 1.27.1
```

With the above configuration:
Expand Down
22 changes: 11 additions & 11 deletions controllers/classifier_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,21 +218,21 @@ func (r *ClassifierReconciler) reconcileDelete(
err = r.undeployClassifier(ctx, classifierScope, f, logger)
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to undeploy")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}
}

err = removeClassifierReports(ctx, r.Client, classifierScope.Classifier, logger)
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to remove classifierReports")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}

if r.ClassifierReportMode == CollectFromManagementCluster {
err = removeAccessRequest(ctx, r.Client, logger)
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to remove accessRequest")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}
}

Expand Down Expand Up @@ -279,7 +279,7 @@ func (r *ClassifierReconciler) reconcileNormal(
matchingClusters, err := r.syncAndGetMatchingClusters(ctx, classifierScope, logger)
if err != nil {
logger.V(logs.LogDebug).Error(err, "failed to get matching clusters")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}
trackMatchingClusters(classifierScope.Classifier.Name, len(matchingClusters), logger)

Expand All @@ -288,44 +288,44 @@ func (r *ClassifierReconciler) reconcileNormal(
if err != nil {
// Use Error level because this indicates a failure to clean up resources
logger.V(logs.LogDebug).Error(err, "failed to clean up labels/registrations for non-matching clusters")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

// For every currently matching cluster, update label ownership registrations
matchingStatuses, err := r.updateMatchingClustersAndRegistrations(ctx, classifierScope, matchingClusters, logger)
if err != nil {
logger.V(logs.LogDebug).Error(err, "failed to update status/registrations for matching clusters")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}
trackLabelConflicts(classifierScope.Classifier.Name, countUnManagedLabelClusters(matchingStatuses), logger)

// Apply the labels to the clusters
err = r.updateLabelsOnMatchingClusters(ctx, classifierScope, matchingStatuses, logger)
if err != nil {
logger.V(logs.LogDebug).Error(err, "failed to apply labels to matching clusters")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

err = r.ensureClassifierReports(ctx, classifierScope)
if err != nil {
logger.V(logs.LogDebug).Error(err, "failed to ensure ClassifierReports")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

if err := r.updateMaps(ctx, classifierScope); err != nil {
logger.V(logs.LogDebug).Error(err, "failed to update internal maps")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

f := getHandlersForFeature(libsveltosv1beta1.FeatureClassifier)

if err := r.deployClassifier(ctx, classifierScope, f, logger); err != nil {
logger.V(logs.LogInfo).Error(err, "failed to deploy")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

if hasUnManagedLabels(matchingStatuses) {
return reconcile.Result{Requeue: true, RequeueAfter: conflictRequeueAfter}, nil
return reconcile.Result{RequeueAfter: conflictRequeueAfter}, nil
}

logger.V(logs.LogDebug).Info("Reconcile success")
Expand Down
6 changes: 6 additions & 0 deletions controllers/classifier_deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -1339,6 +1339,12 @@ func (r *ClassifierReconciler) proceedDeployingClassifierInPullMode(ctx context.
case libsveltosv1beta1.FeatureStatusFailedNonRetriable, libsveltosv1beta1.FeatureStatusRemoving,
libsveltosv1beta1.FeatureStatusAgentRemoving, libsveltosv1beta1.FeatureStatusRemoved:
logger.V(logs.LogDebug).Info("proceed deploying")
case libsveltosv1beta1.FeatureStatusBlocked:
// Blocked is set by addon-controller while a predecessor ClusterSummary waits on a
// successor (TransitionFrom) or dependency (DependsOn). Classifier has neither
// concept and the agent never reports it in a ConfigurationGroup, so this case is
// unreachable in practice. Listed only to satisfy exhaustive.
logger.V(logs.LogDebug).Info("proceed deploying")
}
} else {
clusterInfo.Status = libsveltosv1beta1.SveltosStatusProvisioning
Expand Down
4 changes: 2 additions & 2 deletions controllers/controllers_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,15 @@ func getClassifierReport(classifierName, clusterNamespace, clusterName string) *
}

func getClassifierInstance(name string) *libsveltosv1beta1.Classifier {
classifierLabels := []libsveltosv1beta1.ClassifierLabel{{Key: classifierLabelVersion, Value: "v1.26.6"}}
classifierLabels := []libsveltosv1beta1.ClassifierLabel{{Key: classifierLabelVersion, Value: "v1.27.1"}}
return &libsveltosv1beta1.Classifier{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
Spec: libsveltosv1beta1.ClassifierSpec{
KubernetesVersionConstraints: []libsveltosv1beta1.KubernetesVersionConstraint{
{
Version: "1.26.6",
Version: "1.27.1",
Comparison: string(libsveltosv1beta1.ComparisonEqual),
},
},
Expand Down
16 changes: 8 additions & 8 deletions controllers/mgmtcluster_classifier_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,22 @@ func (r *ManagementClusterClassifierReconciler) reconcileNormal(
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to build cluster sets")
_ = setMgmtClassifierFailureMessage(ctx, r.Client, mcc, err.Error())
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}
trackMgmtClusterMatchingClusters(mcc.Name, len(newClusters), logger)

km, err := keymanager.GetKeyManagerInstance(ctx, r.Client)
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to get keymanager")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

fakeClassifier := mgmtClassifierAsClassifier(mcc)

// Remove labels from clusters that are no longer matched and delete their reports.
if err := r.removeStaleClusterLabels(ctx, fakeClassifier, mcc.Name, oldClusters, newClusters, logger); err != nil {
logger.V(logs.LogInfo).Error(err, "failed to remove stale cluster labels")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}, nil
return reconcile.Result{RequeueAfter: normalRequeueAfter}, nil
}

conflictCount := 0
Expand Down Expand Up @@ -181,7 +181,7 @@ func (r *ManagementClusterClassifierReconciler) reconcileNormal(
r.syncGVKWatches(mcc, logger)

if conflictCount > 0 {
return reconcile.Result{Requeue: true, RequeueAfter: conflictRequeueAfter}, nil
return reconcile.Result{RequeueAfter: conflictRequeueAfter}, nil
}

logger.V(logs.LogDebug).Info("Reconcile success")
Expand All @@ -197,13 +197,13 @@ func (r *ManagementClusterClassifierReconciler) reconcileDelete(
existingReports, err := listMgmtClassifierReports(ctx, r.Client, mcc.Name)
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to list reports")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}

km, err := keymanager.GetKeyManagerInstance(ctx, r.Client)
if err != nil {
logger.V(logs.LogInfo).Error(err, "failed to get keymanager")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}

fakeClassifier := mgmtClassifierAsClassifier(mcc)
Expand All @@ -229,15 +229,15 @@ func (r *ManagementClusterClassifierReconciler) reconcileDelete(
keysToRemove, logger); err != nil {
logger.V(logs.LogInfo).Error(err, fmt.Sprintf("failed to remove labels from cluster %s/%s",
report.Spec.ClusterNamespace, report.Spec.ClusterName))
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}
}

km.RemoveAllRegistrations(fakeClassifier, report.Spec.ClusterNamespace, report.Spec.ClusterName, clusterType)

if err := r.Delete(ctx, report); err != nil && !apierrors.IsNotFound(err) {
logger.V(logs.LogInfo).Error(err, "failed to delete report")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}
}

Expand Down
2 changes: 1 addition & 1 deletion controllers/sveltoscluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func cleanClusterStaleResources(ctx context.Context, c client.Client,
if err != nil {
logger.V(logs.LogInfo).Info(
fmt.Sprintf("failed to remove sveltos-agent resources from management cluster: %v", err))
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}, nil
return reconcile.Result{RequeueAfter: deleteRequeueAfter}, nil
}

return reconcile.Result{}, nil
Expand Down
4 changes: 2 additions & 2 deletions examples/kubernetes_version.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Following Classifier will match any Cluster whose
# Kubernetes version is >= v1.24.0 and < v1.26.6
# Kubernetes version is >= v1.24.0 and < v1.27.1
apiVersion: lib.projectsveltos.io/v1beta1
kind: Classifier
metadata:
Expand All @@ -12,4 +12,4 @@ spec:
- comparison: GreaterThanOrEqualTo
version: 1.24.0
- comparison: LessThan
version: 1.26.6
version: 1.27.1
4 changes: 2 additions & 2 deletions examples/multiple_constraints.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Following Classifier will match any Cluster whose
# Kubernetes version is >= v1.24.0 and < v1.26.6
# Kubernetes version is >= v1.24.0 and < v1.27.1
apiVersion: lib.projectsveltos.io/v1beta1
kind: Classifier
metadata:
Expand All @@ -10,7 +10,7 @@ spec:
value: multiple
kubernetesVersionConstraints:
- comparison: GreaterThanOrEqualTo
version: 1.26.6
version: 1.27.1
deployedResourceConstraint:
- group: ""
version: v1
Expand Down
Loading