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

Annotate manifests for single-node-developer cluster profile #498

Merged

Conversation

cfergeau
Copy link
Contributor

This partially implements phase 1 of https://github.com/openshift/enhancements#482
and does not change behavior. Initially, all cluster-ingress-operator
manifests are included in the single-node-developer cluster profile.
Follow-on PRs may exclude any of these that are not needed in the
profile.

@cfergeau
Copy link
Contributor Author

Probably best to wait until openshift/api#792 is merged as this will make it easier to fix CI.

The newly added 'include.release.openshift.io/single-node-developer: true' annotation will be needed in the next commit
This partially implements phase 1 of https://github.com/openshift/enhancements#482
and does not change behavior. Initially, all cluster-ingress-operator
manifests are included in the single-node-developer cluster profile.
Follow-on PRs may exclude any of these that are not needed in the
profile.

The changes in manifests/00-custom-resource-definition-internal.yaml
and manifests/00-custom-resource-definition.yaml will be overwritten
at make time until the openshift/api module is updated to a version
which has the corresponding changes.
@cfergeau
Copy link
Contributor Author

/retest

@sgreene570
Copy link
Contributor

Interesting that #494 merged without a bump for openshift/api.
Either way, this PR will correct the issue on master. Thanks!
/lgtm

@frobware
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfergeau, frobware, sgreene570

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:
  • OWNERS [frobware,sgreene570]

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 openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 30, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@sgreene570
Copy link
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

7 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@sgreene570
Copy link
Contributor

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@sgreene570
Copy link
Contributor

/test e2e-upgrade

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit ffe0088 into openshift:master Dec 2, 2020
wking added a commit to wking/cluster-ingress-operator that referenced this pull request Dec 22, 2021
There's an enhancement proposal for this profile [1], and the Code
Ready Containers folks took a run at using it in [2] before backing
off in [3].  I don't have any problems with having a specific CRC
profile, but until we end up going that way, save ourselves the mental
overhead of trying to guess whether it will want each of our manifest
resources by dropping the annotation across the board.

Effectively reverts abd8a20 (Annotate manifests for
single-node-developer cluster profile, 2020-11-27, openshift#498).

[1]: https://github.com/openshift/enhancements/blob/2911c46bf7d2f22eb1ab81739b4f9c2603fd0c07/enhancements/single-node/developer-cluster-profile.md
[2]: crc-org/snc#338
[3]: crc-org/snc#373 (comment)
wking added a commit to wking/cluster-ingress-operator that referenced this pull request Dec 22, 2021
There's an enhancement proposal for this profile [1], and the Code
Ready Containers folks took a run at using it in [2] before backing
off in [3].  I don't have any problems with having a specific CRC
profile, but until we end up going that way, save ourselves the mental
overhead of trying to guess whether it will want each of our manifest
resources by dropping the annotation across the board.

Effectively reverts abd8a20 (Annotate manifests for
single-node-developer cluster profile, 2020-11-27, openshift#498).

Generated with:

  $ sed -i '/single-node-developer/d' manifests/*.yaml
  $ git checkout HEAD -- manifests/00-custom-resource-definition.yaml

where I'm leaving the CRD alone to avoid [4]:

  hack/verify-generated-crd.sh
  --- vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml	2021-12-22 07:10:24.000000000 +0000
  +++ manifests/00-custom-resource-definition.yaml	2021-12-22 07:10:25.000000000 +0000
  @@ -5,7 +5,6 @@ metadata:
       api-approved.openshift.io: openshift/api#616
       include.release.openshift.io/ibm-cloud-managed: "true"
       include.release.openshift.io/self-managed-high-availability: "true"
  -    include.release.openshift.io/single-node-developer: "true"
     name: ingresscontrollers.operator.openshift.io
   spec:
     group: operator.openshift.io
  invalid CRD: vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml => manifests/00-custom-resource-definition.yaml

[1]: https://github.com/openshift/enhancements/blob/2911c46bf7d2f22eb1ab81739b4f9c2603fd0c07/enhancements/single-node/developer-cluster-profile.md
[2]: crc-org/snc#338
[3]: crc-org/snc#373 (comment)
[4]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-ingress-operator/692/pull-ci-openshift-cluster-ingress-operator-master-verify/1473551168843026432#1:build-log.txt%3A14
wking added a commit to wking/cluster-ingress-operator that referenced this pull request Dec 22, 2021
There's an enhancement proposal for this profile [1], and the Code
Ready Containers folks took a run at using it in [2] before backing
off in [3].  I don't have any problems with having a specific CRC
profile, but until we end up going that way, save ourselves the mental
overhead of trying to guess whether it will want each of our manifest
resources by dropping the annotation across the board.

Effectively reverts abd8a20 (Annotate manifests for
single-node-developer cluster profile, 2020-11-27, openshift#498).

Generated with:

  $ sed -i '/single-node-developer/d' manifests/*.yaml
  $ git checkout HEAD -- manifests/00-custom-resource-definition*

where I'm leaving the CRDs alone to avoid things like [4]:

  hack/verify-generated-crd.sh
  --- vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml	2021-12-22 07:10:24.000000000 +0000
  +++ manifests/00-custom-resource-definition.yaml	2021-12-22 07:10:25.000000000 +0000
  @@ -5,7 +5,6 @@ metadata:
       api-approved.openshift.io: openshift/api#616
       include.release.openshift.io/ibm-cloud-managed: "true"
       include.release.openshift.io/self-managed-high-availability: "true"
  -    include.release.openshift.io/single-node-developer: "true"
     name: ingresscontrollers.operator.openshift.io
   spec:
     group: operator.openshift.io
  invalid CRD: vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml => manifests/00-custom-resource-definition.yaml

[1]: https://github.com/openshift/enhancements/blob/2911c46bf7d2f22eb1ab81739b4f9c2603fd0c07/enhancements/single-node/developer-cluster-profile.md
[2]: crc-org/snc#338
[3]: crc-org/snc#373 (comment)
[4]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_cluster-ingress-operator/692/pull-ci-openshift-cluster-ingress-operator-master-verify/1473551168843026432#1:build-log.txt%3A14
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. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants