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 .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
"context": "${localWorkspaceFolder}",
"args": {
"GO_VERSION": "1.26.6",
"GO_VERSION": "1.27.1",
"KUBECTX_VERSION": "0.9.5",
"SVELTOSCTL_VERSION": "0.53.0"
}
Expand Down
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
20 changes: 10 additions & 10 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,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 @@ -36,7 +36,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 @@ -49,7 +49,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 @@ -62,7 +62,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 new-fv
env:
Expand All @@ -75,7 +75,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 @@ -88,7 +88,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 @@ -101,7 +101,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-oidc
run: make create-cluster create-cluster-oidc fv-oidc
env:
Expand All @@ -114,7 +114,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 @@ -127,7 +127,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: new-fv-pullmode
run: make create-cluster-pullmode new-fv-pullmode
env:
Expand All @@ -140,7 +140,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
2 changes: 1 addition & 1 deletion Dockerfile_WithGit
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 @@ -79,8 +79,8 @@ KIND := $(TOOLS_BIN_DIR)/kind
KUBECTL := $(TOOLS_BIN_DIR)/kubectl

GOVULNCHECK_VERSION := "v1.1.4"
GOLANGCI_LINT_VERSION := "v2.12.2"
CLUSTERCTL_VERSION := v1.14.0
GOLANGCI_LINT_VERSION := "v2.13.2"
CLUSTERCTL_VERSION := v1.14.2
KIND_VERSION := v0.32.0

KUSTOMIZE_VER := v5.8.0
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/clustersummary_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func GetProfileRef(clusterSummary *ClusterSummary) (*corev1.ObjectReference, err
// GetProfileOwnerAndTier returns the (Cluster)Profile owning this clusterSummary and its tier.
// Returns nil if (Cluster)Profile does not exist anymore.
func GetProfileOwnerAndTier(ctx context.Context, c client.Client, clusterSummary *ClusterSummary,
) (client.Object, int32, error) {
) (profileOwner client.Object, tier int32, err error) {

for _, ref := range clusterSummary.OwnerReferences {
gv, err := schema.ParseGroupVersion(ref.APIVersion)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.22.0
name: clusterconfigurations.config.projectsveltos.io
spec:
group: config.projectsveltos.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.22.0
name: clusterprofiles.config.projectsveltos.io
spec:
group: config.projectsveltos.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.22.0
name: clusterpromotions.config.projectsveltos.io
spec:
group: config.projectsveltos.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.22.0
name: clusterreports.config.projectsveltos.io
spec:
group: config.projectsveltos.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.22.0
name: clustersummaries.config.projectsveltos.io
spec:
group: config.projectsveltos.io
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/config.projectsveltos.io_profiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.21.0
controller-gen.kubebuilder.io/version: v0.22.0
name: profiles.config.projectsveltos.io
spec:
group: config.projectsveltos.io
Expand Down
12 changes: 6 additions & 6 deletions controllers/clusterprofile_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (r *ClusterProfileReconciler) reconcileDelete(

if err := reconcileDeleteCommon(ctx, r.Client, profileScope,
configv1beta1.ClusterProfileFinalizer, logger); err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}
return reconcile.Result{RequeueAfter: deleteRequeueAfter}
}

r.cleanMaps(profileScope)
Expand All @@ -168,27 +168,27 @@ func (r *ClusterProfileReconciler) reconcileNormal(

if !controllerutil.ContainsFinalizer(profileScope.Profile, configv1beta1.ClusterProfileFinalizer) {
if err := addFinalizer(ctx, profileScope, configv1beta1.ClusterProfileFinalizer); err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}
}

// Get all clusters where deployment is required based on dependent ClusterProfile instances
depManager, err := dependencymanager.GetManagerInstance()
if err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}

// Get all clusters matching clusterSelector and ClusterRefs
matchingCluster, err := getMatchingClusters(ctx, r.Client, "", profileScope.GetSelector(),
profileScope.GetSpec().ClusterRefs, logger)
if err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}

// Get all clusters from referenced ClusterSets
clusterSetClusters, err := r.getClustersFromClusterSets(ctx, profileScope.GetSpec().SetRefs, logger)
if err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}
matchingCluster = append(matchingCluster, clusterSetClusters...)

Expand All @@ -204,7 +204,7 @@ func (r *ClusterProfileReconciler) reconcileNormal(
r.updateMaps(profileScope)

if err := reconcileNormalCommon(ctx, r.Client, profileScope, logger); err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}

logger.V(logs.LogDebug).Info("Reconcile success")
Expand Down
6 changes: 3 additions & 3 deletions controllers/clusterpromotion_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ func (r *ClusterPromotionReconciler) reconcileDelete(
if !promotionScope.ClusterPromotion.Spec.PreserveClusterProfilesOnDelete {
if err := r.cleanClusterProfiles(ctx, promotionScope.ClusterPromotion); err != nil {
promotionScope.V(logs.LogInfo).Error(err, "failed to clean ClusterProfiles")
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}
return reconcile.Result{RequeueAfter: deleteRequeueAfter}
}

if !r.allClusterProfilesGone(ctx, promotionScope.ClusterPromotion, promotionScope.Logger) {
msg := "not all ClusterProfiles are gone"
promotionScope.V(logs.LogInfo).Info(msg)
return reconcile.Result{Requeue: true, RequeueAfter: deleteRequeueAfter}
return reconcile.Result{RequeueAfter: deleteRequeueAfter}
}
}

Expand All @@ -183,7 +183,7 @@ func (r *ClusterPromotionReconciler) reconcileNormal(
if !controllerutil.ContainsFinalizer(promotionScope.ClusterPromotion, configv1beta1.ClusterPromotionFinalizer) {
if err := r.addFinalizer(ctx, promotionScope); err != nil {
logger.V(logs.LogInfo).Error(err, "failed to add finalizer")
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}
}

Expand Down
4 changes: 2 additions & 2 deletions controllers/clusterset_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,14 +138,14 @@ func (r *ClusterSetReconciler) reconcileNormal(
matchingCluster, err := getMatchingClusters(ctx, r.Client, "", setScope.GetSelector(),
setScope.GetSpec().ClusterRefs, logger)
if err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}

setScope.SetMatchingClusterRefs(matchingCluster)

err = selectClusters(ctx, r.Client, setScope, logger)
if err != nil {
return reconcile.Result{Requeue: true, RequeueAfter: normalRequeueAfter}
return reconcile.Result{RequeueAfter: normalRequeueAfter}
}

r.updateMaps(setScope)
Expand Down
Loading