Skip to content

CCO-453: Add CloudCredential cap for v415 #46551

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 7 commits into from
Dec 11, 2023
Merged

CCO-453: Add CloudCredential cap for v415 #46551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
922cd86
Adapt for the new CloudCredential capability
fxierh Dec 7, 2023
aa0564c
Update the cucushift-upgrade-check-capability step
fxierh Dec 7, 2023
e73cbda
make update
fxierh Dec 7, 2023
2322d3e
Fix cap name
fxierh Dec 7, 2023
609a2d2
Fix logic to determine enabled_capabilities
fxierh Dec 8, 2023
25aebf8
Account for platforms
fxierh Dec 8, 2023
4d769ce
Use CLUSTER_TYPE to determine if platform is BM or not
fxierh Dec 8, 2023
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
4 changes: 2 additions & 2 deletions ...penshift-tests-private/openshift-openshift-tests-private-release-4.15__amd64-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ tests:
steps:
cluster_profile: aws-qe
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
E2E_RUN_TAGS: '@amd64 and @aws-ipi and @disconnected and @network-ovnkubernetes
Expand All @@ -396,7 +396,7 @@ tests:
steps:
cluster_profile: aws-qe
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
E2E_RUN_TAGS: '@amd64 and @aws-ipi and @disconnected and @network-ovnkubernetes
Expand Down
4 changes: 2 additions & 2 deletions ...penshift-tests-private/openshift-openshift-tests-private-release-4.15__arm64-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ tests:
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
COMPUTE_NODE_TYPE: m6g.xlarge
Expand All @@ -246,7 +246,7 @@ tests:
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:arm64-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI
ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
COMPUTE_NODE_TYPE: m6g.xlarge
Expand Down
4 changes: 4 additions & 0 deletions ...penshift-tests-private/openshift-openshift-tests-private-release-4.15__multi-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ tests:
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
E2E_RUN_TAGS: '@amd64 and @aws-upi and @network-ovnkubernetes and not @fips
Expand All @@ -339,6 +340,7 @@ tests:
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential
BASE_DOMAIN: qe.devcluster.openshift.com
BASELINE_CAPABILITY_SET: None
BOOTSTRAP_INSTANCE_TYPE: m6g.large
Expand Down Expand Up @@ -428,6 +430,7 @@ tests:
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential
BASE_DOMAIN: qe.azure.devcluster.openshift.com
E2E_RUN_TAGS: '@amd64 and @azure-ipi and @network-ovnkubernetes and not @fips
and not @workloads'
Expand All @@ -443,6 +446,7 @@ tests:
dependencies:
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
env:
ADDITIONAL_ENABLED_CAPABILITIES: CloudCredential
BASE_DOMAIN: qe.azure.devcluster.openshift.com
COMPUTE_NODE_TYPE: Standard_D4ps_v5
E2E_RUN_TAGS: '@arm64 and @azure-ipi and @network-ovnkubernetes and not @fips
Expand Down
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 @@ -87,6 +87,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[CloudCredential]="cloud-credential"

# Mapping between optional capability and resources
# Need to be updated when new resource marks as optional
Expand All @@ -100,7 +101,7 @@ v411="baremetal marketplace openshift-samples"
v412=" ${v411} Console Insights Storage CSISnapshot"
v413=" ${v412} NodeTuning"
v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
v415=" ${v414} OperatorLifecycleManager"
v415=" ${v414} OperatorLifecycleManager CloudCredential"
latest_defined="v415"
always_default="${!latest_defined}"

Expand Down
5 changes: 3 additions & 2 deletions ...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 @@ -68,10 +68,10 @@ function get_caps_for_version_capset() {
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry"
;;
"v4.15")
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager"
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential"
;;
*)
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager"
caps_string="baremetal marketplace openshift-samples Console Insights Storage CSISnapshot NodeTuning MachineAPI Build DeploymentConfig ImageRegistry OperatorLifecycleManager CloudCredential"
;;
esac

Expand Down Expand Up @@ -267,6 +267,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[CloudCredential]="cloud-credential"

# Mapping between optional capability and resources
# Need update when new resource marks as optional
Expand Down
26 changes: 18 additions & 8 deletions ...-registry/ipi/conf/capability/additonalcaps/ipi-conf-capability-additonalcaps-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ v413=" ${v412} NodeTuning"
# shellcheck disable=SC2034
v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
# shellcheck disable=SC2034
v415=" ${v414} OperatorLifecycleManager"
v415=" ${v414} OperatorLifecycleManager CloudCredential"
latest_version="v415"

declare "v${ocp_major_version}${ocp_minor_version}"
Expand All @@ -86,17 +86,27 @@ selected_capability="${vcurrent_capabilities_array[$selected_capability_index]}"
echo "Selected capability to be disabled: ${selected_capability}"

enabled_capabilities=${vcurrent_capabilities}
if [[ ! "${selected_capability}" == "MachineAPI" ]]; then
enabled_capabilities=${enabled_capabilities/${selected_capability}}
else
case "${selected_capability}" in
"MachineAPI")
echo "WARNING: MachineAPI is selected, but it requires on IPI, so no capability to be disabled!"
fi

;;
# To be updated once OCP 4.16 is released
"CloudCredential")
if [[ "${CLUSTER_TYPE}" =~ ^packet.*$|^equinix.*$ ]]; then
enabled_capabilities=${enabled_capabilities/${selected_capability}}
else
echo "WARNING: non-BareMetal platforms require CCO for OCP 4.15, so no capability to be disabled!"
fi
;;
# Disable marketplace if OperatorLifecycleManager is selected to bo disabled
if [[ "${selected_capability}" == "OperatorLifecycleManager" ]]; then
"OperatorLifecycleManager")
echo "Capability 'marketplace' depends on Capability 'OperatorLifecycleManager', so disable marketplace along with OperatorLifecycleManager"
enabled_capabilities=${enabled_capabilities/${selected_capability}}
enabled_capabilities=${enabled_capabilities/"marketplace"}
fi
;;
*)
enabled_capabilities=${enabled_capabilities/${selected_capability}}
esac

# apply patch to install-config
CONFIG="${SHARED_DIR}/install-config.yaml"
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 @@ -58,7 +58,7 @@ v411="baremetal marketplace openshift-samples"
v412=" ${v411} Console Insights Storage CSISnapshot"
v413=" ${v412} NodeTuning"
v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry"
v415=" ${v414} OperatorLifecycleManager"
v415=" ${v414} OperatorLifecycleManager CloudCredential"
latest_defined="v415"
always_default="${!latest_defined}"

Expand Down