Merge pull request #107 from leaseweb/feat/k8s-1-35-support

feat: K8s 1.35 Support

Author: suhasagasthya

.github/workflows/charts-lint.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v4.3.1
         with:
-          version: v3.18.6
+          version: v3.19.4
 
       - uses: actions/setup-python@v6
         with:

.github/workflows/pr-check.yml

@@ -11,10 +11,10 @@ jobs:
     name: Test & Build
     runs-on: ubuntu-24.04
     steps:
-      - name: Setup up Go 1.24
+      - name: Setup up Go 1.25
         uses: actions/setup-go@v6
         with:
-          go-version: "1.24"
+          go-version: "1.25"
 
       - name: Check out code
         uses: actions/checkout@v6

.golangci.yml

@@ -1,63 +1,83 @@
-linters-settings:
-  gci:
-    sections:
-      - standard
-      - default
-      - prefix(github.com/apache/cloudstack-kubernetes-provider)
-  gofumpt:
-    module-path: "github.com/apache/cloudstack-kubernetes-provider"
-  nolintlint:
-    # https://github.com/golangci/golangci-lint/issues/3228
-    allow-unused: true
-
+version: "2"
+run:
+  allow-parallel-runners: true
 linters:
+  default: all
   disable:
-    - goheader
+    - cyclop
     - depguard
-    - mnd
-    - varnamelen
-    - testpackage
-    - tagliatelle
-    - paralleltest
-    - ireturn
+    - dupl
     - err113
-    - gochecknoglobals
-    - wsl
     - exhaustive
-    - nosprintfhostport
-    - nonamedreturns
-    - interfacebloat
     - exhaustruct
-    - lll
-    - gomoddirectives
-    - godox
-    - gochecknoinits
     - funlen
-    - dupl
-    - cyclop
+    - gochecknoglobals
+    - gochecknoinits
+    - godox
+    - goheader
+    - gomoddirectives
     - inamedparam
-    # deprecated linters
-    - tenv
-  enable-all: true
-
+    - interfacebloat
+    - ireturn
+    - lll
+    - mnd
+    - nonamedreturns
+    - nosprintfhostport
+    - paralleltest
+    - tagliatelle
+    - testpackage
+    - varnamelen
+    - wsl
+    # TODO: Following Lint issues need to be fixed:
+    - embeddedstructfieldcheck
+    - funcorder
+    - wsl_v5
+    - noinlineerr
+  settings:
+    nolintlint:
+      allow-unused: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - dupl
+          - errcheck
+          - forbidigo
+          - gocognit
+          - goconst
+          - gocyclo
+          - gosec
+          - maintidx
+        path: (.+)_test.go$
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
 issues:
-  # Maximum issues count per one linter. Set to 0 to disable. Default is 50.
   max-issues-per-linter: 0
-  # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
   max-same-issues: 0
-  exclude-rules:
-    - path: (.+)_test.go$
-      linters:
-        - gocognit
-        - goconst
-        - gocyclo
-        - errcheck
-        - dupl
-        - gosec
-        - forbidigo
-        - maintidx
-
-run:
-  timeout: 10m
-  allow-parallel-runners: true
-
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - standard
+        - default
+        - prefix(github.com/apache/cloudstack-kubernetes-provider)
+    gofumpt:
+      module-path: github.com/apache/cloudstack-kubernetes-provider
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM golang:1.24 AS builder
+FROM golang:1.25 AS builder
 WORKDIR /app
 COPY . .
 RUN make clean && GOARCH=amd64 GOOS=linux CGO_ENABLED=0 make all

Makefile

@@ -40,9 +40,9 @@ BIN_DIR ?= bin
 GO_INSTALL := ./hack/go_install.sh
 
 GOLANGCI_LINT_BIN := golangci-lint
-GOLANGCI_LINT_VER := v1.64.8
+GOLANGCI_LINT_VER := v2.7.2
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
-GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
+GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
 ##@ Linting
 ## --------------------------------------

cloudstack/cloudstack_loadbalancer.go

@@ -1437,18 +1437,18 @@ func getLoadBalancerNetworkID(service *corev1.Service) string {
 
 // setServiceAnnotation is used to create/set or update an annotation on the Service object.
 func setServiceAnnotation(service *corev1.Service, key, value string) {
-	if service.ObjectMeta.Annotations == nil {
-		service.ObjectMeta.Annotations = map[string]string{}
+	if service.Annotations == nil {
+		service.Annotations = map[string]string{}
 	}
-	service.ObjectMeta.Annotations[key] = value
+	service.Annotations[key] = value
 }
 
 // deleteServiceAnnotation removes an annotation from the Service object.
 func deleteServiceAnnotation(service *corev1.Service, key string) {
-	if service.ObjectMeta.Annotations == nil {
+	if service.Annotations == nil {
 		return
 	}
-	delete(service.ObjectMeta.Annotations, key)
+	delete(service.Annotations, key)
 }
 
 // deleteLoadBalancerAnnotations removes all CloudStack load balancer annotations from the service.

cloudstack/cloudstack_loadbalancer_test.go

@@ -733,7 +733,7 @@ func TestRulesMapToString(t *testing.T) {
 				}
 				for _, expectedRule := range expectedRules {
 					found := false
-					for _, part := range parts {
+					for _, part := range parts { //nolint:modernize
 						if part == expectedRule {
 							found = true
 

cloudstack/constants.go

@@ -4,9 +4,12 @@ const (
 	// ProviderName is the name of this cloud provider.
 	ProviderName = "cloudstack"
 
-	// CloudStack protocol names.
-	ProtoTCP      = "tcp"
-	ProtoUDP      = "udp"
-	ProtoICMP     = "icmp"
+	// ProtoTCP is the CloudStack protocol name for TCP.
+	ProtoTCP = "tcp"
+	// ProtoUDP is the CloudStack protocol name for UDP.
+	ProtoUDP = "udp"
+	// ProtoICMP is the CloudStack protocol name for ICMP.
+	ProtoICMP = "icmp"
+	// ProtoTCPProxy is the CloudStack protocol name for TCP proxy.
 	ProtoTCPProxy = "tcp-proxy"
 )

cloudstack/util.go

@@ -74,7 +74,7 @@ func sanitizeLabel(value string) string {
 }
 
 // Sprintf255 behaves like fmt.Sprintf but limits the output to 255 characters.
-func Sprintf255(format string, a ...interface{}) string {
+func Sprintf255(format string, a ...any) string {
 	result := fmt.Sprintf(format, a...)
 	if len(result) > 255 {
 		return result[:255]