Skip to content

OCPBUGS-44967: Reconcile SecretProvider for CNCC on ARO HCP#4903

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
bryan-cox:aro-hcp-cno-cert
Nov 28, 2024
Merged

OCPBUGS-44967: Reconcile SecretProvider for CNCC on ARO HCP#4903
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
bryan-cox:aro-hcp-cno-cert

Conversation

@bryan-cox
Copy link
Copy Markdown
Member

@bryan-cox bryan-cox commented Oct 11, 2024

What this PR does / why we need it:
Reconcile the SecretProviderClass for the cluster network operator for ARO HCP deployments. The SecretProviderClass is used by the Secrets Store CSI driver to mount a certificate to a volume in the ingress pod deployment.

Which issue(s) this PR fixes:
Fixes OCPBUGS-44967

Checklist

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

@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 Oct 11, 2024
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 11, 2024

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox

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

The pull request process is described 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 openshift-ci Bot added area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release approved Indicates a PR has been approved by an approver from all required OWNERS files. area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels Oct 11, 2024
@netlify
Copy link
Copy Markdown

netlify Bot commented Oct 11, 2024

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 7baa52b
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/673c1231f45a920008598d3d
😎 Deploy Preview https://deploy-preview-4903--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@bryan-cox bryan-cox force-pushed the aro-hcp-cno-cert branch 3 times, most recently from 061992f to 47fb3ec Compare October 11, 2024 17:12
@bryan-cox bryan-cox changed the title Aro hcp cno cert Reconcile SecretProvider for CNCC on ARO HCP Oct 11, 2024
@bryan-cox bryan-cox changed the title Reconcile SecretProvider for CNCC on ARO HCP HOSTEDCP-2036: Reconcile SecretProvider for CNCC on ARO HCP Oct 19, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 19, 2024
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 19, 2024

@bryan-cox: This pull request references HOSTEDCP-2036 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 only the "4.18.0" version, but multiple target versions were set.

Details

In response to this:

What this PR does / why we need it:

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 #

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2024
@bryan-cox bryan-cox force-pushed the aro-hcp-cno-cert branch 2 times, most recently from d240da1 to b8f04c4 Compare October 19, 2024 17:45
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 21, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 22, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@bryan-cox: This pull request references Jira Issue OCPBUGS-44967, which is valid.

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 POST, which is one of the valid states (NEW, ASSIGNED, POST)

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

Details

In response to this:

What this PR does / why we need it:

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 #

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2024
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 27, 2024
Reconcile the SecretProviderClass for the cloud network config
controller (CNCC) for ARO HCP deployments. The SecretProviderClass is
used by the Secrets Store CSI driver to mount a certificate to a volume
in the CNCC pod deployment.

Signed-off-by: Bryan Cox <brcox@redhat.com>
@bryan-cox bryan-cox marked this pull request as ready for review November 27, 2024 14:49
@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 Nov 27, 2024
@bryan-cox
Copy link
Copy Markdown
Member Author

/retest

@csrwng
Copy link
Copy Markdown
Contributor

csrwng commented Nov 28, 2024

/lgtm

@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
Copy Markdown

/retest-required

Remaining retests: 0 against base HEAD 592c231 and 2 for PR HEAD 87af101 in total

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

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

1 similar comment
@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

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

@bryan-cox
Copy link
Copy Markdown
Member Author

/test e2e-aks

@openshift-ci-robot
Copy link
Copy Markdown

/retest-required

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Nov 28, 2024

@bryan-cox: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot Bot merged commit 08c85f3 into openshift:main Nov 28, 2024
@openshift-ci-robot
Copy link
Copy Markdown

@bryan-cox: Jira Issue OCPBUGS-44967: All pull requests linked via external trackers have merged:

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

Details

In response to this:

What this PR does / why we need it:
Reconcile the SecretProviderClass for the cluster network operator for ARO HCP deployments. The SecretProviderClass is used by the Secrets Store CSI driver to mount a certificate to a volume in the ingress pod deployment.

Which issue(s) this PR fixes:
Fixes OCPBUGS-44967

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-bot
Copy link
Copy Markdown

[ART PR BUILD NOTIFIER]

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

@bryan-cox bryan-cox deleted the aro-hcp-cno-cert branch December 2, 2024 13:26
@bryan-cox
Copy link
Copy Markdown
Member Author

/jira backport release-4.18,release-4.17

@openshift-ci-robot
Copy link
Copy Markdown

@bryan-cox: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18
/cherrypick release-4.17

Details

In response to this:

/jira backport release-4.18,release-4.17

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
Copy Markdown

@openshift-ci-robot: #4903 failed to apply on top of branch "release-4.17":

Applying: Reconcile SecretProvider for CNCC on ARO HCP
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
M	control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Reconcile SecretProvider for CNCC on ARO HCP

Details

In response to this:

@bryan-cox: The following backport issues have been created:

Queuing cherrypicks to the requested branches to be created after this PR merges:
/cherrypick release-4.18
/cherrypick release-4.17

In response to this:

/jira backport release-4.18,release-4.17

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.

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.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside 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

Development

Successfully merging this pull request may close these issues.

6 participants