Skip to content

Commit 7041844

Browse files
committed
Nits in Makefile for improved local development
* update container_engine to podman * version env variables in local-run target Signed-off-by: Swarup Ghosh <swghosh@redhat.com>
1 parent 73e7ca3 commit 7041844

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

Makefile

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
# - use the BUNDLE_VERSION as arg of the bundle target (e.g make bundle BUNDLE_VERSION=0.0.2)
66
# - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
77
BUNDLE_VERSION ?= 1.15.1
8+
CERT_MANAGER_VERSION ?= "v1.15.5"
9+
ISTIO_CSR_VERSION ?= "v0.14.0"
810

911
# CHANNELS define the bundle channels used in the bundle.
1012
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -82,7 +84,7 @@ BIN_DIR=$(shell pwd)/bin
8284
SHELL = /usr/bin/env bash -o pipefail
8385
.SHELLFLAGS = -ec
8486

85-
CONTAINER_ENGINE ?= docker
87+
CONTAINER_ENGINE ?= podman
8688
CONTAINER_PUSH_ARGS ?= $(if $(filter ${CONTAINER_ENGINE}, docker), , --tls-verify=${TLS_VERIFY})
8789
TLS_VERIFY ?= true
8890
CONTAINER_IMAGE_NAME ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
@@ -108,8 +110,7 @@ E2E_TIMEOUT ?= 1h
108110
# https://onsi.github.io/ginkgo/#spec-labels. The default is to run tests on the AWS platform.
109111
E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS}"
110112

111-
MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.15.5/cert-manager.yaml
112-
ISTIO_CSR_VERSION = "v0.14.0"
113+
MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml
113114

114115
##@ Development
115116

@@ -178,9 +179,21 @@ verify-deps:
178179
hack/verify-deps.sh
179180

180181
local-run: build
181-
OPERATOR_NAME=cert-manager-operator OPERAND_IMAGE_VERSION=$(BUNDLE_VERSION) OPERATOR_IMAGE_VERSION=$(BUNDLE_VERSION) ./cert-manager-operator start --config=./hack/local-run-config.yaml --kubeconfig=$${KUBECONFIG:-$$HOME/.kube/config} --namespace=cert-manager-operator
182+
RELATED_IMAGE_CERT_MANAGER_WEBHOOK=quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION) \
183+
RELATED_IMAGE_CERT_MANAGER_CA_INJECTOR=quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION) \
184+
RELATED_IMAGE_CERT_MANAGER_CONTROLLER=quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION) \
185+
RELATED_IMAGE_CERT_MANAGER_ACMESOLVER=quay.io/jetstack/cert-manager-acmesolver:$(CERT_MANAGER_VERSION) \
186+
RELATED_IMAGE_CERT_MANAGER_ISTIOCSR=quay.io/jetstack/cert-manager-istio-csr:$(ISTIO_CSR_VERSION) \
187+
OPERATOR_NAME=cert-manager-operator \
188+
OPERAND_IMAGE_VERSION=$(BUNDLE_VERSION) \
189+
OPERATOR_IMAGE_VERSION=$(BUNDLE_VERSION) \
190+
./cert-manager-operator start \
191+
--config=./hack/local-run-config.yaml \
192+
--kubeconfig=$${KUBECONFIG:-$$HOME/.kube/config} \
193+
--namespace=cert-manager-operator
182194
.PHONY: local-run
183195

196+
184197
##@ Build
185198
GO=GO111MODULE=on CGO_ENABLED=1 go
186199

0 commit comments

Comments
 (0)