Merge pull request #1448 from gianlucam76/release-1.2

(chore) prepare for release v1.2.0-beta.0

Author: gianlucam76

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
     "dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
     "context": "${localWorkspaceFolder}",
     "args": {
-      "GO_VERSION": "1.25.0",
+      "GO_VERSION": "1.25.2",
       "KUBECTX_VERSION": "0.9.5",
       "SVELTOSCTL_VERSION": "0.53.0"
     }

.github/workflows/main.yaml

@@ -18,7 +18,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Build
       run: make build
     - name: FMT
@@ -37,7 +37,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: ut
       run: make test
       env:
@@ -50,7 +50,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
       with:
@@ -78,7 +78,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
       with:
@@ -106,7 +106,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
       with:
@@ -134,7 +134,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
       with:
@@ -162,7 +162,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
       with:
@@ -190,7 +190,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: 1.25.0
+        go-version: 1.25.2
     - name: Free Disk Space (Ubuntu)
       uses: jlumbroso/free-disk-space@main
       with:

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.25.0 AS builder
+FROM golang:1.25.2 AS builder
 
 ARG BUILDOS
 ARG TARGETARCH

Dockerfile_WithGit

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.25.0 AS builder
+FROM golang:1.25.2 AS builder
 
 ARG BUILDOS
 ARG TARGETARCH

Makefile

@@ -27,7 +27,7 @@ OS ?= $(shell uname -s)
 OS := $(shell echo $(OS) | tr '[:upper:]' '[:lower:]')
 K8S_LATEST_VER ?= $(shell curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)
 export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= v1.1.1
+TAG ?= v1.2.0-beta.0
 
 .PHONY: all
 all: build
@@ -72,8 +72,8 @@ KIND := $(TOOLS_BIN_DIR)/kind
 KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 
 GOVULNCHECK_VERSION := "v1.1.4"
-GOLANGCI_LINT_VERSION := "v2.4.0"
-CLUSTERCTL_VERSION := "v1.11.0"
+GOLANGCI_LINT_VERSION := "v2.5.0"
+CLUSTERCTL_VERSION := "v1.11.2"
 
 KUSTOMIZE_VER := v5.7.0
 KUSTOMIZE_BIN := kustomize

config/default/manager_auth_proxy_patch.yaml

@@ -16,7 +16,7 @@ spec:
         - --shard-key=
         - --capi-onboard-annotation=
         - "--v=5"
-        - "--version=v1.1.1"
+        - "--version=v1.2.0-beta.0"
         - "--agent-in-mgmt-cluster=false"
         env:
         - name: GOMEMLIMIT

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: docker.io/projectsveltos/addon-controller:v1.1.1
+      - image: docker.io/projectsveltos/addon-controller:v1.2.0-beta.0
         name: controller

controllers/clustersummary_predicates.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/go-logr/logr"
@@ -308,7 +309,7 @@ func hasArtifactChanged(objNew, objOld client.Object) bool {
 	return false
 }
 
-func isArtifactSame(oldArtifact, newArtifact *sourcev1.Artifact) bool {
+func isArtifactSame(oldArtifact, newArtifact *meta.Artifact) bool {
 	if oldArtifact == nil && newArtifact == nil {
 		return true
 	}

controllers/clustersummary_predicates_test.go

@@ -23,6 +23,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -298,7 +299,7 @@ var _ = Describe("ClusterProfile Predicates: FluxSourcePredicates", func() {
 	It("Update reprocesses when artifact has changed", func() {
 		sourcePredicate := controllers.FluxGitRepositoryPredicate{Logger: logger}
 
-		gitRepository.Status.Artifact = &sourcev1.Artifact{
+		gitRepository.Status.Artifact = &meta.Artifact{
 			Revision: randomString(),
 		}
 
@@ -318,7 +319,7 @@ var _ = Describe("ClusterProfile Predicates: FluxSourcePredicates", func() {
 	It("Update does not reprocess when artifact has not changed", func() {
 		sourcePredicate := controllers.FluxGitRepositoryPredicate{Logger: logger}
 
-		gitRepository.Status.Artifact = &sourcev1.Artifact{
+		gitRepository.Status.Artifact = &meta.Artifact{
 			Revision: randomString(),
 		}
 

controllers/handlers_kustomize_test.go

@@ -31,6 +31,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
+	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	"github.com/gdexlab/go-render/render"
 	corev1 "k8s.io/api/core/v1"
@@ -261,7 +262,7 @@ var _ = Describe("Hash methods", func() {
 					Namespace: randomString(),
 				},
 				Status: sourcev1.GitRepositoryStatus{
-					Artifact: &sourcev1.Artifact{
+					Artifact: &meta.Artifact{
 						Revision: randomString(),
 					},
 				},