update controller-gen

.github/workflows/upload-helm-chart.yml

@@ -27,6 +27,9 @@ jobs:
       - name: Build chart
         run: |
           VERSION=$(echo "${{github.event.release.tag_name }}" | sed 's/v//g')
+          sed -i "s/^version:.*$/version: ${VERSION}/"        ./helm/Chart.yaml
+          sed -i "s/^appVersion:.*$/appVersion: v${VERSION}/" ./helm/Chart.yaml
+          make docs
           helm package ./helm/ --version $VERSION --app-version v$VERSION -d dist
 
       - name: Install chart-releaser

Dockerfile

@@ -1,4 +1,4 @@
-FROM bitnami/golang:1.18 as builder
+FROM bitnami/golang:1.19 as builder
 
 WORKDIR /build
 

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true,crdVersions=v1"
+CRD_OPTIONS ?= "crd"
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -71,36 +71,37 @@ mocks: mockgen
 lint-helm:
 	helm lint helm/ --set webhook.enabled=true --set webhook.certManager.enabled=true
 
-CONTROLLER_GEN = ./bin/controller-gen
-controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
-
-# go-get-tool will 'go get' any package $2 and install it to $1.
-PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-define go-get-tool
-@[ -f $(1) ] || { \
-set -e ;\
-echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
-}
-endef
-
-KUSTOMIZE = ./bin/kustomize
-kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
-
-# Generate bundle manifests and metadata, then validate generated files.
-.PHONY: bundle
-bundle: manifests
-	operator-sdk generate kustomize manifests -q
-	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
-	operator-sdk bundle validate ./bundle
-
-# Build the bundle image.
-.PHONY: bundle-build
-bundle-build:
-	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
+## Location to install dependencies to
+LOCALBIN ?= $(shell pwd)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
+
+## Tool Binaries
+CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
+SEMVER ?= $(LOCALBIN)/semver
+HELM_DOCS ?= $(LOCALBIN)/helm-docs
+MOCKGEN ?= $(LOCALBIN)/mockgen
+
+## Tool Versions
+CONTROLLER_TOOLS_VERSION ?= v0.10.0
+SEMVER_VERSION ?= latest
+HELM_DOCS_VERSION ?= v1.11.0
+MOCKGEN_VERSION ?= v1.6.0
+
+.PHONY: controller-gen
+controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
+$(CONTROLLER_GEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
+
+.PHONY: helm-docs
+helm-docs: $(HELM_DOCS) ## Download helm-docs locally if necessary.
+$(HELM_DOCS): $(LOCALBIN)
+	test -s $(LOCALBIN)/helm-docs || GOBIN=$(LOCALBIN) go install github.com/norwoodj/helm-docs/cmd/helm-docs@$(HELM_DOCS_VERSION)
+
+.PHONY: mockgen
+mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
+$(MOCKGEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/mockgen|| GOBIN=$(LOCALBIN) go install github.com/golang/mock/mockgen@$(MOCKGEN_VERSION)
 
 GORELEASER = ./bin/goreleaser
 goreleaser: ## Download goreleaser locally if necessary.

go.mod

@@ -1,6 +1,6 @@
 module github.com/bakito/k8s-event-logger-operator
 
-go 1.18
+go 1.19
 
 require (
 	github.com/bakito/operator-utils v1.3.2

helm/crds/eventlogger.bakito.ch_eventloggers.yaml

@@ -1,10 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
+    controller-gen.kubebuilder.io/version: v0.10.0
   creationTimestamp: null
   name: eventloggers.eventlogger.bakito.ch
 spec:
@@ -161,9 +160,3 @@ spec:
         type: object
     served: true
     storage: true
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []