Skip to content

fix: Fix the airgap script on ROSA/HyperShift 4.18 by skipping the creation of an IDMS resource - #963

Merged
rm3l merged 3 commits into
redhat-developer:mainfrom
rm3l:RHIDP-6684--fix-airgap-script-on-rosa-hypershift-4.18
Apr 1, 2025
Merged

fix: Fix the airgap script on ROSA/HyperShift 4.18 by skipping the creation of an IDMS resource#963
rm3l merged 3 commits into
redhat-developer:mainfrom
rm3l:RHIDP-6684--fix-airgap-script-on-rosa-hypershift-4.18

Conversation

@rm3l

@rm3l rm3l commented Mar 31, 2025

Copy link
Copy Markdown
Member

Description

As depicted in https://issues.redhat.com/browse/RHIDP-6684, the creation of the IDMS is now being denied by the cluster on ROSA/HyperShift 4.18+

This PR detects the type of cluster (with a hosted control plane or not), and can decide whether to skip creating such forbidden resources.

Which issue(s) does this PR fix or relate to

PR acceptance criteria

  • Tests
  • Documentation

How to test changes / Special notes to the reviewer

Create a ROSA 4.18 cluster, and run: .rhdh/scripts/prepare-restricted-environment.sh from this PR branch. It should work.
It should not affect regular OCP clusters or non-OCP clusters.

rm3l added 3 commits March 31, 2025 18:27
This will allow the script to handle situations where
there can be limitations on the
kind of resources that can be created/updated/deleted
…ontrol planes, like ROSA or HyperShift

They actually never worked on such clusters (but were still being created),
so it should be safe to skip that part.
…esource on clusters with hosted control planes, like ROSA or HyperShift

This also appears to be restricted on such clusters
@openshift-ci

openshift-ci Bot commented Mar 31, 2025

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign rm3l for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@rm3l

rm3l commented Mar 31, 2025

Copy link
Copy Markdown
Member Author

/cherry-pick release-1.6

@openshift-cherrypick-robot

Copy link
Copy Markdown

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

Details

In response to this:

/cherry-pick release-1.6 release-1.5

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.

@rm3l

rm3l commented Mar 31, 2025

Copy link
Copy Markdown
Member Author

/cherry-pick release-1.5

@openshift-cherrypick-robot

Copy link
Copy Markdown

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

Details

In response to this:

/cherry-pick release-1.5

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.

@rm3l rm3l left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Tested successfully on ROSA 4.18, regular OCP, and standard K8s.

@rm3l
rm3l merged commit 4c2b1dd into redhat-developer:main Apr 1, 2025
@rm3l
rm3l deleted the RHIDP-6684--fix-airgap-script-on-rosa-hypershift-4.18 branch April 1, 2025 09:31
@openshift-cherrypick-robot

Copy link
Copy Markdown

@rm3l: new pull request created: #968

Details

In response to this:

/cherry-pick release-1.6

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

Copy link
Copy Markdown

@rm3l: new pull request created: #969

Details

In response to this:

/cherry-pick release-1.5

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.

Fortune-Ndlovu pushed a commit to Fortune-Ndlovu/rhdh-operator that referenced this pull request Sep 6, 2025
…eation of an IDMS resource (redhat-developer#963)

* fix: Detect if the OCP cluster has a hosted control plane or not

This will allow the script to handle situations where
there can be limitations on the
kind of resources that can be created/updated/deleted

* fix: Skip the creation of the IDMS resource on clusters with hosted control planes, like ROSA or HyperShift

They actually never worked on such clusters (but were still being created),
so it should be safe to skip that part.

* fix: Skip disabling default sources of the cluster-wide OperatorHub resource on clusters with hosted control planes, like ROSA or HyperShift

This also appears to be restricted on such clusters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants