Skip to content

add OLMv1 cap #58914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Nov 27, 2024
Merged

add OLMv1 cap #58914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b9aebe
add OLMv1 cap
jianzhangbjz Nov 18, 2024
b081063
add OLMV1 cap for upgrade post check
jianzhangbjz Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...try/cucushift/installer/check/capability/cucushift-installer-check-capability-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ 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"
caps_operator[OperatorLifecycleManagerV1]="olm"
caps_operator[CloudCredential]="cloud-credential"
caps_operator[CloudControllerManager]="cloud-controller-manager"
caps_operator[Ingress]="ingress"
Expand All @@ -93,7 +94,7 @@ v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
v415=" ${v414} OperatorLifecycleManager CloudCredential"
v416=" ${v415} CloudControllerManager Ingress"
v417=" ${v416}"
v418=" ${v417}"
v418=" ${v417} OperatorLifecycleManagerV1"
latest_defined="v418"
always_default="${!latest_defined}"
# always enabled capabilities
Expand Down
9 changes: 8 additions & 1 deletion ...egistry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,15 @@ function get_caps_for_version_capset() {
"v4.16")
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress"
;;
*)
"v4.17")
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress"
;;
"v4.18")
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress OperatorLifecycleManagerV1"
;;
*)
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential CloudControllerManager Ingress OperatorLifecycleManagerV1"
;;
esac

echo $caps_string
Expand Down Expand Up @@ -282,6 +288,7 @@ caps_operator[OperatorLifecycleManager]="operator-lifecycle-manager operator-lif
caps_operator[CloudCredential]="cloud-credential"
caps_operator[CloudControllerManager]="cloud-controller-manager"
caps_operator[Ingress]="ingress"
caps_operator[OperatorLifecycleManagerV1]="olm"

# Mapping between optional capability and resources
# Need update when new resource marks as optional
Expand Down
2 changes: 1 addition & 1 deletion ...egistry/ipi/conf/capability/additionalcaps/ipi-conf-capability-additionalcaps-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ v415=" ${v414} OperatorLifecycleManager CloudCredential"
v416=" ${v415} CloudControllerManager Ingress"
v417=" ${v416}"
# shellcheck disable=SC2034
v418=" ${v417}"
v418=" ${v417} OperatorLifecycleManagerV1"
latest_version="v418"

# define capability dependency
Expand Down
2 changes: 1 addition & 1 deletion ...y/ipi/conf/capability/baselinecaps/vset/ipi-conf-capability-baselinecaps-vset-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ v415=" ${v414} OperatorLifecycleManager CloudCredential"
v416=" ${v415} CloudControllerManager Ingress"
v417=" ${v416}"
# shellcheck disable=SC2034
v418=" ${v417}"
v418=" ${v417} OperatorLifecycleManagerV1"
latest_version="v418"

# define capability dependency
Expand Down
2 changes: 1 addition & 1 deletion ...creds/remove-unnecessary-creds/ipi-conf-manual-creds-remove-unnecessary-creds-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
v415=" ${v414} OperatorLifecycleManager CloudCredential"
v416=" ${v415} CloudControllerManager Ingress"
v417=" ${v416}"
v418=" ${v417}"
v418=" ${v417} OperatorLifecycleManagerV1"
Copy link
Copy Markdown
Contributor

@jianlinliu jianlinliu Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beside these two step need to be updated, the following step also need to be updated:

ipi-conf-capability-additionalcaps
ipi-conf-capability-baselinecaps-vset
cucushift-upgrade-check-capability

Copy link
Copy Markdown
Contributor Author

@jianzhangbjz jianzhangbjz Nov 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ipi-conf-capability-additionalcaps
ipi-conf-capability-baselinecaps-vset

Added them.

cucushift-upgrade-check-capability

I didn't find the related config for 4.17 and 4.18 there, not sure if any specific configs, ignored them in this PR, left it to the step owner.

Copy link
Copy Markdown
Contributor

@jianlinliu jianlinliu Nov 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before this PR, 4.17 and 4.18 has no any optional operators change, now 4.18 introduced a new optional operator. So need to update accordingly.
https://github.com/openshift/release/blob/master/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh#L74
https://github.com/openshift/release/blob/master/ci-operator/step-registry/cucushift/upgrade/check/capability/cucushift-upgrade-check-capability-commands.sh#L284

An example is here.

latest_defined="v418"
always_default="${!latest_defined}"

Expand Down