@@ -26,7 +26,7 @@ source scripts/funcs/printing
26
26
source scripts/dev/set_env_context.sh
27
27
28
28
increment_version () {
29
- IFS=. read -r major minor patch <<< " $1"
29
+ IFS=. read -r major minor patch <<< " $1"
30
30
(( patch++ ))
31
31
echo " ${major} .${minor} .${patch} "
32
32
}
42
42
generate_helm_charts () {
43
43
read -ra helm_values < <( get_operator_helm_values)
44
44
echo " Passing overrides to helm values: "
45
- tr ' ' ' \n' <<< " ${helm_values[*]}"
45
+ tr ' ' ' \n' <<< " ${helm_values[*]}"
46
46
47
47
declare -a helm_set_values=()
48
48
for param in " ${helm_values[@]} " ; do
@@ -118,23 +118,23 @@ function generate_mck_catalog_metadata() {
118
118
opm init " ${mck_package_name} " \
119
119
--default-channel=" ${default_channel} " \
120
120
--output=yaml \
121
- > " ${catalog_yaml} "
121
+ > " ${catalog_yaml} "
122
122
123
123
echo " Adding current unreleased ${current_bundle_image} to the catalog"
124
- opm render " ${current_bundle_image} " --output=yaml >> " ${catalog_yaml} "
124
+ opm render " ${current_bundle_image} " --output=yaml >> " ${catalog_yaml} "
125
125
126
126
# TODO: CLOUDP-310820 - After 1.0.0 release we need to clean this up: always run it.
127
127
if [[ -n " ${latest_bundle_version} " ]]; then
128
128
echo " Adding latest release ${latest_bundle_image} to the catalog"
129
- opm render " ${latest_bundle_image} " --output=yaml >> " ${catalog_yaml} "
129
+ opm render " ${latest_bundle_image} " --output=yaml >> " ${catalog_yaml} "
130
130
131
131
echo " Adding latest MCK release into STABLE channel to ${catalog_yaml} "
132
132
echo " ---
133
133
schema: olm.channel
134
134
package: ${mck_package_name}
135
135
name: stable
136
136
entries:
137
- - name: ${mck_package_name} .v${latest_bundle_version} " >> " ${catalog_yaml} "
137
+ - name: ${mck_package_name} .v${latest_bundle_version} " >> " ${catalog_yaml} "
138
138
139
139
echo " Adding current MCK version replacing the latest MCK version into FAST channel to ${catalog_yaml} "
140
140
echo " ---
@@ -143,7 +143,7 @@ package: ${mck_package_name}
143
143
name: fast
144
144
entries:
145
145
- name: ${mck_package_name} .v${current_bundle_version}
146
- replaces: ${mck_package_name} .v${latest_bundle_version} " >> " ${catalog_yaml} "
146
+ replaces: ${mck_package_name} .v${latest_bundle_version} " >> " ${catalog_yaml} "
147
147
else
148
148
echo " Skipping addition of latest MCK release as we haven't published MCK 1.0.0 yet"
149
149
fi
@@ -155,7 +155,7 @@ package: ${mck_package_name}
155
155
name: migration
156
156
entries:
157
157
- name: ${mck_package_name} .v${current_bundle_version}
158
- replaces: ${meko_package_name} .v${meko_latest_bundle_version} " >> " ${catalog_yaml} "
158
+ replaces: ${meko_package_name} .v${meko_latest_bundle_version} " >> " ${catalog_yaml} "
159
159
}
160
160
161
161
function generate_meko_catalog_metadata() {
@@ -172,18 +172,18 @@ function generate_meko_catalog_metadata() {
172
172
opm init " ${meko_package_name} " \
173
173
--default-channel=" stable" \
174
174
--output=yaml \
175
- > " ${catalog_yaml} "
175
+ > " ${catalog_yaml} "
176
176
177
177
echo " Adding latest release ${latest_bundle_image} to the catalog"
178
- opm render " ${latest_bundle_image} " --output=yaml >> " ${catalog_yaml} "
178
+ opm render " ${latest_bundle_image} " --output=yaml >> " ${catalog_yaml} "
179
179
180
180
echo " Adding latest MEKO release into STABLE channel to ${catalog_yaml} "
181
181
echo " ---
182
182
schema: olm.channel
183
183
package: ${meko_package_name}
184
184
name: stable
185
185
entries:
186
- - name: ${meko_package_name} .v${latest_bundle_version} " >> " ${catalog_yaml} "
186
+ - name: ${meko_package_name} .v${latest_bundle_version} " >> " ${catalog_yaml} "
187
187
}
188
188
189
189
function build_and_publish_test_catalog() {
@@ -210,28 +210,27 @@ mck_package_name="mongodb-kubernetes"
210
210
meko_package_name=" mongodb-enterprise"
211
211
212
212
certified_operators_repo=" https://github.com/redhat-openshift-ecosystem/certified-operators.git"
213
- current_operator_version_from_release_json=$( jq -r .mongodbOperator < release.json)
213
+ current_operator_version_from_release_json=$( jq -r .mongodbOperator < release.json)
214
214
current_incremented_operator_version_from_release_json=$( increment_version " ${current_operator_version_from_release_json} " )
215
215
current_incremented_operator_version_from_release_json_with_version_id=" ${current_incremented_operator_version_from_release_json} -${VERSION_ID:- " latest" } "
216
216
test_catalog_image=" ${base_repo_url} /mongodb-kubernetes-test-catalog:${current_incremented_operator_version_from_release_json_with_version_id} "
217
217
certified_repo_cloned=" $( clone_git_repo_into_temp ${certified_operators_repo} ) "
218
218
219
219
# TODO: CLOUDP-310820 - After 1.0.0 release we need to clean this up: always run it.
220
- if [[ " ${current_operator_version_from_release_json} " =~ ^0\. ]]; then
221
- # Version is < 1.0.0 (0.y.z)
222
- mck_latest_released_operator_version=" "
223
- echo " Skipping MCK bundle lookup as we haven't published MCK 1.0.0 yet (${current_operator_version_from_release_json} is < 1.0.0)"
224
- else
225
- # Version is >= 1.0.0
226
- mck_latest_released_operator_version=" $( find_the_latest_certified_operator " ${certified_repo_cloned} " " ${mck_package_name} " ) "
227
- fi
220
+ # if [[ "${current_operator_version_from_release_json}" =~ ^0\. ]]; then
221
+ # Version is < 1.0.0 (0.y.z)
222
+ mck_latest_released_operator_version=" "
223
+ echo " Skipping MCK bundle lookup as we haven't published MCK 1.0.0 yet (${current_operator_version_from_release_json} is < 1.0.0)"
224
+ # else
225
+ # # Version is >= 1.0.0
226
+ # mck_latest_released_operator_version="$(find_the_latest_certified_operator "${certified_repo_cloned}" "${mck_package_name}")"
227
+ # fi
228
228
meko_latest_released_operator_version=" $( find_the_latest_certified_operator " ${certified_repo_cloned} " " ${meko_package_name} " ) "
229
229
230
230
meko_latest_certified_bundle_image=" ${base_repo_url} /mongodb-enterprise-operator-certified-bundle:${meko_latest_released_operator_version} "
231
231
mck_latest_certified_bundle_image=" ${base_repo_url} /mongodb-kubernetes-certified-bundle:${mck_latest_released_operator_version} "
232
232
current_bundle_image=" ${base_repo_url} /mongodb-kubernetes-certified-bundle:${current_incremented_operator_version_from_release_json_with_version_id} "
233
233
234
-
235
234
header " Configuration:"
236
235
echo " certified_operators_repo: ${certified_operators_repo} "
237
236
echo " certified_repo_cloned: ${certified_repo_cloned} "
0 commit comments