From 394f0687b6eb08b03178522b4dc2aa1f72fcba38 Mon Sep 17 00:00:00 2001 From: Yunfei Jiang Date: Fri, 20 Oct 2023 16:18:29 +0800 Subject: [PATCH] v415-olm --- .../cucushift-installer-check-capability-commands.sh | 9 ++++++++- .../ipi-conf-capability-additonalcaps-commands.sh | 10 +++++++++- .../ipi-conf-capability-baselinecaps-vset-commands.sh | 5 +++-- ...f-manual-creds-remove-unnecessary-creds-commands.sh | 6 +++++- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh b/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh index f554a3e337ce5..7a67fd237e8d4 100644 --- a/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh +++ b/ci-operator/step-registry/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh @@ -35,6 +35,8 @@ function cvoCapabilityCheck() { else echo "ERROR: ${expected_status} capabilities does not match with cvo ${cvo_field}!" echo -e "cvo_caps: ${cvo_caps_str}\n${expected_status} capability set: ${capability_set}" + echo "diff [cvo_caps] [${expected_status} capability set]" + diff <( echo $cvo_caps_str | tr " " "\n" | sort | uniq) <( echo $capability_set | tr " " "\n" | sort | uniq ) result=1 fi fi @@ -84,6 +86,7 @@ caps_operator[Storage]="storage" caps_operator[NodeTuning]="node-tuning" caps_operator[MachineAPI]="machine-api control-plane-machine-set cluster-autoscaler" caps_operator[ImageRegistry]="image-registry" +caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lifecycle-manager-catalog operator-lifecycle-manager-packageserver" # Mapping between optional capability and resources # Need to be updated when new resource marks as optional @@ -97,7 +100,8 @@ v411="baremetal marketplace openshift-samples" v412=" ${v411} Console Insights Storage CSISnapshot" v413=" ${v412} NodeTuning" v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" -latest_defined="v414" +v415=" ${v414} OperatorLifecycleManager" +latest_defined="v415" always_default="${!latest_defined}" # Determine vCurrent @@ -132,6 +136,9 @@ case ${baselinecaps_from_config} in "v4.14") enabled_capability_set="${v414}" ;; +"v4.15") + enabled_capability_set="${v415}" + ;; "vCurrent") enabled_capability_set="${vCurrent}" ;; diff --git a/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh b/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh index 9dc019bf14893..43aa575985cdf 100644 --- a/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh +++ b/ci-operator/step-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh @@ -62,7 +62,9 @@ v412=" ${v411} Console Insights Storage CSISnapshot" v413=" ${v412} NodeTuning" # shellcheck disable=SC2034 v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" -latest_version="v414" +# shellcheck disable=SC2034 +v415=" ${v414} OperatorLifecycleManager" +latest_version="v415" declare "v${ocp_major_version}${ocp_minor_version}" v_current_version="v${ocp_major_version}${ocp_minor_version}" @@ -96,6 +98,12 @@ if [[ "${selected_capability}" == "ImageRegistry" ]]; then enabled_capabilities=${enabled_capabilities/"Build"} fi +# Disable marketplace if OperatorLifecycleManager is selected to bo disabled +if [[ "${selected_capability}" == "OperatorLifecycleManager" ]]; then + echo "Capability 'marketplace' depends on Capability 'OperatorLifecycleManager', so disable marketplace along with OperatorLifecycleManager" + enabled_capabilities=${enabled_capabilities/"marketplace"} +fi + # apply patch to install-config CONFIG="${SHARED_DIR}/install-config.yaml" PATCH="/tmp/install-config-capability.yaml.path" diff --git a/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh b/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh index c61f7df602307..3d46e2af9f38d 100644 --- a/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh +++ b/ci-operator/step-registry/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh @@ -50,9 +50,10 @@ ocp_minor_version=$( echo "${ocp_version}" | awk --field-separator=. '{print $2} v411_set="vCurrent v4.11" v412_set="${v411_set} v4.12" v413_set="${v412_set} v4.13" -# shellcheck disable=SC2034 v414_set="${v413_set} v4.14" -latest_version_set="v414_set" +# shellcheck disable=SC2034 +v415_set="${v414_set} v4.15" +latest_version_set="v415_set" declare "v${ocp_major_version}${ocp_minor_version}_set" v_current_version="v${ocp_major_version}${ocp_minor_version}_set" diff --git a/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh b/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh index b2b596c688cdf..c524e0a69d0a6 100755 --- a/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh +++ b/ci-operator/step-registry/ipi/conf/manual-creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh @@ -58,7 +58,8 @@ v411="baremetal marketplace openshift-samples" v412=" ${v411} Console Insights Storage CSISnapshot" v413=" ${v412} NodeTuning" v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" -latest_defined="v414" +v415=" ${v414} OperatorLifecycleManager" +latest_defined="v415" always_default="${!latest_defined}" # Determine vCurrent @@ -93,6 +94,9 @@ case ${BASELINE_CAPABILITY_SET} in "v4.14") enabled_operators="${v414}" ;; +"v4.15") + enabled_operators="${v415}" + ;; "vCurrent") enabled_operators="${vCurrent}" ;;