Skip to content

Conversation

@xiuwang
Copy link
Contributor

@xiuwang xiuwang commented Dec 26, 2025

Resolved:

  1. After this bug OCPBUGS-53261 fix, the duplicated dns in cert will cause error, add annotation to skip the conflict check for this "azure-aks-hypershift-full-cert-guest-f14" profile
  2. Combine kubeconfig with the generated cert to resolve hosted cluster's kubeconfig x509 error

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 26, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 26, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@xiuwang
Copy link
Contributor Author

xiuwang commented Dec 26, 2025

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 26, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: xiuwang
Once this PR has been reviewed and has the lgtm label, please assign heliubj18 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link
Contributor

@xiuwang: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@xiuwang
Copy link
Contributor Author

xiuwang commented Dec 26, 2025

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14

@openshift-ci-robot
Copy link
Contributor

@xiuwang: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@xiuwang
Copy link
Contributor Author

xiuwang commented Dec 26, 2025

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14

@openshift-ci-robot
Copy link
Contributor

@xiuwang: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-ci-robot
Copy link
Contributor

[REHEARSALNOTIFIER]
@xiuwang: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14 N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14 N/A periodic Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14 N/A periodic Registry content changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@xiuwang
Copy link
Contributor Author

xiuwang commented Dec 29, 2025

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14

@openshift-ci-robot
Copy link
Contributor

@xiuwang: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@xiuwang
Copy link
Contributor Author

xiuwang commented Dec 29, 2025

/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14

@openshift-ci-robot
Copy link
Contributor

@xiuwang: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@xiuwang xiuwang marked this pull request as ready for review December 29, 2025 02:04
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 29, 2025
@xiuwang xiuwang changed the title Fix OCPQE-31342 OCPQE-31342: Update aggregated-cert post check Dec 29, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 29, 2025

@xiuwang: This pull request references OCPQE-31342 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Resolved:

  1. After this bug OCPBUGS-53261 fix, the duplicated dns in cert will cause error, add annotation to skip the conflict check for this "azure-aks-hypershift-full-cert-guest-f14" profile
  2. Combine kubeconfig with the generated cert to resolve hosted cluster's kubeconfig x509 error

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-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 29, 2025
Copy link
Member

@lunarwhite lunarwhite left a comment

Choose a reason for hiding this comment

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

Thanks for your patch fix!

Comment on lines +214 to +218
# Get Let's Encrypt certificate chain from the custom serving cert secret
LETSENCRYPT_CERT="$(mgmt oc get secret -n clusters "$AGGREGATED_CERT_SECRET_NAME" -o jsonpath='{.data.tls\.crt}')"

# Combine CAs: OpenShift root CA + Let's Encrypt cert chain
COMBINED_CA_DATA="$(echo -e "${CURRENT_CA_DATA}\n${LETSENCRYPT_CERT}" | base64 -d | base64 | tr -d '\n')"
Copy link
Member

Choose a reason for hiding this comment

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

Apologies I have minor knowledge in Hypershift, I have following concerns IMHO:

  • Certificates issued by the Let's Encrypt are publicly trusted, so clients should already trust them without adding them to kubeconfig. If something is broken without this combination step, perhaps we should fix it elsewhere rather than relying on this workaround?
  • The certs stored in .data.tls.crt include the server certificate, which should not be included in the combined CA bundle used for TLS verification.

There is another existing TODO (might be relevant / out-of-scope):

# Update KUBECONFIG to allow secure communication between kubelets and the external KAS endpoint
# TODO: remove this workaround once https://issues.redhat.com/browse/OCPBUGS-41853 is resolved
remove_kubelet_kubeconfig_cluster_ca

Just checked OCPBUGS-41853 now is resolved. Not sure whether removing the old outdated workaround would help simplify what this PR is trying to fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OCPBUGS-41853 fixed as a document update, OCPSTRAT-1516 add a new approach to add external dns with cert , qe prow ci added in https://github.com/openshift/release/pull/64900/files.
Maybe I can configure to deprecated azure-aks-hypershift-full-cert-guest-f14 jobs

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 29, 2025

@xiuwang: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14 60535b1 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.21-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14 60535b1 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.19-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14 60535b1 link unknown /pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.20-amd64-nightly-azure-aks-hypershift-full-cert-guest-f14

Full PR test history. Your PR dashboard.

Details

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants