chore: generate applyconfigurations for API

Makefile

@@ -45,9 +45,22 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases
 
 .PHONY: generate
-generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
+generate: controller-gen k8s-client-gen ## Generate code required for K8s API and clients
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
+GO_MODULE = $(shell go list -m)
+API_DIRS = $(shell find api -mindepth 2 -type d | sed "s|^|$(shell go list -m)/|" | paste -sd ",")
+.PHONY: k8s-client-gen
+k8s-client-gen: applyconfiguration-gen
+	rm -rf internal/client/applyconfiguration
+	@echo ">> generating internal/client/applyconfiguration..."
+	$(APPLYCONFIGURATION_GEN) \
+		--go-header-file 	hack/boilerplate.go.txt \
+		--input-dirs		"$(API_DIRS)" \
+		--output-package  	"$(GO_MODULE)/internal/client/applyconfiguration" \
+		--trim-path-prefix 	"$(GO_MODULE)" \
+		--output-base    	"."
+
 .PHONY: fmt
 fmt: ## Run go fmt against code.
 	go fmt ./...
@@ -163,6 +176,7 @@ $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
 ## Tool Binaries
+APPLYCONFIGURATION_GEN ?= $(LOCALBIN)/applyconfiguration-gen
 KUSTOMIZE ?= $(LOCALBIN)/kustomize
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
@@ -171,11 +185,20 @@ GOIMPORTS ?= $(LOCALBIN)/goimports
 ## Tool Versions
 # renovate: datasource=go depName=sigs.k8s.io/kustomize/kustomize/v5
 KUSTOMIZE_VERSION ?= v5.2.1
+# renovate: datasource=go depName=github.com/kubernetes/code-generator
+CODE_GENERATOR_VERSION ?= v0.28.3
 # renovate: datasource=go depName=sigs.k8s.io/controller-tools
 CONTROLLER_TOOLS_VERSION ?= v0.13.0
 # renovate: datasource=go depName=golang.org/x/tools/cmd/goimports packageName=golang.org/x/tools
 GOIMPORTS_VERSION ?= v0.14.0
 
+.PHONY: applyconfiguration-gen
+applyconfiguration-gen: $(APPLYCONFIGURATION_GEN) ## Download applyconfiguration-gen locally if necessary.
+$(APPLYCONFIGURATION_GEN): $(LOCALBIN)
+	# FIXME: applyconfiguration-gen does not currently support any flag for obtaining version
+	test -s $(LOCALBIN)/applyconfiguration-gen || \
+	GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/applyconfiguration-gen@$(CODE_GENERATOR_VERSION)
+
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
 $(KUSTOMIZE): $(LOCALBIN)

api/stas/v1alpha1/containerimagescan_types.go

@@ -21,9 +21,10 @@ type Image struct {
 }
 
 type Workload struct {
-	metav1.GroupKind `json:",inline"`
-	Name             string `json:"name"`
-	ContainerName    string `json:"containerName"`
+	Group         string `json:"group"`
+	Kind          string `json:"kind"`
+	Name          string `json:"name"`
+	ContainerName string `json:"containerName"`
 }
 
 type ScanConfig struct {
@@ -110,6 +111,7 @@ type ContainerImageScanStatus struct {
 	VulnerabilitySummary *VulnerabilitySummary `json:"vulnerabilitySummary,omitempty"`
 }
 
+//+genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:resource:shortName={cis}

api/stas/v1alpha1/doc.go

@@ -0,0 +1,5 @@
+// Package v1alpha1 contains API Schema definitions for the system v1alpha1 API group
+// FIXME: https://github.com/kubernetes/code-generator/issues/150
+// This was the only setup I could make work. Somehow the file location matters.
+// +groupName=stas.statnett.no
+package v1alpha1

api/stas/v1alpha1/groupversion_info.go

@@ -1,6 +1,5 @@
 // Package v1alpha1 contains API Schema definitions for the stas v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=stas.statnett.no
 package v1alpha1
 
 import (
@@ -9,11 +8,11 @@ import (
 )
 
 var (
-	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "stas.statnett.no", Version: "v1alpha1"}
+	// SchemeGroupVersion is group version used to register these objects.
+	SchemeGroupVersion = schema.GroupVersion{Group: "stas.statnett.no", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme

go.mod

@@ -22,6 +22,7 @@ require (
 	sigs.k8s.io/cli-utils v0.35.0
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -90,5 +91,4 @@ require (
 	k8s.io/apiextensions-apiserver v0.28.3 // indirect
 	k8s.io/component-base v0.28.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )