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-33713: Reconcile over ICSP/IDMS #4059

Merged
merged 1 commit into from
May 21, 2024
Merged

OCPBUGS-33713: Reconcile over ICSP/IDMS #4059

merged 1 commit into from
May 21, 2024

Conversation

jparrill
Copy link
Contributor

@jparrill jparrill commented May 20, 2024 •
edited
Loading

This is a manual backport of #3860

Now the hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

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

Important NOTE: This PR has been adapted because the manual cherry pick needed things that they are not present in the 4.14 release

@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels May 20, 2024
@openshift-ci-robot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-29110, which is invalid:

  • expected the bug to target either version "4.14." or "openshift-4.14.", but it targets "4.16.0" instead
  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is Verified instead
  • expected Jira Issue OCPBUGS-29110 to depend on a bug targeting a version in 4.15.0, 4.15.z and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

This is a manual backport of #3860

Now the hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

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

This PR has been adapted because the manual cherry pick needed things that they are not in the 4.14 release

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 requested review from csrwng and hasueki May 20, 2024 16:53
@openshift-ci openshift-ci bot added the area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release label May 20, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jparrill

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 May 20, 2024
@jparrill
Copy link
Contributor Author

/jira cherrypick OCPBUGS-33117

@openshift-ci-robot
Copy link

@jparrill: Detected clone of Jira Issue OCPBUGS-33117 with correct target version. Will retitle the PR to link to the clone.
/retitle OCPBUGS-33713: OCPBUGS-29110: Reconcile over ICSP/IDMS

In response to this:

/jira cherrypick OCPBUGS-33117

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 changed the title OCPBUGS-29110: Reconcile over ICSP/IDMS OCPBUGS-33713: OCPBUGS-29110: Reconcile over ICSP/IDMS May 20, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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 May 20, 2024
@openshift-ci-robot
Copy link

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

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-33117 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-33117 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

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

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

In response to this:

This is a manual backport of #3860

Now the hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

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

Important NOTE: This PR has been adapted because the manual cherry pick needed things that they are not in the 4.14 release

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.

@jparrill jparrill changed the title OCPBUGS-33713: OCPBUGS-29110: Reconcile over ICSP/IDMS OCPBUGS-33713: Reconcile over ICSP/IDMS May 20, 2024
@jparrill
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot
Copy link

@jparrill: This pull request references Jira Issue OCPBUGS-33713, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.z) matches configured target version for branch (4.14.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-33117 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-33117 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
  • bug has dependents

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

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

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.

@stevekuznetsov
Copy link
Contributor 

 --- FAIL: TestHostedClusterWatchesEverythingItCreates (0.24s)
    --- FAIL: TestHostedClusterWatchesEverythingItCreates/agent (0.00s)
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
	panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x18 pc=0x29fc5c4]
goroutine 138 [running]:
testing.tRunner.func1.2({0x2cba6e0, 0x553f190})
	/usr/lib/golang/src/testing/testing.go:1526 +0x372
testing.tRunner.func1()
	/usr/lib/golang/src/testing/testing.go:1529 +0x650
panic({0x2cba6e0, 0x553f190})
	/usr/lib/golang/src/runtime/panic.go:890 +0x263
github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster.(*HostedClusterReconciler).reconcile(0xc000bfe240, {0x42c43b8, 0xc000232008}, {{{0x0, 0x0}, {0x2f9bcc1, 0x5}}}, {{0x42c70f8, 0xc000ba7830}, 0x0}, ...)
	/go/src/github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go:1080 +0xb504
github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster.(*HostedClusterReconciler).Reconcile(0xc000bfe240, {0x42c43b8, 0xc000232008}, {{{0x0, 0x0}, {0x2f9bcc1, 0x5}}})
	/go/src/github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go:304 +0x645
github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster.TestHostedClusterWatchesEverythingItCreates.func4(0xc00081f040)
	/go/src/github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/hostedcluster_controller_test.go:992 +0xf3
testing.tRunner(0xc00081f040, 0xc00058ca98)
	/usr/lib/golang/src/testing/testing.go:1576 +0x217
created by testing.(*T).Run
	/usr/lib/golang/src/testing/testing.go:1629 +0x806

@jparrill
OCPBUGS-29110: Reconcile over ICSP/IDMS
be0fe47 
During the normal reconciliation loop, this patch allow the Hypershift
Operator to grab the new ICSP/IDMS and add them to the CPO, allowing the
HCP pods to use the right internal registry image. The changes on the
ICSP/IDMS will make the control-plane-operator pod to be restarted in
order to update the OPENSHIFT_IMG_OVERRIDES env variable.

Signed-off-by: Juan Manuel Parrilla Madrid <jparrill@redhat.com>
@jparrill
Copy link
Contributor Author 

 --- FAIL: TestHostedClusterWatchesEverythingItCreates (0.24s)
    --- FAIL: TestHostedClusterWatchesEverythingItCreates/agent (0.00s)
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
	panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x18 pc=0x29fc5c4]
goroutine 138 [running]:
testing.tRunner.func1.2({0x2cba6e0, 0x553f190})
	/usr/lib/golang/src/testing/testing.go:1526 +0x372
testing.tRunner.func1()
	/usr/lib/golang/src/testing/testing.go:1529 +0x650
panic({0x2cba6e0, 0x553f190})
	/usr/lib/golang/src/runtime/panic.go:890 +0x263
github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster.(*HostedClusterReconciler).reconcile(0xc000bfe240, {0x42c43b8, 0xc000232008}, {{{0x0, 0x0}, {0x2f9bcc1, 0x5}}}, {{0x42c70f8, 0xc000ba7830}, 0x0}, ...)
	/go/src/github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go:1080 +0xb504
github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster.(*HostedClusterReconciler).Reconcile(0xc000bfe240, {0x42c43b8, 0xc000232008}, {{{0x0, 0x0}, {0x2f9bcc1, 0x5}}})
	/go/src/github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go:304 +0x645
github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster.TestHostedClusterWatchesEverythingItCreates.func4(0xc00081f040)
	/go/src/github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/hostedcluster_controller_test.go:992 +0xf3
testing.tRunner(0xc00081f040, 0xc00058ca98)
	/usr/lib/golang/src/testing/testing.go:1576 +0x217
created by testing.(*T).Run
	/usr/lib/golang/src/testing/testing.go:1629 +0x806

Yep, no worries, it was a complicated backport. Now should be ok

@stevekuznetsov
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 21, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 21, 2024

@jparrill: 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 18a8490 into openshift:release-4.14 May 21, 2024
10 checks passed
@openshift-ci-robot
Copy link

@jparrill: Jira Issue OCPBUGS-33713: All pull requests linked via external trackers have merged:

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

In response to this:

This is a manual backport of #3860

Now the hypershift operator does not ignore RegistryOverrides and the metadata inspection works as expected

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

Important NOTE: This PR has been adapted because the manual cherry pick needed things that they are not present in the 4.14 release

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.

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

@csrwng csrwng Awaiting requested review from csrwng

@hasueki hasueki Awaiting requested review from hasueki

Assignees

@stevekuznetsov stevekuznetsov

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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.

None yet
3 participants
@jparrill @openshift-ci-robot @stevekuznetsov