kubernetes-sigs
diff --git a/‎.github/workflows/apidiff.yml
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/apidiff.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/lint-sample.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/lint-sample.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/lint.yml
Lines changed: 2 additions & 2 deletions b/‎.github/workflows/lint.yml
Lines changed: 2 additions & 2 deletions
diff --git a/‎.github/workflows/verify.yml
Lines changed: 4 additions & 4 deletions b/‎.github/workflows/verify.yml
Lines changed: 4 additions & 4 deletions
diff --git a/‎.golangci.yml
Lines changed: 81 additions & 72 deletions b/‎.golangci.yml
Lines changed: 81 additions & 72 deletions
diff --git a/‎CONTRIBUTING.md
Lines changed: 1 addition & 2 deletions b/‎CONTRIBUTING.md
Lines changed: 1 addition & 2 deletions
diff --git a/‎Makefile
Lines changed: 5 additions & 4 deletions b/‎Makefile
Lines changed: 5 additions & 4 deletions
diff --git a/‎build/.goreleaser.yml
Lines changed: 1 addition & 1 deletion b/‎build/.goreleaser.yml
Lines changed: 1 addition & 1 deletion
diff --git a/‎cmd/cmd.go
Lines changed: 1 addition & 0 deletions b/‎cmd/cmd.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎cmd/version.go
Lines changed: 12 additions & 2 deletions b/‎cmd/version.go
Lines changed: 12 additions & 2 deletions
diff --git a/‎designs/crd_version_conversion.md
Lines changed: 2 additions & 2 deletions b/‎designs/crd_version_conversion.md
Lines changed: 2 additions & 2 deletions
@@ -24,7 +24,7 @@ jobs:
         with:
           go-version-file: go.mod
       - name: Execute go-apidiff
-        uses: joelanford/[email protected].2
+        uses: joelanford/[email protected].3
         with:
           compare-imports: true
           print-compatible: true
@@ -36,9 +36,9 @@ jobs:
         working-directory: ${{ matrix.folder }}
         run: make lint-config
       - name: Run linter
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.63.4
+          version: v2.1.0
           working-directory: ${{ matrix.folder }}
           args: --config .golangci.yml ./...
       - name: Run linter via makefile target
 
@@ -24,9 +24,9 @@ jobs:
       - name: Check linter configuration
         run: make lint-config
       - name: Run linter
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.63.4
+          version: v2.1.0
 
   yamllint:
     runs-on: ubuntu-latest
 
@@ -13,14 +13,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Validate PR Title Format
+        env:
+          TITLE: ${{ github.event.pull_request.title }}
         run: |
-          TITLE="${{ github.event.pull_request.title }}"
-          
           if [[ -z "$TITLE" ]]; then
             echo "Error: PR title cannot be empty."
             exit 1
           fi
-          
+
           if ! [[ "$TITLE" =~ ^($'\u26A0'|$'\u2728'|$'\U0001F41B'|$'\U0001F4D6'|$'\U0001F680'|$'\U0001F331') ]]; then
             echo "Error: Invalid PR title format."
             echo "Your PR title must start with one of the following indicators:"
@@ -32,5 +32,5 @@ jobs:
             echo "- Infra/Tests/Other: 🌱 (U+1F331)"
             exit 1
           fi
-          
+
           echo "PR title is valid: '$TITLE'"
@@ -1,92 +1,101 @@
+version: "2"
 run:
-  timeout: 5m
   allow-parallel-runners: true
-
-issues:
-  # don't skip warning about doc comments
-  # don't exclude the default set of lint
-  exclude-use-default: false
-  # restore some of the defaults
-  # (fill in the rest as needed)
-  exclude-rules:
-    - linters: [gosec]
-      path: "test/e2e/*"
-    - path: "hack/docs/*"
-      linters:
-        - lll
-        - gosec
-
-linters-settings:
-  govet:
-    enable-all: true
-    disable:
-      - fieldalignment
-      - shadow
-  nolintlint:
-    allow-unused: false
-  revive:
-    rules:
-      # The following rules are recommended https://github.com/mgechev/revive#recommended-configuration
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-        arguments:
-          # dot import should be ONLY allowed for ginkgo testing packages
-          - allowedPackages:
-              - "github.com/onsi/ginkgo/v2"
-              - "github.com/onsi/gomega"
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-      - name: if-return
-      - name: increment-decrement
-      - name: var-naming
-      - name: var-declaration
-      - name: package-comments
-        disabled: true  # TODO: Investigate if it should be enabled. Disabled for now due to many findings.
-      - name: range
-      - name: receiver-naming
-      - name: time-naming
-      - name: unexported-return
-      - name: indent-error-flow
-      - name: errorf
-      - name: empty-block
-      - name: superfluous-else
-      - name: unused-parameter
-      - name: unreachable-code
-      - name: redefines-builtin-id
-      #
-      # Rules in addition to the recommended configuration above.
-      #
-      - name: bool-literal-in-expr
-      - name: constant-logical-expr
-      - name: comment-spacings
-
 linters:
-  disable-all: true
+  default: none
   enable:
+    - asciicheck
+    - bidichk
+    - copyloopvar
     - dupl
     - errcheck
-    - copyloopvar
     - ginkgolinter
     - goconst
     - gocyclo
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - lll
     - misspell
-    - nolintlint
     - nakedret
+    - nolintlint
     - prealloc
     - revive
     - staticcheck
-    - typecheck
     - unconvert
     - unparam
     - unused
-
+    - wrapcheck
+    - whitespace
+  settings:
+    ginkgolinter:
+      forbid-focus-container: true
+      forbid-spec-pollution: true
+    govet:
+      disable:
+        - fieldalignment
+      enable-all: true
+    nolintlint:
+      allow-unused: false
+    revive:
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+          arguments:
+            - allowedPackages:
+                - github.com/onsi/ginkgo/v2
+                - github.com/onsi/gomega
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: exported
+        - name: if-return
+        - name: import-shadowing
+        - name: increment-decrement
+        - name: var-naming
+        - name: var-declaration
+        - name: package-comments
+          disabled: true
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+        - name: empty-block
+        - name: superfluous-else
+        - name: unused-parameter
+        - name: unreachable-code
+        - name: redefines-builtin-id
+        - name: bool-literal-in-expr
+        - name: constant-logical-expr
+        - name: comment-spacings
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - gosec
+        path: test/e2e/*
+      - linters:
+          - gosec
+          - lll
+        path: hack/docs/*
+      - linters:
+          - revive
+        text: 'should have comment or be unexported'
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
@@ -80,9 +80,8 @@ To manually setup run:
 ```shell
 # To generate an Kubebuilder local binary with your changes
 make install
-# To create the cluster and configure a CNI which supports NetworkPolicy
+# To create the cluster
 kind create cluster --config ./test/e2e/kind-config.yaml
-kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
 ```
 
 Now, you can for example, run in debug mode the `test/e2e/v4/e2e_suite_test.go`:
 
@@ -45,8 +45,11 @@ help: ## Display this help
 
 ##@ Build
 
+K8S_VERSION ?= $(shell go list -m -modfile=./testdata/project-v4/go.mod -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d.%d", $$3, $$4}')
+
 LD_FLAGS=-ldflags " \
     -X sigs.k8s.io/kubebuilder/v4/cmd.kubeBuilderVersion=$(shell git describe --tags --dirty --broken) \
+    -X sigs.k8s.io/kubebuilder/v4/cmd.kubernetesVendorVersion=$(K8S_VERSION) \
     -X sigs.k8s.io/kubebuilder/v4/cmd.goos=$(shell go env GOOS) \
     -X sigs.k8s.io/kubebuilder/v4/cmd.goarch=$(shell go env GOARCH) \
     -X sigs.k8s.io/kubebuilder/v4/cmd.gitCommit=$(shell git rev-parse HEAD) \
@@ -72,7 +75,7 @@ generate: generate-testdata generate-docs update-k8s-version ## Update/generate
 remove-spaces:
 	@echo "Removing trailing spaces"
 	@bash -c ' \
-		if [[ "$$(uname)" == "Linux" ]]; then \
+		if sed --version 2>&1 | grep -q "GNU"; then \
 			find . -type f -name "*.md" -exec sed -i "s/[[:space:]]*$$//" {} + || true; \
 		else \
 			find . -type f -name "*.md" -exec sed -i "" "s/[[:space:]]*$$//" {} + || true; \
@@ -124,8 +127,7 @@ yamllint:
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
-	set -e ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.63.4 ;\
+	GOBIN=$(shell pwd)/bin go install github.com/golangci/golangci-lint/v2/cmd/[email protected]  ;\
 	}
 
 .PHONY: apidiff
@@ -201,7 +203,6 @@ install-helm: ## Install the latest version of Helm locally
 helm-lint: install-helm ## Lint the Helm chart in testdata
 	helm lint testdata/project-v4-with-plugins/dist/chart
 
-K8S_VERSION ?= $(shell go list -m -modfile=./testdata/project-v4/go.mod -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d.%d", $$3, $$4}')
 .PHONY: update-k8s-version
 update-k8s-version: ## Update Kubernetes API version in version.go and .goreleaser.yml
 	@if [ -z "$(K8S_VERSION)" ]; then echo "Error: K8S_VERSION is empty"; exit 1; fi
 
@@ -46,7 +46,7 @@ builds:
       - darwin_amd64
       - darwin_arm64
     env:
-      - KUBERNETES_VERSION=1.32.1
+      - KUBERNETES_VERSION=1.33.0
       - CGO_ENABLED=0
 
 # Only binaries of the form "kubebuilder_${goos}_${goarch}" will be released.
 
@@ -55,6 +55,7 @@ func Run() {
 	c, err := cli.New(
 		cli.WithCommandName("kubebuilder"),
 		cli.WithVersion(versionString()),
+		cli.WithCliVersion(getKubebuilderVersion()),
 		cli.WithPlugins(
 			golangv4.Plugin{},
 			gov4Bundle,
 
@@ -27,7 +27,7 @@ const unknown = "unknown"
 // information in the release process
 var (
 	kubeBuilderVersion      = unknown
-	kubernetesVendorVersion = "1.32.1"
+	kubernetesVendorVersion = "1.33.0"
 	goos                    = unknown
 	goarch                  = unknown
 	gitCommit               = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
@@ -45,7 +45,7 @@ type version struct {
 	GoArch             string `json:"goArch"`
 }
 
-// versionString returns the CLI version
+// versionString returns the Full CLI version
 func versionString() string {
 	if kubeBuilderVersion == unknown {
 		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" {
@@ -62,3 +62,13 @@ func versionString() string {
 		goarch,
 	})
 }
+
+// getKubebuilderVersion returns only the CLI version string
+func getKubebuilderVersion() string {
+	if kubeBuilderVersion == unknown {
+		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" {
+			kubeBuilderVersion = info.Main.Version
+		}
+	}
+	return kubeBuilderVersion
+}
@@ -158,12 +158,12 @@ func (ch *conversionHandler) convertObject(src, dst runtime.Object) error {
 
     err = src.(conversion.Convertible).ConvertTo(hub)
     if err != nil {
-        return fmt.Errorf("%T failed to convert to hub version %T : %v", src, hub, err)
+        return fmt.Errorf("%T failed to convert to hub version %T : %w", src, hub, err)
     }
 
     err = dst.(conversion.Convertible).ConvertFrom(hub)
     if err != nil {
-        return fmt.Errorf("%T failed to convert from hub version %T : %v", dst, hub, err)
+        return fmt.Errorf("%T failed to convert from hub version %T : %w", dst, hub, err)
     }
     return nil
 }
Original file line number	Diff line number	Diff line change
`@@ -158,12 +158,12 @@ func (ch *conversionHandler) convertObject(src, dst runtime.Object) error {`
`158`	`158`
`159`	`159`	`err = src.(conversion.Convertible).ConvertTo(hub)`
`160`	`160`	`if err != nil {`
`161`		`- return fmt.Errorf("%T failed to convert to hub version %T : %v", src, hub, err)`
	`161`	`+ return fmt.Errorf("%T failed to convert to hub version %T : %w", src, hub, err)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`err = dst.(conversion.Convertible).ConvertFrom(hub)`
`165`	`165`	`if err != nil {`
`166`		`- return fmt.Errorf("%T failed to convert from hub version %T : %v", dst, hub, err)`
	`166`	`+ return fmt.Errorf("%T failed to convert from hub version %T : %w", dst, hub, err)`
`167`	`167`	`}`
`168`	`168`	`return nil`
`169`	`169`	`}`