Merge pull request #258 from swghosh/nits

Improves local operator development

Author: openshift-merge-bot[bot]

Makefile

@@ -5,6 +5,8 @@
 # - use the BUNDLE_VERSION as arg of the bundle target (e.g make bundle BUNDLE_VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
 BUNDLE_VERSION ?= 1.15.1
+CERT_MANAGER_VERSION ?= "v1.15.5"
+ISTIO_CSR_VERSION ?= "v0.14.0"
 
 # CHANNELS define the bundle channels used in the bundle.
 # 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
 SHELL = /usr/bin/env bash -o pipefail
 .SHELLFLAGS = -ec
 
-CONTAINER_ENGINE ?= docker
+CONTAINER_ENGINE ?= podman
 CONTAINER_PUSH_ARGS ?= $(if $(filter ${CONTAINER_ENGINE}, docker), , --tls-verify=${TLS_VERIFY})
 TLS_VERIFY ?= true
 CONTAINER_IMAGE_NAME ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
@@ -108,8 +110,7 @@ E2E_TIMEOUT ?= 1h
 # https://onsi.github.io/ginkgo/#spec-labels. The default is to run tests on the AWS platform.
 E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS}"
 
-MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.15.5/cert-manager.yaml
-ISTIO_CSR_VERSION = "v0.14.0"
+MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml
 
 ##@ Development
 
@@ -178,9 +179,21 @@ verify-deps:
 	hack/verify-deps.sh
 
 local-run: build
-	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
+	RELATED_IMAGE_CERT_MANAGER_WEBHOOK=quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION) \
+	RELATED_IMAGE_CERT_MANAGER_CA_INJECTOR=quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION) \
+	RELATED_IMAGE_CERT_MANAGER_CONTROLLER=quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION) \
+	RELATED_IMAGE_CERT_MANAGER_ACMESOLVER=quay.io/jetstack/cert-manager-acmesolver:$(CERT_MANAGER_VERSION) \
+	RELATED_IMAGE_CERT_MANAGER_ISTIOCSR=quay.io/jetstack/cert-manager-istio-csr:$(ISTIO_CSR_VERSION) \
+	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
 .PHONY: local-run
 
+
 ##@ Build
 GO=GO111MODULE=on CGO_ENABLED=1 go
 

README.md

@@ -37,7 +37,11 @@ The Operator automatically deploys a cluster-scoped `CertManager` object named `
 
 Connect to your OpenShift cluster and run the following command:
 
-    make local-run
+```sh
+make deploy
+oc scale --replicas=0 deploy --all -n cert-manager-operator
+make local-run
+```
 
 This command will install all the necessary Operator manifests as well as all necessary CRDs. After this part is complete, it will run the Operator locally.
 

hack/operator-sdk.sh

@@ -5,47 +5,34 @@ set -e
 VERSION="1.25.1"
 
 OUTPUT_PATH=${1:-./bin/operator-sdk}
-VERIFY=${2:-yes}
 
 GOOS=$(go env GOOS)
 GOARCH=$(go env GOARCH)
 BIN="operator-sdk"
 BIN_ARCH="${BIN}_${GOOS}_${GOARCH}"
 OPERATOR_SDK_DL_URL="https://github.com/operator-framework/operator-sdk/releases/download/v${VERSION}"
 
-case ${GOOS} in
-  linux)
-    CHECKSUM="9596b2894b4b1d7f1c3b54cb1ec317b86494dbc00718b48561dfbcb232477c26"
-    ;;
-  darwin)
-    CHECKSUM="bb54842b92efee4ea1071373f7482b62a8130cc3dc4d45a5be50041ae7c81e7c"
-    ;;
-    *)
-    echo "Unsupported OS $GOOS"
-    exit 1
-    ;;
-esac
-
-if [ "$GOARCH" != "amd64" ]; then
+if [[ "$GOOS" != "linux" && "$GOOS" != "darwin" ]]; then
+  echo "Unsupported OS $GOOS"
+  exit 1
+fi
+
+if [[ "$GOARCH" != "amd64" && "$GOARCH" != "arm64" && "$GOARCH" != "ppc64le" && "$GOARCH" != "s390x" ]]; then
   echo "Unsupported architecture $GOARCH"
   exit 1
 fi
 
 command -v curl &> /dev/null || { echo "can't find curl command" && exit 1; }
-command -v sha256sum &> /dev/null || { echo "can't find sha256sum command" && exit 1; }
 
 TEMPDIR=$(mktemp -d)
 BIN_PATH="${TEMPDIR}/${BIN_ARCH}"
 
 echo "> downloading binary"
 curl --silent --location -o "${BIN_PATH}" "${OPERATOR_SDK_DL_URL}/operator-sdk_${GOOS}_${GOARCH}"
 
-if [ "${VERIFY}" == "yes" ]; then
-    echo "> verifying binary"
-    echo "${CHECKSUM} ${BIN_PATH}" | sha256sum -c --quiet
-fi
-
 echo "> installing binary"
 mv "${BIN_PATH}" "${OUTPUT_PATH}"
 chmod +x "${OUTPUT_PATH}"
 rm -rf "${TEMPDIR}"
+
+echo "> operator-sdk binary available at ${OUTPUT_PATH}"