OCPBUGS-29558: Apply hypershift cluster-profile for ibm-cloud-managed

[openshift-art-build-bot]

Since HyperShift / Hosted Control Plane have adopted include.release.openshift.io/ibm-cloud-managed, to tailor the resources of clusters running in the ROKS IBM environment, the include.release.openshift.io/hypershift addition will allow Hypershift to express different profile choices than ROKS

[openshift-ci-robot]

@openshift-art-build-bot: This pull request references Jira Issue OCPBUGS-29558, 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.16.0) matches configured target version for branch (4.16.0)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @lihongan

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

In response to this:

Since HyperShift / Hosted Control Plane have adopted include.release.openshift.io/ibm-cloud-managed, to tailor the resources of clusters running in the ROKS IBM environment, the include.release.openshift.io/hypershift addition will allow Hypershift to express different profile choices than ROKS

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.

[ashwindasr]

If other files need to be updated to support this change, please let me know.

[openshift-ci]

[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 gcs278 for approval. For more information see the Kubernetes Code Review Process.

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

Needs approval from an approver in each of these files:

• OWNERS

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-art-build-bot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/verify	13dc03b	link	true	/test verify

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/test-infra repository. I understand the commands that are listed here.

[candita]

/assign @alebedev87

[frobware]

The verify job is failing because make crd need to be run. Corrected in #406 (comment).

[candita]

/assign

[candita]

@ashwindasr - you will need to run make crd and add those updates to this PR. Does the bot run make update and expect the crd generation to happen?

[frobware]

The PR description says:

Since HyperShift / Hosted Control Plane have adopted include.release.openshift.io/ibm-cloud-managed, to tailor the resources of clusters running in the ROKS IBM environment, the include.release.openshift.io/hypershift addition will allow Hypershift to express different profile choices than ROKS

However, when I run make crd verify I see:

% make crd verify
hack/update-generated-crd.sh
Using existing yq from "_output/tools/bin/yq-2.4.0"
Using existing yaml-patch from "_output/tools/bin/yaml-patch-v0.0.11"
cp -R ./manifests/* /tmp/tmp.MUh3G4XwcD/
( echo '# *** AUTOMATICALLY GENERATED FILE - DO NOT EDIT ***'; _output/tools/bin/yaml-patch-v0.0.11 -o './profile-patches/ibm-cloud-managed/0000_70_dns-operator_02-deployment.yaml-patch' < '/tmp/tmp.MUh3G4XwcD/0000_70_dns-operator_02-deployment.yaml' ) > '/tmp/tmp.MUh3G4XwcD/0000_70_dns-operator_02-deployment-ibm-cloud-managed.yaml'
diff -Naup ./manifests /tmp/tmp.MUh3G4XwcD
diff -Naup ./manifests/0000_70_dns-operator_02-deployment-ibm-cloud-managed.yaml /tmp/tmp.MUh3G4XwcD/0000_70_dns-operator_02-deployment-ibm-cloud-managed.yaml
--- ./manifests/0000_70_dns-operator_02-deployment-ibm-cloud-managed.yaml       2024-05-09 11:29:37.264802956 +0100
+++ /tmp/tmp.MUh3G4XwcD/0000_70_dns-operator_02-deployment-ibm-cloud-managed.yaml       2024-05-09 11:30:47.864788884 +0100
@@ -3,7 +3,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    include.release.openshift.io/hypershift: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
   name: dns-operator
   namespace: openshift-dns-operator
make: *** [Makefile:29: verify-profile-manifests-manifests] Error 1

which shows the removal of include.release.openshift.io/hypershift. Is that expected given the PR description?

I'm assuming the change should have been made in the openshift/api repo rather than modifying the manifests/0000_70_dns-operator_00.crd.yaml directly because running make will run ./hack/update-generated-crd.sh and manifests/0000_70_dns-operator_00.crd.yaml will get trampled on.

% cat ./hack/update-generated-crd.sh
#!/bin/bash
set -euo pipefail

VENDORED_CRD='vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00.crd.yaml'
LOCAL_CRD='manifests/0000_70_dns-operator_00.crd.yaml'

if [[ -z "${SKIP_COPY+1}" ]]; then
  if ! cmp -s "$LOCAL_CRD" "$VENDORED_CRD"; then
    cp -f "$VENDORED_CRD" "$LOCAL_CRD"
  fi
fi

[candita]

@ashwindasr take a look at c728a0c. It makes similar kinds of changes, but does not change manifests/0000_70_dns-operator_00.crd.yaml. Please check, maybe you don't need to change manifests/0000_70_dns-operator_00.crd.yaml. If you do, you can remove it from this PR and do it via an openshift/api change separately.

[frobware]

I'm assuming the change should have been made in the openshift/api repo

openshift/api#1858