Skip to content

Commit 0f5c4ad

Browse files
bharath-b-rhbharath-b-rh
committed
NO-JIRA: Sync changes from release branch
1 parent d10c358 commit 0f5c4ad

File tree

3 files changed

+86
-149
lines changed

3 files changed

+86
-149
lines changed

‎Makefile

+4-12
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ CATALOG_IMAGE ?= cert-manager-catalog
1818
## image version to tag the created images with.
1919
IMAGE_VERSION ?= $(release_version)
2020

21-
## image for istio-csr
22-
ISTIO_CSR_IMAGE ?= cert-manager-istio-csr
23-
2421
## image tag makes use of the branch name and
2522
## when branch name is `main` use `latest` as the tag.
2623
ifeq ($(PARENT_BRANCH_SUFFIX), main)
@@ -43,7 +40,7 @@ OPM_DOWNLOAD_URL = https://github.com/operator-framework/operator-registry/relea
4340
OPM_TOOL_PATH ?= $(TOOL_BIN_DIR)/opm
4441

4542
## Operator bundle image to use for generating catalog.
46-
OPERATOR_BUNDLE_IMAGE ?=
43+
OPERATOR_BUNDLE_IMAGE ?=
4744

4845
## Catalog directory where generated catalog will be stored. Directory must have sub-directory with package `openshift-cert-manager-operator` name.
4946
CATALOG_DIR ?= "catalog/"
@@ -78,13 +75,8 @@ build-catalog-image:
7875
## update catalog using the provided bundle image.
7976
.PHONY: update-catalog
8077
update-catalog: get-opm
81-
# validate required parameters are set.
82-
@(if [ -z $(OPERATOR_BUNDLE_IMAGE) ] || [ -z $(CATALOG_DIR) ]; then echo "\n-- ERROR -- OPERATOR_BUNDLE_IMAGE and CATALOG_DIR parameters must be set for update-catalog target\n"; exit 1; fi)
83-
84-
# --migrate-level=bundle-object-to-csv-metadata is used for creating bundle metadata in `olm.csv.metadata` format.
85-
# Refer https://github.com/konflux-ci/build-definitions/blob/main/task/fbc-validation/0.1/TROUBLESHOOTING.md for details.
86-
$(OPM_TOOL_PATH) render $(OPERATOR_BUNDLE_IMAGE) --migrate-level=bundle-object-to-csv-metadata -o yaml > $(CATALOG_DIR)/openshift-cert-manager-operator/bundle.yaml
87-
$(OPM_TOOL_PATH) validate $(CATALOG_DIR)
78+
# Ex: make update-catalog OPERATOR_BUNDLE_IMAGE=registry.stage.redhat.io/cert-manager/cert-manager-operator-bundle@sha256:4114321b0ab6ceb882f26501ff9b22214d90b83d92466e7c5a62217f592c1fed CATALOG_DIR=catalogs/v4.17/catalog BUNDLE_FILE_NAME=bundle-v1.15.0.yaml REPLICATE_BUNDLE_FILE_IN_CATALOGS=no USE_MIGRATE_LEVEL_FLAG=yes
79+
./hack/update_catalog.sh $(OPM_TOOL_PATH) $(OPERATOR_BUNDLE_IMAGE) $(CATALOG_DIR) $(BUNDLE_FILE_NAME) $(REPLICATE_BUNDLE_FILE_IN_CATALOGS) $(USE_MIGRATE_LEVEL_FLAG)
8880

8981
## update catalog and build catalog image.
9082
.PHONY: catalog
@@ -107,7 +99,7 @@ verify-containerfiles:
10799

108100
## verify the changes are working as expected.
109101
.PHONY: verify
110-
verify: verify-shell-scripts verify-containerfiles validate-renovate-config build-images
102+
verify: verify-shell-scripts verify-containerfiles validate-renovate-config
111103

112104
## get opm(operator package manager) tool.
113105
.PHONY: get-opm

‎hack/bundle/render_templates.sh

-98
This file was deleted.

‎hack/update_catalog.sh

+82-39
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,69 @@
11
#!/usr/bin/env bash
22

3-
declare CONFIGS_DIR
4-
declare CERT_MANAGER_OPERATOR_IMAGE
5-
declare CERT_MANAGER_OPERATOR_BUNDLE_IMAGE
6-
declare CERT_MANAGER_IMAGE
7-
declare CERT_MANAGER_ACMESOLVER_IMAGE
8-
declare KUBE_RBAC_PROXY_IMAGE
3+
#
4+
# Example usage:
5+
# ./update_catalog.sh ./bin/tools/opm \
6+
# registry.stage.redhat.io/cert-manager/cert-manager-operator-bundle@sha256:4114321b0ab6ceb882f26501ff9b22214d90b83d92466e7c5a62217f592c1fed \
7+
# catalogs/v4.17/catalog \
8+
# bundle-v1.15.0.yaml \
9+
# yes \
10+
# yes
11+
#
912

10-
CATALOG_MANIFEST_FILE_NAME="catalog.yaml"
13+
declare OPM_TOOL_PATH
14+
declare OPERATOR_BUNDLE_IMAGE
15+
declare CATALOG_DIR
16+
declare BUNDLE_FILE_NAME
17+
declare REPLICATE_BUNDLE_FILE_IN_CATALOGS
18+
declare USE_MIGRATE_LEVEL_FLAG
1119

