From 974ce8fd6f422c99f8d3ccdd81bbd920728cdd51 Mon Sep 17 00:00:00 2001 From: Olha Yevtushenko Date: Wed, 21 Aug 2024 19:10:21 +0300 Subject: [PATCH] bump controller-gen to 0.16.1 --- Makefile | 18 ++++---- config/crd/bases/k6.io_k6s.yaml | 8 +++- config/crd/bases/k6.io_privateloadzones.yaml | 2 +- config/crd/bases/k6.io_testruns.yaml | 8 +++- config/rbac/role.yaml | 47 +------------------- 5 files changed, 26 insertions(+), 57 deletions(-) diff --git a/Makefile b/Makefile index 99f4325e..88dc757e 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) endif BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) +CONTROLLER_GEN_VERSION=v0.16.1 +CONTROLLER_GEN=$(GOBIN)/controller-gen + # Image to use for building Go GO_BUILDER_IMG ?= "golang:1.22" # Image URL to use all building/pushing image targets @@ -30,9 +33,9 @@ endif all: manager # Run tests -ENVTEST_VERSION ?= release-0.17 +ENVTEST_VERSION ?= latest # ref. https://github.com/kubernetes-sigs/controller-runtime/tree/main/tools/setup-envtest ENVTEST_ASSETS_DIR = $(shell pwd)/testbin -ENVTEST_K8S_VERSION ?= 1.24.1 +ENVTEST_K8S_VERSION ?= 1.30.0 GOOS=$(shell go env GOOS) GOARCH=$(shell go env GOARCH) KUBEBUILDER_ASSETS_ROOT=/tmp @@ -117,15 +120,12 @@ docker-push: # find or download controller-gen # download controller-gen if necessary controller-gen: -ifeq (, $(shell which controller-gen)) @{ \ - set -e ;\ - go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\ + if ! which $(CONTROLLER_GEN) || [ 'Version $(CONTROLLER_GEN_VERSION)' != "$$($(CONTROLLER_GEN) --version)" ]; then\ + set -e ;\ + go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION) ;\ + fi;\ } -CONTROLLER_GEN=$(GOBIN)/controller-gen -else -CONTROLLER_GEN=$(shell which controller-gen) -endif kustomize: ifeq (, $(shell which kustomize)) diff --git a/config/crd/bases/k6.io_k6s.yaml b/config/crd/bases/k6.io_k6s.yaml index 79afb06e..dcfa7ce2 100644 --- a/config/crd/bases/k6.io_k6s.yaml +++ b/config/crd/bases/k6.io_k6s.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: k6s.k6.io spec: group: k6.io @@ -718,6 +718,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -811,6 +812,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2468,6 +2470,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2561,6 +2564,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4241,6 +4245,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4334,6 +4339,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/crd/bases/k6.io_privateloadzones.yaml b/config/crd/bases/k6.io_privateloadzones.yaml index 3ce91732..d10910f8 100644 --- a/config/crd/bases/k6.io_privateloadzones.yaml +++ b/config/crd/bases/k6.io_privateloadzones.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: privateloadzones.k6.io spec: group: k6.io diff --git a/config/crd/bases/k6.io_testruns.yaml b/config/crd/bases/k6.io_testruns.yaml index 68432b28..ae6bf40b 100644 --- a/config/crd/bases/k6.io_testruns.yaml +++ b/config/crd/bases/k6.io_testruns.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: testruns.k6.io spec: group: k6.io @@ -716,6 +716,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -809,6 +810,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2466,6 +2468,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2559,6 +2562,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4239,6 +4243,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -4332,6 +4337,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 961a6901..cd7f689f 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -70,6 +70,8 @@ rules: - k6.io resources: - k6s + - privateloadzones + - testruns verbs: - create - delete @@ -83,53 +85,8 @@ rules: resources: - k6s/finalizers - k6s/status - verbs: - - get - - patch - - update -- apiGroups: - - k6.io - resources: - - privateloadzones - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - k6.io - resources: - privateloadzones/finalizers - verbs: - - get - - patch - - update -- apiGroups: - - k6.io - resources: - privateloadzones/status - verbs: - - get - - patch - - update -- apiGroups: - - k6.io - resources: - - testruns - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - k6.io - resources: - testruns/finalizers - testruns/status verbs: