Update Tools and API Versions

Makefile

@@ -3,21 +3,22 @@
 # See https://github.com/kubernetes-sigs/kustomize for the last version
 KUSTOMIZE_VERSION ?= [email protected]
 # https://github.com/kubernetes-sigs/controller-tools/releases for the last version
-CONTROLLER_GEN_VERSION ?= v0.8.0
+CONTROLLER_GEN_VERSION ?= v0.12.0
 # See https://pkg.go.dev/sigs.k8s.io/controller-runtime/tools/setup-envtest?tab=versions for the last version
-ENVTEST_VERSION ?= v0.0.0-20221022092956-090611b34874
+# Why to use the git commit sha? https://github.com/kubernetes-sigs/controller-runtime/issues/1670
+ENVTEST_VERSION ?= v0.0.0-20230620070423-a784ee78d04b
+# See https://github.com/onsi/ginkgo/releases for the last version
+GINKGO_VERSION ?= v2.11.0
 # See https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions for the last version
-GOIMPORTS_VERSION ?= v0.6.0
-# See github.com/operator-framework/operator-registry/releases for the last version
-OPM_VERSION ?= v1.26.2
-# See github.com/operator-framework/operator-sdk/releases for the last version
-OPERATOR_SDK_VERSION ?= v1.26.0
+GOIMPORTS_VERSION ?= v0.10.0
 # See https://github.com/slintes/sort-imports/releases for the last version
 SORT_IMPORTS_VERSION = v0.2.1
-# See https://github.com/onsi/ginkgo/releases for the last version
-GINKGO_VERSION ?= v2.9.5
+# See https://github.com/operator-framework/operator-registry/releases for the last version
+OPM_VERSION ?= v1.28.0
+# See https://github.com/operator-framework/operator-sdk/releases for the last version
+OPERATOR_SDK_VERSION ?= v1.30.0
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.23
+ENVTEST_K8S_VERSION = 1.27
 
 # IMAGE_REGISTRY used to indicate the registery/group for the operator, bundle and catalog
 IMAGE_REGISTRY ?= quay.io/medik8s
@@ -265,19 +266,19 @@ CONTROLLER_GEN_DIR ?= $(LOCALBIN)/controller-gen
 ENVTEST_DIR ?= $(LOCALBIN)/setup-envtest
 GINKGO_DIR ?= $(LOCALBIN)/ginkgo
 GOIMPORTS_DIR ?= $(LOCALBIN)/goimports
+SORT_IMPORTS_DIR ?= $(LOCALBIN)/sort-imports
 OPM_DIR = $(LOCALBIN)/opm
 OPERATOR_SDK_DIR ?= $(LOCALBIN)/operator-sdk
-SORT_IMPORTS_DIR ?= $(LOCALBIN)/sort-imports
 
 ## Specific Tool Binaries
 KUSTOMIZE = $(KUSTOMIZE_DIR)/$(KUSTOMIZE_VERSION)/kustomize
 CONTROLLER_GEN = $(CONTROLLER_GEN_DIR)/$(CONTROLLER_GEN_VERSION)/controller-gen
 ENVTEST = $(ENVTEST_DIR)/$(ENVTEST_VERSION)/setup-envtest
 GINKGO = $(GINKGO_DIR)/$(GINKGO_VERSION)/ginkgo
 GOIMPORTS = $(GOIMPORTS_DIR)/$(GOIMPORTS_VERSION)/goimports
+SORT_IMPORTS = $(SORT_IMPORTS_DIR)/$(SORT_IMPORTS_VERSION)/sort-imports
 OPM = $(OPM_DIR)/$(OPM_VERSION)/opm
 OPERATOR_SDK = $(OPERATOR_SDK_DIR)/$(OPERATOR_SDK_VERSION)/operator-sdk
-SORT_IMPORTS = $(SORT_IMPORTS_DIR)/$(SORT_IMPORTS_VERSION)/sort-imports
 
 .PHONY: kustomize
 kustomize: ## Download kustomize locally if necessary.
@@ -289,6 +290,9 @@ controller-gen: ## Download controller-gen locally if necessary.
 
 .PHONY: envtest ## This library helps write integration tests for your controllers by setting up and starting an instance of etcd and the Kubernetes API server, without kubelet, controller-manager or other components.
 envtest: ## Download envtest-setup locally if necessary.
