Merge pull request #218 from gianlucam76/prep

(chore) Prepare for release v1.11.0

Author: gianlucam76

.github/workflows/main.yaml

@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
     - name: Set up Go
       uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
-        go-version: 1.26.3
+        go-version: 1.26.4
     - name: Build
       run: make build
     - name: FMT
@@ -33,11 +33,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
     - name: Set up Go
       uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
-        go-version: 1.26.3
+        go-version: 1.26.4
     - name: ut
       run: make test
       env:
@@ -46,11 +46,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
     - name: Set up Go
       uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
-        go-version: 1.26.3
+        go-version: 1.26.4
     - name: fv
       run: make create-cluster fv
       env:
@@ -59,11 +59,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout
-      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
     - name: Set up Go
       uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
-        go-version: 1.26.3
+        go-version: 1.26.4
     - name: fv
       run: make create-cluster-infra fv-namespace
       env:

.golangci.yaml

@@ -20,7 +20,7 @@ linters:
     - goconst
     - gocritic
     - gocyclo
-    - gomodguard
+    - gomodguard_v2
     - goprintffuncname
     - gosec
     - govet
@@ -72,12 +72,10 @@ linters:
         - style
     gocyclo:
       min-complexity: 20
-    gomodguard:
+    gomodguard_v2:
       blocked:
-        modules:
-          - k8s.io/kubernetes:
-              reason: There is no good, avoidable reason to use this package and often leads to issues such as https://bit.ly/3dlKScY. However, if you disagree please include @ravchama in code review highlighting the reason.
-        local-replace-directives: true
+        - module: k8s.io/kubernetes
+      local-replace-directives: true
     govet:
       settings:
         printf:
@@ -132,6 +130,7 @@ linters:
       - third_party$
       - builtin$
       - examples$
+      - internal/test/helpers
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
@@ -149,3 +148,4 @@ formatters:
       - third_party$
       - builtin$
       - examples$
+      - internal/test/helpers

Dockerfile

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

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.35.0
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION = 1.36.0
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -36,7 +36,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 ?= main
+TAG ?= v1.11.0
 
 ## Tool Binaries
 CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
@@ -49,7 +49,7 @@ KIND := $(TOOLS_BIN_DIR)/kind
 KUBECTL := $(TOOLS_BIN_DIR)/kubectl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/clusterctl
 
-GOLANGCI_LINT_VERSION := "v2.11.4"
+GOLANGCI_LINT_VERSION := "v2.12.1"
 CLUSTERCTL_VERSION := v1.13.2
 
 KUSTOMIZE_VER := v5.8.0

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/shard-controller:main
+      - image: docker.io/projectsveltos/shard-controller:v1.11.0
         name: manager

go.mod

@@ -1,6 +1,6 @@
 module github.com/projectsveltos/shard-controller
 
-go 1.26.3
+go 1.26.4
 
 require (
 	github.com/TwiN/go-color v1.4.1

hack/tools/get-golangci-lint.sh

@@ -2,5 +2,23 @@
 
 set -euo pipefail
 
-# Define the URL for downloading the golangci-lint archive
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(pwd)/bin "$1"
+VERSION="$1"
+BINARY="$(pwd)/bin/golangci-lint"
+
+# Skip download if the binary already exists at the requested version.
+if [[ -x "$BINARY" ]] && "$BINARY" --version 2>/dev/null | grep -qF "${VERSION#v}"; then
+    echo "golangci-lint ${VERSION} already installed, skipping download"
+    exit 0
+fi
+
+# Retry up to 3 times — the GitHub CDN occasionally returns 504.
+for attempt in 1 2 3; do
+    if curl -sSfL https://golangci-lint.run/install.sh | sh -s -- -b "$(pwd)/bin" "$VERSION"; then
+        exit 0
+    fi
+    echo "golangci-lint download attempt ${attempt} failed, retrying..." >&2
+    sleep $((attempt * 5))
+done
+
+echo "golangci-lint download failed after 3 attempts" >&2
+exit 1

hack/tools/go.mod

@@ -1,6 +1,6 @@
 module github.com/projectsveltos/addon-controller/hack/tools
 
-go 1.26.3
+go 1.26.4
 
 require (
 	github.com/a8m/envsubst v1.4.3

internal/controller/utils_test.go

@@ -684,6 +684,10 @@ var _ = Describe("Utils", func() {
 	})
 
 	Context("applyShardPatches", func() {
+		const (
+			patchValue = `[{"op":"add","path":"/metadata/labels/injected","value":"yes"}]`
+		)
+
 		It("returns original bytes unchanged when patches is empty", func() {
 			original := []byte(fmt.Sprintf(nginxDeploymentTemplate, sveltosNamespace))
 			result, err := controller.ApplyShardPatches(original, nil, logger)
@@ -695,7 +699,7 @@ var _ = Describe("Utils", func() {
 			deployYAML := []byte(fmt.Sprintf(nginxDeploymentTemplate, sveltosNamespace))
 			patches := []libsveltosv1beta1.Patch{
 				{
-					Patch:  `[{"op":"add","path":"/metadata/labels/injected","value":"yes"}]`,
+					Patch:  patchValue,
 					Target: &libsveltosv1beta1.PatchSelector{Group: "apps", Kind: "Deployment"},
 				},
 			}
@@ -710,7 +714,7 @@ var _ = Describe("Utils", func() {
 			deployYAML := []byte(fmt.Sprintf(nginxDeploymentTemplate, sveltosNamespace))
 			patches := []libsveltosv1beta1.Patch{
 				{
-					Patch:  `[{"op":"add","path":"/metadata/labels/injected","value":"yes"}]`,
+					Patch:  patchValue,
 					Target: &libsveltosv1beta1.PatchSelector{Group: "", Kind: "ConfigMap"},
 				},
 			}

manifest/manifest.yaml

@@ -166,7 +166,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: docker.io/projectsveltos/shard-controller:main
+        image: docker.io/projectsveltos/shard-controller:v1.11.0
         livenessProbe:
           failureThreshold: 3
           httpGet: