From 27d5f2f8dca045b0556964268322827d11004831 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Wed, 23 Mar 2022 08:58:46 +0100 Subject: [PATCH] build: controller-gen 0.8.0 No particular reason for it, just staying up-to-date. operator-sdk cannot be updated because of https://github.com/intel/pmem-csi/issues/1069 = https://github.com/operator-framework/operator-sdk/issues/5574 OLM cannot be updated because of https://github.com/operator-framework/operator-sdk/issues/5410 --- deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml | 5 ++--- operator/operator.make | 4 +++- test/start-stop-olm.sh | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml b/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml index ca7d81b43..e0adaba25 100644 --- a/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml +++ b/deploy/crd/pmem-csi.intel.com_pmemcsideployments.yaml @@ -1,11 +1,10 @@ -# This file was generated by controller-gen v0.7.0 via 'make operator-generate-crd' - +# This file was generated by controller-gen v0.8.0 via 'make operator-generate-crd' --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.7.0 + controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null name: pmemcsideployments.pmem-csi.intel.com spec: diff --git a/operator/operator.make b/operator/operator.make index 3acb62822..f29815cdd 100644 --- a/operator/operator.make +++ b/operator/operator.make @@ -1,5 +1,7 @@ +# https://github.com/operator-framework/operator-sdk/releases OPERATOR_SDK_VERSION=1.17.0 -CONTROLLER_GEN_VERSION=v0.7.0 +# https://github.com/kubernetes-sigs/controller-tools/releases +CONTROLLER_GEN_VERSION=v0.8.0 CONTROLLER_GEN=_work/bin/controller-gen-$(CONTROLLER_GEN_VERSION) # download operator-sdk binary diff --git a/test/start-stop-olm.sh b/test/start-stop-olm.sh index 9adb70234..15f0ebbad 100755 --- a/test/start-stop-olm.sh +++ b/test/start-stop-olm.sh @@ -16,6 +16,9 @@ CLUSTER=${CLUSTER:-pmem-govm} CLUSTER_DIR="${CLUSTER_DIRECTORY:-${REPO_DIR}/_work/${CLUSTER}}" SSH="${CLUSTER_DIR}/ssh.0" KUBECTL="${SSH} kubectl" # Always use the kubectl installed in the cluster. + +# https://github.com/operator-framework/operator-lifecycle-manager/releases +# Not the latest because of https://github.com/operator-framework/operator-sdk/issues/5410 OLM_VERSION=v0.18.3 function usage() {