From 51859526f94e70833a0d8a3ed1d12eb87a52fd51 Mon Sep 17 00:00:00 2001 From: Adam Talbot Date: Thu, 6 Jun 2024 12:54:50 +0100 Subject: [PATCH] fix: cmctl has moved out of cm/cm Signed-off-by: Adam Talbot --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f9e93f7..e92d9e1 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ help: ## Display this help @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n\nTargets:\n"} /^[0-9a-zA-Z_-]+:.*?##/ { printf " \033[36m%-20s\033[0m %s\n", $$1, $$2 }' $(MAKEFILE_LIST) OLM_PACKAGE_NAME ?= cert-manager -IMG_BASE_DEFAULT := ttl.sh/$(shell uuidgen)/cert-manager +IMG_BASE_DEFAULT := ttl.sh/$(shell uuidgen | tr A-Z a-z)/cert-manager IMG_BASE ?= $(IMG_BASE_DEFAULT) BUNDLE_IMG_BASE ?= ${IMG_BASE}-olm-bundle BUNDLE_IMG ?= ${BUNDLE_IMG_BASE}:${BUNDLE_VERSION} @@ -60,6 +60,7 @@ KUSTOMIZE_VERSION ?= 5.3.0 KIND_VERSION ?= 0.21.0 OPERATOR_SDK_VERSION ?= 1.33.0 OPM_VERSION ?= 1.36.0 +CMCTL_VERSION ?= 2.0.0 comma := , empty := @@ -73,7 +74,7 @@ kustomize = ${bin}/kustomize-${KUSTOMIZE_VERSION} kind = ${bin}/kind-${KIND_VERSION} operator_sdk = ${bin}/operator-sdk-${OPERATOR_SDK_VERSION} opm = ${bin}/opm-${OPM_VERSION} -cmctl = ${bin}/cmctl-${CERT_MANAGER_VERSION} +cmctl = ${bin}/cmctl-${CMCTL_VERSION} ${kustomize}: url := https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_${os}_${arch}.tar.gz ${kustomize}: @@ -81,11 +82,11 @@ ${kustomize}: curl -sSL ${url} | tar --directory $(dir $@) -xzf - kustomize mv $(dir $@)/kustomize $@ -${cmctl}: url := https://github.com/cert-manager/cert-manager/releases/download/v$(CERT_MANAGER_VERSION)/cmctl-$(os)-$(arch).tar.gz +${cmctl}: url := https://github.com/cert-manager/cmctl/releases/download/v$(CMCTL_VERSION)/cmctl_$(os)_$(arch) ${cmctl}: mkdir -p $(dir $@) - curl -fsSL ${url} | tar --directory $(dir $@) -xzf - cmctl - mv $(dir $@)cmctl $@ + curl -fsSL ${url} > $@ + chmod +x $@ ${kind}: url := https://github.com/kubernetes-sigs/kind/releases/download/v${KIND_VERSION}/kind-${os}-${arch} ${operator_sdk}: url := https://github.com/operator-framework/operator-sdk/releases/download/v${OPERATOR_SDK_VERSION}/operator-sdk_${os}_${arch}