Skip to content

OCPBUGS-61001: v2/clusterresources: add def namespace to UpdateService #1262

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
Open
r4f4 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-61001: v2/clusterresources: add def namespace to UpdateService #1262

r4f4 wants to merge 1 commit into from

Conversation

@r4f4
Copy link
Contributor

@r4f4 r4f4 commented Sep 16, 2025 •
edited
Loading

Description

According to our docs, the default/recommended namespace is "openshift-update-service" [1]. If users want to use a custom namespace, they can edit the generated updateService.yaml file.

[1] https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html-single/disconnected_environments/index#update-service-install-web-console_updating-disconnected-cluster-osus

Github / Jira issue: OCPBUGS-61001

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code Improvements (Refactoring, Performance, CI upgrades, etc)
  • Internal repo assets (diagrams / docs on github repo)
  • This change requires a documentation update on openshift docs

How Has This Been Tested?

WIP

Expected Outcome

updateService.yaml file contains the "openshift-update-service" namespace.

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

openshift-ci-robot commented Sep 16, 2025

@r4f4: This pull request references Jira Issue OCPBUGS-61001, which is invalid:

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

Details

In response to this:

Description

According to our docs, the default/recommended namespace is "openshift-update-service" [1]. If users want to use a custom namespace, they can edit the generated updateService.yaml file.

[1] https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html-single/disconnected_environments/index#update-service-install-web-console_updating-disconnected-cluster-osus

Github / Jira issue: OCPBUGS-61001

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Code Improvements (Refactoring, Performance, CI upgrades, etc)
  • Internal repo assets (diagrams / docs on github repo)
  • This change requires a documentation update on openshift docs

How Has This Been Tested?

WIP

Expected Outcome

updateService.yaml file contains the "openshift-update-service" namespace.

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.

@r4f4
Copy link
Contributor Author

r4f4 commented Sep 16, 2025

/hold
for testing

@r4f4
Copy link
Contributor Author

r4f4 commented Sep 16, 2025

/jira refresh

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

openshift-ci-robot commented Sep 16, 2025

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

Requesting review from QA contact:
/cc @nidangavali

Details

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-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 9, 2025
aguidirh
aguidirh reviewed Dec 15, 2025
View reviewed changes
Copy link
Contributor

@aguidirh aguidirh left a comment

Choose a reason for hiding this comment

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

I jut realized that my code review for this PR was pending for a long time, sorry about that.

v2/internal/pkg/clusterresources/clusterresources_test.go
Comment on lines 1328 to 1397
err := cr.UpdateServiceGenerator(graphImage, releaseImage)
if err != nil {
t.Fatalf("should not fail")
}
assert.NoError(t, err)

_, err = os.Stat(filepath.Join(workingDir, clusterResourcesDir))
if err != nil {
t.Fatalf("output folder should exist")
}
assert.NoError(t, err, "output folder should exist")

resourceFiles, err := os.ReadDir(filepath.Join(workingDir, clusterResourcesDir))
if err != nil {
t.Fatalf("ls output folder should not fail")
}

if len(resourceFiles) != 1 {
t.Fatalf("output folder should contain 1 updateservice.yaml file")
}
assert.NoError(t, err, "ls output folder should not fail")

assert.Len(t, resourceFiles, 1, "output folder should contain 1 updateservice.yaml file")
assert.Equal(t, updateServiceFilename, resourceFiles[0].Name())
Copy link
Contributor

@aguidirh aguidirh Sep 17, 2025

Choose a reason for hiding this comment

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

Thanks for simplifying the test code with the assert module.

@aguidirh
Copy link
Contributor

aguidirh commented Dec 15, 2025

@r4f4 once PR is rebased I will add the required labels.

@r4f4
OCPBUGS-61001: v2/clusterresources: add def namespace to UpdateService
f4d093c 
According to our docs, the default/recommended namespace is
"openshift-update-service" [1]. If users want to use a custom namespace,
they can edit the generated updateService.yaml file.

[1] https://docs.redhat.com/en/documentation/openshift_container_platform/4.19/html-single/disconnected_environments/index#update-service-install-web-console_updating-disconnected-cluster-osus
@r4f4 r4f4 force-pushed the ocpbugs-61001-update-service-namespace branch from 9983ba0 to f4d093c Compare December 15, 2025 18:21
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 15, 2025
@openshift-ci
Copy link

openshift-ci bot commented Dec 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: r4f4

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 15, 2025
@openshift-ci
Copy link

openshift-ci bot commented Dec 15, 2025

@r4f4: 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.

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

Reviewers

@aguidirh aguidirh aguidirh left review comments

@nidangavali nidangavali Awaiting requested review from nidangavali

@lmzuccarelli lmzuccarelli Awaiting requested review from lmzuccarelli

@sherine-k sherine-k Awaiting requested review from sherine-k

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@r4f4 @openshift-ci-robot @aguidirh @openshift-merge-robot