Bump toolset image

.github/workflows/docs.yml

@@ -11,13 +11,13 @@ on:
 
 jobs:
   docs_build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           ref: gh_pages
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
       - name: Install packages and deps
         run: |
           npm install @antora/cli @antora/site-generator-default

.github/workflows/lint.yml

@@ -22,11 +22,11 @@ jobs:
       - uses: actions/setup-go@v4
         name: Set up Go 1.x
         with:
-          go-version: "1.21.9"
+          go-version: "1.22.7"
         env:
           GO111MODULE: off
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         name: Checkout clowder
 
       - name: golangci-lint

.github/workflows/package.yml

@@ -11,13 +11,13 @@ on:
 jobs:
 
   testing:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/setup-go@v4
-        name: Set up golang 1.21
+      - uses: actions/setup-go@v5
+        name: Set up Go
         with:
-          go-version: '1.21.9'
+          go-version: '1.22.7'
       - name: Check out source code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Run Tests
         run: make test

Dockerfile.base

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM registry.access.redhat.com/ubi8/go-toolset:1.21.13-1.1727869850 as builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.22.7-5 as builder
 USER 0
 RUN dnf install -y openssh-clients git make which jq python3
 

Makefile

@@ -182,28 +182,34 @@ update-version: ## Updates the version in the image
 	$(shell echo -n $(CLOWDER_VERSION) > controllers/cloud.redhat.com/version.txt)
 	echo "Building version: $(CLOWDER_VERSION)"
 
-CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
-controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
-
-KUSTOMIZE = $(shell pwd)/bin/kustomize
-kustomize: ## Download kustomize locally if necessary.
-	$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
-
-ENVTEST = $(shell pwd)/bin/setup-envtest
-envtest: ## Download envtest-setup locally if necessary.
-	$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@d0396a3d6f9fb554ef2da382a3d0bf05f7565e65)
-
-# go-install-tool will 'go install' any package $2 and install it to $1.
-PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-define go-install-tool
-@[ -f $(1) ] || { \
-set -e ;\
-TMP_DIR=$$(mktemp -d) ;\
-cd $$TMP_DIR ;\
-$(GO_CMD) mod init tmp ;\
-echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin $(GO_CMD) install $(2) ;\
-rm -rf $$TMP_DIR ;\
-}
-endef
+##@ Build Dependencies
+
+## Location to install dependencies to
+LOCALBIN ?= $(shell pwd)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
+
+## Tool Binaries
+KUSTOMIZE ?= $(LOCALBIN)/kustomize
+CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
+ENVTEST ?= $(LOCALBIN)/setup-envtest
+
+## Tool Versions
+KUSTOMIZE_VERSION ?= v3.8.7
+CONTROLLER_TOOLS_VERSION ?= v0.16.5
+
+.PHONY: controller-gen
+controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
+$(CONTROLLER_GEN): $(LOCALBIN)
+	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
+
+KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
+.PHONY: kustomize
+kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
+$(KUSTOMIZE): $(LOCALBIN)
+	curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN)
+
+.PHONY: envtest
+envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
+$(ENVTEST): $(LOCALBIN)
+	GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

config/rbac/role.yaml

@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
@@ -23,19 +22,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - events
-  - namespaces
-  - persistentvolumeclaims
-  - secrets
-  - services
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - ""
   resources:
@@ -86,45 +72,7 @@ rules:
   - cloud.redhat.com
   resources:
   - clowdapps
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloud.redhat.com
-  resources:
-  - clowdapps/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloud.redhat.com
-  resources:
   - clowdenvironments
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - cloud.redhat.com
-  resources:
-  - clowdenvironments/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - cloud.redhat.com
-  resources:
   - clowdjobinvocations
   verbs:
   - create
@@ -137,6 +85,8 @@ rules:
 - apiGroups:
   - cloud.redhat.com
   resources:
+  - clowdapps/status
+  - clowdenvironments/status
   - clowdjobinvocations/status
   verbs:
   - get
@@ -173,41 +123,8 @@ rules:
   - kafka.strimzi.io
   resources:
   - kafkaconnects
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kafka.strimzi.io
-  resources:
   - kafkas
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kafka.strimzi.io
-  resources:
   - kafkatopics
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - kafka.strimzi.io
-  resources:
   - kafkausers
   verbs:
   - create

config/webhook/manifests.yaml

@@ -2,7 +2,6 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
@@ -29,7 +28,6 @@ webhooks:
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  creationTimestamp: null
   name: validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:

go.mod

@@ -1,6 +1,6 @@
 module github.com/RedHatInsights/clowder
 
-go 1.21.9
+go 1.22.7
 
 require (
 	github.com/RedHatInsights/crc-caddy-plugin v0.4.0