12-
update_catalog_manifest()
13-
{
14-
CATALOG_MANIFEST_FILE="${CONFIGS_DIR}/${CATALOG_MANIFEST_FILE_NAME}"
15-
if [[ ! -f "${CATALOG_MANIFEST_FILE}" ]]; then
16-
echo "[$(date)] -- ERROR -- catalog manifest file \"${CATALOG_MANIFEST_FILE}\" does not exist"
17-
exit 1
18-
fi
19-
20-
## replace cert-manager operand related images
21-
sed -i "s#registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9.*#${CERT_MANAGER_IMAGE}#g" "${CATALOG_MANIFEST_FILE}"
22-
sed -i "s#registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9.*#${CERT_MANAGER_ACMESOLVER_IMAGE}#g" "${CATALOG_MANIFEST_FILE}"
20+
CERT_MANAGER_CATALOG_NAME="openshift-cert-manager-operator"
2321

24-
## replace cert-manager-operator image
25-
sed -i "s#registry.redhat.io/cert-manager/cert-manager-operator-rhel9.*#${CERT_MANAGER_OPERATOR_IMAGE}#g" "${CATALOG_MANIFEST_FILE}"
22+
render_catalog_bundle()
23+
{
24+
render_cmd_args=""
25+
# --migrate-level=bundle-object-to-csv-metadata is used for creating bundle metadata in `olm.csv.metadata` format.
26+
# Refer https://github.com/konflux-ci/build-definitions/blob/main/task/fbc-validation/0.1/TROUBLESHOOTING.md for details.
27+
if [[ ${USE_MIGRATE_LEVEL_FLAG} == "yes" ]]; then
28+
render_cmd_args="--migrate-level=bundle-object-to-csv-metadata"
29+
fi
2630

27-
## replace cert-manager-operator-bundle image
28-
sed -i "s#registry.redhat.io/cert-manager/cert-manager-operator-bundle.*#${CERT_MANAGER_OPERATOR_BUNDLE_IMAGE}#g" "${CATALOG_MANIFEST_FILE}"
31+
bundle_file="${CATALOG_DIR}/${CERT_MANAGER_CATALOG_NAME}/${BUNDLE_FILE_NAME}"
32+
echo "[$(date)] -- INFO -- generating catalog bundle \"${bundle_file}\""
33+
if ! "${OPM_TOOL_PATH}" render "${OPERATOR_BUNDLE_IMAGE}" $render_cmd_args -o yaml > "${bundle_file}"; then
34+
echo "[$(date)] -- ERROR -- failed to render catalog bundle"
35+
exit 1
36+
fi
2937

30-
## replace kube-rbac-proxy image
31-
sed -i "s#registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9.*#${KUBE_RBAC_PROXY_IMAGE}#g" "${CATALOG_MANIFEST_FILE}"
38+
if ! "${OPM_TOOL_PATH}" validate "${CATALOG_DIR}"; then
39+
echo "[$(date)] -- ERROR -- failed to validate catalog"
40+
exit 1
41+
fi
3242
}
3343

3444
usage()
3545
{
3646
echo -e "usage:\n\t$(basename "${BASH_SOURCE[0]}")" \
37-
'"<CATALOG_CONFIG_DIR>"' \
38-
'"<CERT_MANAGER_OPERATOR_IMAGE>"' \
39-
'"<CERT_MANAGER_OPERATOR_BUNDLE_IMAGE>"' \
40-
'"<CERT_MANAGER_IMAGE>"' \
41-
'"<CERT_MANAGER_ACMESOLVER_IMAGE>"' \
42-
'"<KUBE_RBAC_PROXY_IMAGE>"'
47+
'"<OPM_TOOL_PATH>"' \
48+
'"<OPERATOR_BUNDLE_IMAGE>"' \
49+
'"<CATALOG_DIR>"' \
50+
'"<BUNDLE_FILE_NAME>"' \
51+
'"<REPLICATE_BUNDLE_FILE_IN_CATALOGS>"' \
52+
'"<USE_MIGRATE_LEVEL_FLAG>"'
4353
exit 1
4454
}
4555

56+
replicate_catalog_bundle()
57+
{
58+
if [[ "${REPLICATE_BUNDLE_FILE_IN_CATALOGS}" == "no" ]]; then
59+
return
60+
fi
61+
62+
bundle_file="${CATALOG_DIR}/${CERT_MANAGER_CATALOG_NAME}/${BUNDLE_FILE_NAME}"
63+
64+
find catalogs/*/catalog/openshift-cert-manager-operator -type d ! -path "${CATALOG_DIR}/*" -exec /bin/cp "${bundle_file}" {} \; -print
65+
}
66+
4667
##############################################
4768
############### MAIN #######################
4869
##############################################
@@ -51,20 +72,42 @@ if [[ $# -ne 6 ]]; then
5172
usage
5273
fi
5374

54-
CONFIGS_DIR=$1
55-
CERT_MANAGER_OPERATOR_IMAGE=$2
56-
CERT_MANAGER_OPERATOR_BUNDLE_IMAGE=$3
57-
CERT_MANAGER_IMAGE=$4
58-
CERT_MANAGER_ACMESOLVER_IMAGE=$5
59-
KUBE_RBAC_PROXY_IMAGE=$6
75+
OPM_TOOL_PATH=$1
76+
OPERATOR_BUNDLE_IMAGE=$2
77+
CATALOG_DIR=$3
78+
BUNDLE_FILE_NAME=$4
79+
REPLICATE_BUNDLE_FILE_IN_CATALOGS=$5
80+
USE_MIGRATE_LEVEL_FLAG=$6
6081

6182
echo "[$(date)] -- INFO -- $*"
6283

63-
if [[ ! -d ${CONFIGS_DIR} ]]; then
64-
echo "[$(date)] -- ERROR -- manifests directory \"${MANIFESTS_DIR}\" does not exist"
84+
if [[ ! -d "${CATALOG_DIR}" ]]; then
85+
echo "[$(date)] -- ERROR -- catalog directory \"${CATALOG_DIR}\" does not exist"
6586
exit 1
6687
fi
6788

68-
update_catalog_manifest
89+
if [[ ! -x "${OPM_TOOL_PATH}" ]]; then
90+
echo "[$(date)] -- ERROR -- \"${OPM_TOOL_PATH}\" does not exist or does not execute permissions"
91+
exit 1
92+
fi
93+
94+
if [[ -z "${BUNDLE_FILE_NAME}" ]]; then
95+
echo "[$(date)] -- ERROR -- \"\" bundle file name cannot be empty"
96+
exit 1
97+
fi
98+
99+
if [[ -z "${REPLICATE_BUNDLE_FILE_IN_CATALOGS}" ]] || [[ "${REPLICATE_BUNDLE_FILE_IN_CATALOGS}" != @(yes|no) ]]; then
100+
echo "[$(date)] -- ERROR -- invalid value provided for \"REPLICATE_BUNDLE_FILE_IN_CATALOGS\", must be \"yes\" or \"no\""
101+
exit 1
102+
fi
103+
104+
if [[ -z "${USE_MIGRATE_LEVEL_FLAG}" ]] || [[ "${USE_MIGRATE_LEVEL_FLAG}" != @(yes|no) ]]; then
105+
echo "[$(date)] -- ERROR -- invalid value provided for \"USE_MIGRATE_LEVEL_FLAG\", must be \"yes\" or \"no\""
106+
exit 1
107+
fi
108+
109+
render_catalog_bundle
110+
111+
replicate_catalog_bundle
69112

70113
exit 0

0 commit comments

Comments
 (0)