Merge pull request #2297 from JoelSpeed/migrate-kube-sigs-kal

Move from JoelSpeed/kal to kubernetes-sigs/kube-api-linter

Author: openshift-merge-bot[bot]

.golangci.yaml

@@ -1,13 +1,14 @@
 linters-settings:
   custom:
-    kal:
+    kubeapilinter:
       type: "module"
-      description: KAL is the Kube-API-Linter and lints Kube like APIs based on API conventions and best practices.
+      description: kubeapilinter is the Kube-API-Linter and lints Kube like APIs based on API conventions and best practices.
       settings:
         linters:
           enable:
           - "maxlength"
           - "nobools"
+          - "nomaps"
           - "statussubresource"
         lintersConfig:
           conditions:
@@ -17,7 +18,7 @@ linters-settings:
 linters:
   disable-all: true
   enable:
-    - kal
+    - kubeapilinter
 issues:
   # We have a lot of existing issues.
   # Want to make sure that those adding new fields have an

hack/golangci-lint.sh

@@ -4,8 +4,8 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
 # Build codegen-crds when it's not present and not overriden for a specific file.
 if [ -z "${GOLANGCI_LINT:-}" ];then
-  ${TOOLS_MAKE} golangci-kal
-  GOLANGCI_LINT="${TOOLS_OUTPUT}/golangci-kal"
+  ${TOOLS_MAKE} golangci-kube-api-linter
+  GOLANGCI_LINT="${TOOLS_OUTPUT}/golangci-kube-api-linter"
 fi
 
 # In CI, HOME is set to / and is not writable.

tools/.custom-gcl.yml

@@ -1,6 +1,6 @@
-version:  v1.63.4
-name: golangci-kal
+version:  v1.64.8
+name: golangci-kube-api-linter
 destination: ./bin
 plugins:
-- module: 'github.com/JoelSpeed/kal'
-  version:  v0.0.0-20250305092907-abd233a9fed8
+- module: 'sigs.k8s.io/kube-api-linter'
+  version:  v0.0.0-20250424114031-64417f625b7d

tools/Makefile

@@ -57,11 +57,8 @@ deepcopy-gen: $(OUTPUT_DIR)/deepcopy-gen
 .PHONY:go-to-protobuf
 go-to-protobuf: $(OUTPUT_DIR)/go-to-protobuf
 
-.PHONY:golangci-kal
-golangci-kal: $(OUTPUT_DIR)/golangci-kal
-
-.PHONY:kal
-kal: $(OUTPUT_DIR)/kal
+.PHONY:golangci-kube-api-linter
+golangci-kube-api-linter: $(OUTPUT_DIR)/golangci-kube-api-linter
 
 .PHONY:openapi-gen
 openapi-gen: $(OUTPUT_DIR)/openapi-gen
@@ -111,14 +108,11 @@ $(OUTPUT_DIR)/golangci-lint: $(OUTPUT_DIR)/vendor-version
 	go build -mod=vendor -o $(OUTPUT_DIR)/golangci-lint ./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
 
 # The golangci-lint custom command relies on finding a module, this uses a workaround to init the go.mod in the kal directory.
-$(OUTPUT_DIR)/golangci-kal: $(OUTPUT_DIR)/vendor-version $(OUTPUT_DIR)/golangci-lint
+$(OUTPUT_DIR)/golangci-kube-api-linter: $(OUTPUT_DIR)/vendor-version $(OUTPUT_DIR)/golangci-lint
 	GOFLAGS=-mod=readonly $(OUTPUT_DIR)/golangci-lint custom
-	@ mv bin/golangci-kal $(OUTPUT_DIR)/golangci-kal
+	@ mv bin/golangci-kube-api-linter $(OUTPUT_DIR)/golangci-kube-api-linter
 	@ rmdir bin
 
-$(OUTPUT_DIR)/kal: $(OUTPUT_DIR)/vendor-version
-	go build -mod=vendor -o $(OUTPUT_DIR)/kal ./vendor/github.com/JoelSpeed/kal/cmd/kal
-
 $(OUTPUT_DIR)/openapi-gen: $(OUTPUT_DIR)/vendor-version
 	go build -mod=vendor -o $(OUTPUT_DIR)/openapi-gen ./vendor/k8s.io/code-generator/cmd/openapi-gen
 

tools/go.mod

@@ -4,8 +4,6 @@
 package tools
 
 import (
-	_ "github.com/JoelSpeed/kal"
-	_ "github.com/JoelSpeed/kal/cmd/kal"
 	_ "github.com/gogo/protobuf/gogoproto"
 	_ "github.com/gogo/protobuf/proto"
 	_ "github.com/gogo/protobuf/sortkeys"
@@ -17,4 +15,5 @@ import (
 	_ "k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo"
 	_ "k8s.io/code-generator/cmd/prerelease-lifecycle-gen"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
+	_ "sigs.k8s.io/kube-api-linter"
 )