-
Notifications
You must be signed in to change notification settings - Fork 2.1k
OCPQE-19978: Add CloudControllerManager and Ingress Cap for v416 #49708
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.
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
OCPQE-19978: Add CloudControllerManager and Ingress Cap for v416 #49708
Conversation
|
@sunzhaohua2: This pull request references OCPQE-19978 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set. DetailsIn response to this: Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
...shift-openshift-tests-private-release-4.16__amd64-nightly-4.16-upgrade-from-stable-4.15.yaml
Outdated
Show resolved
Hide resolved
...p-registry/ipi/conf/capability/additionalcaps/ipi-conf-capability-additionalcaps-commands.sh
Outdated
Show resolved
Hide resolved
22fe2e1 to
446d8b3
Compare
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-baremetal-ipi-ovn-ipv4-basecap-none-f28 |
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14 |
We also need to add capability |
446d8b3 to
e300486
Compare
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14 |
e300486 to
8c92766
Compare
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14 |
|
@sunzhaohua2: job(s): periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f14 either don't exist or were not found to be affected, and cannot be rehearsed |
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f7 |
8c92766 to
3aeeac6
Compare
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-aws-upi-basecap-none-arm-f7 |
|
/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.16-multi-nightly-baremetal-ipi-ovn-ipv4-basecap-none-f28 |
3aeeac6 to
22c7ef2
Compare
|
@sunzhaohua2: This pull request references OCPQE-19978 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.16.0" version, but no target version was set. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
| OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest | ||
| env: | ||
| ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential | ||
| ADDITIONAL_ENABLED_CAPABILITIES: MachineAPI CloudCredential CloudControllerManager |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The job is for testing none capability on purpose, ideally we should not enable any additional caps, while because MachineAPI and CloudCredential has to be enabled because the IPI install has to require them.
While for the added CCM and Ingress, is that the same case? The IPI install has to require them because of some known limiation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CCM can only be disabled on "none", "baremetal" or "external" platform with ccm none clusters, so has to be enabled on cloud clusters.
Ingress is always enabled on ocp, only disabled on hypershift
| v414=" ${v413} MachineAPI Build DeploymentConfig ImageRegistry" | ||
| v415=" ${v414} OperatorLifecycleManager CloudCredential" | ||
| latest_defined="v415" | ||
| v416=" ${v415} CloudControllerManager Ingress" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ingress also become optional cap in 4.16?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If yes, can you also help update the PR title and description to include it.
|
Upgrade change looks good to me. Please also run a 4.15 to 4.16 upgrade job to verify the change. Thanks |
| selected_capability="" | ||
| ;; | ||
| "CloudControllerManager") | ||
| platform_type=$(yq-go r "${SHARED_DIR}/install-config.yaml" "platform" | sed -n '1p' | cut -d':' -f1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| platform_type=$(yq-go r "${SHARED_DIR}/install-config.yaml" "platform" | sed -n '1p' | cut -d':' -f1) | |
| platform_type=$(yq-go r -j "${SHARED_DIR}/install-config.yaml" "platform" | jq -r 'keys[]') |
| test: | ||
| - chain: openshift-e2e-test-qe | ||
| workflow: baremetal-lab-ipi | ||
| - as: baremetal-ipi-ovn-ipv4-basecap-none-f28 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ci job are placed in alphabetical order, sounds like we should move this job a bit earlier.
If we did not enable Ingress explicitly in basecap=none install, will ingress still be installed and works well? |
|
/pj-rehearse ack |
|
cc @liangxia to review |
|
/lgtm |
|
@wking can you help review |
|
/assign @xueqzhan |
e713fde to
fb35b31
Compare
|
/retest |
|
/test core-valid |
|
@sunzhaohua2: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
fb35b31 to
5dac5c1
Compare
|
[REHEARSALNOTIFIER]
A total of 3083 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jianlinliu, jinyunma, liangxia, sunzhaohua2 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/pj-rehearse ack |
…er to "no-capabilities" Similar to bbb31f9 (OCPQE-19978: Add CloudControllerManager Cap for v416, 2024-03-27, openshift#49708), because [1] explains: disabling CloudControllerManager is only supported on the Baremetal, None, or External platform with cloudControllerManager value none Besides the release periodics, I'm also touching the cluster-bot job definitions in openshift-release-infra-periodics.yaml. AWS, Azure, and GCP will all need this new capability. I'm not clear on the packet-assisted job from 6544a41 (periodics: add assisted launch job, 2024-02-12, openshift#48700), and I cannot figure out the Cluster Bot launch syntax to trigger that path. So for now, I'm adding the new capability there too, to avoid forking the configuration without a clearer understanding of the context. This change will break these Cluster Bot jobs for 4.15 and earlier, where the new capability does not exist or match the ClusterVersion enum. But they're already generally available, so folks may not need access, and if they do, hackery like 428ef75 (ci-operator/jobs/openshift/release/openshift-release-infra-periodics: Temporarily drop MachineAPI from Azure Cluster Bot job, 2023-10-23, openshift#44751) can restore it. [1]: openshift/installer@2dc1ef8
…er to "no-capabilities" (#51070) Similar to bbb31f9 (OCPQE-19978: Add CloudControllerManager Cap for v416, 2024-03-27, #49708), because [1] explains: disabling CloudControllerManager is only supported on the Baremetal, None, or External platform with cloudControllerManager value none Besides the release periodics, I'm also touching the cluster-bot job definitions in openshift-release-infra-periodics.yaml. AWS, Azure, and GCP will all need this new capability. I'm not clear on the packet-assisted job from 6544a41 (periodics: add assisted launch job, 2024-02-12, #48700), and I cannot figure out the Cluster Bot launch syntax to trigger that path. So for now, I'm adding the new capability there too, to avoid forking the configuration without a clearer understanding of the context. This change will break these Cluster Bot jobs for 4.15 and earlier, where the new capability does not exist or match the ClusterVersion enum. But they're already generally available, so folks may not need access, and if they do, hackery like 428ef75 (ci-operator/jobs/openshift/release/openshift-release-infra-periodics: Temporarily drop MachineAPI from Azure Cluster Bot job, 2023-10-23, #44751) can restore it. [1]: openshift/installer@2dc1ef8
…er to "no-capabilities" (openshift#51070) Similar to bbb31f9 (OCPQE-19978: Add CloudControllerManager Cap for v416, 2024-03-27, openshift#49708), because [1] explains: disabling CloudControllerManager is only supported on the Baremetal, None, or External platform with cloudControllerManager value none Besides the release periodics, I'm also touching the cluster-bot job definitions in openshift-release-infra-periodics.yaml. AWS, Azure, and GCP will all need this new capability. I'm not clear on the packet-assisted job from 6544a41 (periodics: add assisted launch job, 2024-02-12, openshift#48700), and I cannot figure out the Cluster Bot launch syntax to trigger that path. So for now, I'm adding the new capability there too, to avoid forking the configuration without a clearer understanding of the context. This change will break these Cluster Bot jobs for 4.15 and earlier, where the new capability does not exist or match the ClusterVersion enum. But they're already generally available, so folks may not need access, and if they do, hackery like 428ef75 (ci-operator/jobs/openshift/release/openshift-release-infra-periodics: Temporarily drop MachineAPI from Azure Cluster Bot job, 2023-10-23, openshift#44751) can restore it. [1]: openshift/installer@2dc1ef8
Add CloudControllerManager and Ingress Cap for v416
Add a new job on baremetal to test disable ccm on baremetal works well.
@jinyunma @shellyyang1989 @jianlinliu @lihongan @huali9 @miyadav PTAL