Skip to content
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

Jump to bottom

OCPBUGS-44380: Reconcile proxy CA bundle into hosted cluster #5197

Merged
merged 1 commit into from
Nov 29, 2024
Merged

OCPBUGS-44380: Reconcile proxy CA bundle into hosted cluster #5197

merged 1 commit into from
Nov 29, 2024

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Nov 28, 2024

What this PR does / why we need it:
The openshift controller manager operator syncs the CA bundle that was configured in the global proxy config into a configmap in the openshift-controller-manager namespace. This configmap is then used by the build controller to generate the CA that is mounted into builds for registry access. Because we don't run the controller manager operator in hypershift, this needs to be done by the HCCO. This code adds the reconciliation to the HCCO so that it puts the configmap in the right location.

Ref: https://github.com/openshift/cluster-openshift-controller-manager-operator/blob/08c64512c055ae246b3a14f6d1088d39988c44fe/pkg/operator/usercaobservation/user_ca_observation_controller.go#L80-L90

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-44380

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@csrwng
Reconcile proxy CA bundle into hosted cluster
c9087f9 
The openshift controller manager operator syncs the CA bundle that was
configured in the global proxy config into a configmap in the
openshift-controller-manager namespace. This configmap is then used by
the build controller to generate the CA that is mounted into builds for
registry access. Because we don't run the controller manager operator in
hypershift, this needs to be done by the HCCO. This code adds the
reconciliation to the HCCO so that it puts the configmap in the right
location.

Ref: https://github.com/openshift/cluster-openshift-controller-manager-operator/blob/08c64512c055ae246b3a14f6d1088d39988c44fe/pkg/operator/usercaobservation/user_ca_observation_controller.go#L80-L90
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 28, 2024
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-44380, which is invalid:

  • expected the bug to target the "4.19.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

What this PR does / why we need it:
The openshift controller manager operator syncs the CA bundle that was configured in the global proxy config into a configmap in the openshift-controller-manager namespace. This configmap is then used by the build controller to generate the CA that is mounted into builds for registry access. Because we don't run the controller manager operator in hypershift, this needs to be done by the HCCO. This code adds the reconciliation to the HCCO so that it puts the configmap in the right location.

Ref: https://github.com/openshift/cluster-openshift-controller-manager-operator/blob/08c64512c055ae246b3a14f6d1088d39988c44fe/pkg/operator/usercaobservation/user_ca_observation_controller.go#L80-L90

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-44380

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 28, 2024
@openshift-ci openshift-ci bot requested review from enxebre and hasueki November 28, 2024 02:39
@openshift-ci openshift-ci bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Nov 28, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csrwng

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

The pull request process is described here

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 openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Nov 28, 2024
@csrwng
Copy link
Contributor Author

csrwng commented Nov 28, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Nov 28, 2024
@openshift-ci-robot
Copy link

@csrwng: This pull request references Jira Issue OCPBUGS-44380, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (jiezhao@redhat.com), skipping review request.

In response to this:

/jira refresh

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 removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Nov 28, 2024
enxebre
enxebre reviewed Nov 28, 2024
View reviewed changes
control-plane-operator/hostedclusterconfigoperator/controllers/resources/resources.go
@@ -1397,6 +1402,29 @@ func (r *reconciler) reconcileUserCertCABundle(ctx context.Context, hcp *hyperv1
return nil
}

Copy link
Member

Choose a reason for hiding this comment

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

let's follow up to document the func with the same PR rationale. So is easier to reason about future relocation of the logic across components

@enxebre
Copy link
Member

enxebre commented Nov 28, 2024

/lgtm
/retest

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 8326d86 and 2 for PR HEAD c9087f9 in total

@celebdor
Copy link
Contributor

/cherry-pick release-4.18 release-4.17 release-4.16 release-4.15 release-4.14

@openshift-cherrypick-robot
Copy link

@celebdor: once the present PR merges, I will cherry-pick it on top of release-4.18 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.18 release-4.17 release-4.16 release-4.15 release-4.14

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.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

7 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

2 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 08c85f3 and 2 for PR HEAD c9087f9 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 0d9e89f and 2 for PR HEAD c9087f9 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Nov 29, 2024

@csrwng: The following test 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/prow/e2e-aks c9087f9 link true /test e2e-aks

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 88dee78 into openshift:main Nov 29, 2024
11 of 12 checks passed
@openshift-ci-robot
Copy link

@csrwng: Jira Issue OCPBUGS-44380: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-44380 has been moved to the MODIFIED state.

In response to this:

What this PR does / why we need it:
The openshift controller manager operator syncs the CA bundle that was configured in the global proxy config into a configmap in the openshift-controller-manager namespace. This configmap is then used by the build controller to generate the CA that is mounted into builds for registry access. Because we don't run the controller manager operator in hypershift, this needs to be done by the HCCO. This code adds the reconciliation to the HCCO so that it puts the configmap in the right location.

Ref: https://github.com/openshift/cluster-openshift-controller-manager-operator/blob/08c64512c055ae246b3a14f6d1088d39988c44fe/pkg/operator/usercaobservation/user_ca_observation_controller.go#L80-L90

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #OCPBUGS-44380

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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-cherrypick-robot
Copy link

@celebdor: new pull request created: #5204

In response to this:

/cherry-pick release-4.18 release-4.17 release-4.16 release-4.15 release-4.14

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 29, 2024
Merged
@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: hypershift
This PR has been included in build ose-hypershift-container-v4.19.0-202411292308.p0.g88dee78.assembly.stream.el9.
All builds following this will include this PR.

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

@enxebre enxebre enxebre left review comments

@hasueki hasueki Awaiting requested review from hasueki

Assignees

@enxebre enxebre

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@csrwng @openshift-ci-robot @enxebre @celebdor @openshift-cherrypick-robot @openshift-bot