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.

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

OCPBUGS-41365: use appropriate images to avoid overrides in dataplane #4791

Merged
merged 1 commit into from
Oct 30, 2024

Conversation

Patryk-Stefanski
Copy link
Contributor

@Patryk-Stefanski Patryk-Stefanski commented Sep 24, 2024

What this PR does / why we need it: fixes image registry overrides being used in data plane.

Prereq: openshift/cluster-network-operator#2507

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-41365

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 Sep 24, 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 Sep 24, 2024
@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-41365, which is invalid:

  • expected the bug to target the "4.18.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:

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-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 Sep 24, 2024
Copy link
Contributor

openshift-ci bot commented Sep 24, 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 openshift-ci bot added do-not-merge/needs-area area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Sep 24, 2024
@sjenning
Copy link
Contributor

/approve
/lgtm
/jira-refresh

@sjenning
Copy link
Contributor

/jira refresh

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 24, 2024
@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 24, 2024
Copy link
Contributor

openshift-ci bot commented Sep 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Patryk-Stefanski, sjenning

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

@sjenning: This pull request references Jira Issue OCPBUGS-41365, 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.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @fxierh

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 24, 2024
@openshift-ci openshift-ci bot requested a review from fxierh September 24, 2024 16:25
@openshift-ci-robot
Copy link

@Patryk-Stefanski: This pull request references Jira Issue OCPBUGS-41365, which is valid.

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

Requesting review from QA contact:
/cc @fxierh

In response to this:

What this PR does / why we need it: fixes image registry overrides being used in data plane.

Prereq: openshift/cluster-network-operator#2507

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-41365

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 openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 26, 2024
Copy link

netlify bot commented Sep 26, 2024

Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 73f00d0
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/6706abad4e6e0900087f8723
😎 Deploy Preview https://deploy-preview-4791--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.

@Patryk-Stefanski
Copy link
Contributor Author

/test all

@Patryk-Stefanski
Copy link
Contributor Author

/retest-required

@Patryk-Stefanski
Copy link
Contributor Author

/test e2e-kubevirt-aws-ovn-reduced

@Patryk-Stefanski Patryk-Stefanski marked this pull request as ready for review September 30, 2024 15:45
@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 Sep 30, 2024
@Patryk-Stefanski
Copy link
Contributor Author

/test all

@openshift-ci openshift-ci bot requested a review from csrwng September 30, 2024 15:46
@Patryk-Stefanski
Copy link
Contributor Author

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 9, 2024
@Patryk-Stefanski Patryk-Stefanski force-pushed the OCPBUGS-41365 branch 4 times, most recently from d913906 to 29fcacb Compare October 10, 2024 13:05
@Patryk-Stefanski
Copy link
Contributor Author

/test e2e-aks

2 similar comments
@Patryk-Stefanski
Copy link
Contributor Author

/test e2e-aks

@Patryk-Stefanski
Copy link
Contributor Author

/test e2e-aks

@sjenning
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 29, 2024
@Patryk-Stefanski
Copy link
Contributor Author

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 30, 2024
@Patryk-Stefanski
Copy link
Contributor Author

/test e2e-aks

1 similar comment
@Patryk-Stefanski
Copy link
Contributor Author

/test e2e-aks

Copy link
Contributor

openshift-ci bot commented Oct 30, 2024

@Patryk-Stefanski: all tests passed!

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 459bbfe into openshift:main Oct 30, 2024
14 checks passed
@openshift-ci-robot
Copy link

@Patryk-Stefanski: Jira Issue OCPBUGS-41365: All pull requests linked via external trackers have merged:

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

In response to this:

What this PR does / why we need it: fixes image registry overrides being used in data plane.

Prereq: openshift/cluster-network-operator#2507

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-41365

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

[ART PR BUILD NOTIFIER]

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

@Patryk-Stefanski
Copy link
Contributor Author

/cherry-pick release-4.17

@openshift-cherrypick-robot

@Patryk-Stefanski: #4791 failed to apply on top of branch "release-4.17":

Applying: OCPBUGS-41365: dont use registryOverrides on kube rbac proxy image because its used in dataplane
Using index info to reconstruct a base tree...
M	control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
M	control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_No_private_apiserver_connectivity__proxy_apiserver_address_is_set.yaml
M	control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_Preserve_existing_resources.yaml
M	control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_Private_apiserver_connectivity__proxy_apiserver_address_is_unset.yaml
M	control-plane-operator/controllers/hostedcontrolplane/storage/envreplace.go
M	control-plane-operator/hostedclusterconfigoperator/cmd.go
Falling back to patching base and 3-way merge...
Auto-merging control-plane-operator/hostedclusterconfigoperator/cmd.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/storage/envreplace.go
CONFLICT (content): Merge conflict in control-plane-operator/controllers/hostedcontrolplane/storage/envreplace.go
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_Private_apiserver_connectivity__proxy_apiserver_address_is_unset.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_Preserve_existing_resources.yaml
Auto-merging control-plane-operator/controllers/hostedcontrolplane/cno/testdata/zz_fixture_TestReconcileDeployment_No_private_apiserver_connectivity__proxy_apiserver_address_is_set.yaml
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 OCPBUGS-41365: dont use registryOverrides on kube rbac proxy image because its used in dataplane

In response to this:

/cherry-pick 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 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/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
Development

Successfully merging this pull request may close these issues.

6 participants