+ifneq ($(wildcard $(ENVTEST_DIR)),)
+	chmod -R +w $(ENVTEST_DIR)
+endif
 	$(call go-install-tool,$(ENVTEST),$(ENVTEST_DIR),sigs.k8s.io/controller-runtime/tools/setup-envtest@${ENVTEST_VERSION})
 
 .PHONY: ginkgo
@@ -360,7 +364,7 @@ endef
 
 .PHONY: build-tools
 build-tools: ## Download & build all the tools locally if necessary.
-	$(MAKE) kustomize controller-gen envtest ginkgo opm operator-sdk
+	$(MAKE) kustomize controller-gen envtest goimports sort-imports ginkgo opm operator-sdk
 
 # Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image.
 ifneq ($(origin CATALOG_BASE_IMG), undefined)

bundle.Dockerfile

@@ -7,7 +7,7 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=fence-agents-remediation
 LABEL operators.operatorframework.io.bundle.channels.v1=candidate
 LABEL operators.operatorframework.io.bundle.channel.default.v1=candidate
-LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.26.0
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.30.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 

bundle/manifests/fence-agents-remediation.clusterserviceversion.yaml

@@ -48,7 +48,7 @@ metadata:
     createdAt: ""
     description: Fence Agents Remediation Operator for remediating nodes using upstream
       fence-agents.
-    operators.operatorframework.io/builder: operator-sdk-v1.26.0
+    operators.operatorframework.io/builder: operator-sdk-v1.30.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/medik8s/fence-agents-remediation
     support: Medik8s

bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: fence-agents-remediation-operator
@@ -73,5 +73,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: []
-  storedVersions: []
+  conditions: null
+  storedVersions: null

bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: fence-agents-remediation-operator
@@ -89,5 +89,5 @@ status:
   acceptedNames:
     kind: ""
     plural: ""
-  conditions: []
-  storedVersions: []
+  conditions: null
+  storedVersions: null

bundle/metadata/annotations.yaml

@@ -6,7 +6,7 @@ annotations:
   operators.operatorframework.io.bundle.package.v1: fence-agents-remediation
   operators.operatorframework.io.bundle.channels.v1: candidate
   operators.operatorframework.io.bundle.channel.default.v1: candidate
-  operators.operatorframework.io.metrics.builder: operator-sdk-v1.26.0
+  operators.operatorframework.io.metrics.builder: operator-sdk-v1.30.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 

bundle/tests/scorecard/config.yaml

@@ -8,7 +8,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: basic
       test: basic-check-spec-test
@@ -18,7 +18,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - olm-bundle-validation
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-bundle-validation-test
@@ -28,7 +28,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - olm-crds-have-validation
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-crds-have-validation-test
@@ -38,7 +38,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - olm-crds-have-resources
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-crds-have-resources-test
@@ -48,7 +48,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - olm-spec-descriptors
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-spec-descriptors-test
@@ -58,7 +58,7 @@ stages:
   - entrypoint:
     - scorecard-test
     - olm-status-descriptors
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-status-descriptors-test

config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: fenceagentsremediations.fence-agents-remediation.medik8s.io
 spec:
   group: fence-agents-remediation.medik8s.io
@@ -68,9 +67,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.8.0
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: fenceagentsremediationtemplates.fence-agents-remediation.medik8s.io
 spec:
   group: fence-agents-remediation.medik8s.io
@@ -84,9 +83,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

config/rbac/role.yaml

@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

config/scorecard/patches/basic.config.yaml

@@ -4,7 +4,7 @@
     entrypoint:
     - scorecard-test
     - basic-check-spec
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: basic
       test: basic-check-spec-test

config/scorecard/patches/olm.config.yaml

@@ -4,7 +4,7 @@
     entrypoint:
     - scorecard-test
     - olm-bundle-validation
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
     entrypoint:
     - scorecard-test
     - olm-crds-have-validation
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
     entrypoint:
     - scorecard-test
     - olm-crds-have-resources
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
     entrypoint:
     - scorecard-test
     - olm-spec-descriptors
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
     entrypoint:
     - scorecard-test
     - olm-status-descriptors
-    image: quay.io/operator-framework/scorecard-test:v1.26.0
+    image: quay.io/operator-framework/scorecard-test:v1.30.0
     labels:
       suite: olm
       test: olm-status-descriptors-test