OCPVE-647: annotate manifests with capability name #594

qJkee · 2023-08-28T12:10:54Z

add CloudCredential capability name to all manifests to make component optional

Also, i had to modify the render function. Now, if capability is disabled, we do render nothing

openshift-ci-robot · 2023-08-28T12:10:59Z

@qJkee: This pull request references OCPVE-647 which is a valid jira issue.

Details

In response to this:

add CloudCredential capability name to all manifests to make component optional

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.

abutcher · 2023-09-12T15:38:57Z

/retest-required

openshift-ci-robot · 2023-10-09T10:23:58Z

@qJkee: This pull request references OCPVE-647 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

Details

In response to this:

add CloudCredential capability name to all manifests to make component optional

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.

jstuever · 2023-10-18T18:41:26Z

/cc

codecov · 2023-11-10T14:58:08Z

Codecov Report

Merging #594 (2a56e33) into master (c721882) will increase coverage by 0.45%.
Report is 6 commits behind head on master.
The diff coverage is 66.66%.

Additional details and impacted files

@@            Coverage Diff             @@
##           master     #594      +/-   ##
==========================================
+ Coverage   48.42%   48.87%   +0.45%     
==========================================
  Files          96       96              
  Lines       11741    12044     +303     
==========================================
+ Hits         5686     5887     +201     
- Misses       5425     5511      +86     
- Partials      630      646      +16

Files	Coverage Δ
pkg/assets/bootstrap/bindata.go	`23.85% <ø> (ø)`
pkg/cmd/render/render.go	`50.00% <66.66%> (+2.75%)`	⬆️

... and 5 files with indirect coverage changes

pkg/cmd/render/render.go

pkg/cmd/render/render_test.go

qJkee · 2023-11-23T10:07:39Z

/hold until openshift/api#1571 gets merged

openshift-ci-robot · 2023-11-28T08:34:16Z

@qJkee: This pull request references OCPVE-647 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.15.0" version, but no target version was set.

Details

In response to this:

add CloudCredential capability name to all manifests to make component optional

Also, i had to modify the render function. Now, if capability is disabled, we do render nothing

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.

dlom · 2023-11-28T21:19:04Z

/retest

dlom · 2023-11-28T21:23:02Z

/lgtm

go.mod

add CloudCredential capability name to all manifests to make component optional

manifests/0000_03_cloud-credential-operator_00_namespace.yaml

pkg/cmd/render/render.go

fxierh · 2023-12-05T04:21:58Z

Why do we annotate the manifests under ./bindata/bootstrap ?
AFAIK those are to be rendered and applied by cluster-bootstrap which does not respect CVO annotations like "[capability.openshift.io/name](http://capability.openshift.io/name): CloudCredential".

qJkee · 2023-12-05T14:54:42Z

@fxierh
I'd like to keep this manifests annotated just in case if someone would use them somewhere else

fxierh · 2023-12-05T17:59:40Z

I'd like to keep this manifests annotated just in case if someone would use them somewhere else

This makes me wonder why we maintain two sets of manifests, i.e. the ./bindata/bootstrap ones, and the ./manifests ones.

modify render function to return nothing in case if CCO is disabled in the cluster

Bump priority of the manifests in CVO order. This change is needed because some operators had higher priority for credentials request than actual CRD. This change solving the issue.

qJkee · 2023-12-05T21:03:16Z

/retest

qJkee · 2023-12-05T21:06:19Z

I'd like to keep this manifests annotated just in case if someone would use them somewhere else

This makes me wonder why we maintain two sets of manifests, i.e. the ./bindata/bootstrap ones, and the ./manifests ones.

Well, it's because of bindata
I think it's worth moving to go embed instead of copying them from vendor dir =)

qJkee · 2023-12-06T11:34:38Z

/retest

dlom · 2023-12-06T17:58:03Z

/test e2e-upgrade

dlom · 2023-12-06T20:09:33Z

/lgtm

openshift-ci · 2023-12-06T20:10:34Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dlom, qJkee

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:

~~OWNERS~~ [dlom]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

qJkee · 2023-12-07T06:13:03Z

/unhold

openshift-ci · 2023-12-07T08:16:41Z

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

openshift-bot · 2023-12-07T12:22:55Z

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-cloud-credential-operator-container-v4.16.0-202312071150.p0.gba0e0a8.assembly.stream for distgit ose-cloud-credential-operator.
All builds following this will include this PR.

OCPVE-647: annotate manifests with capability name

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 28, 2023

openshift-ci bot requested review from dlom and lleshchi August 28, 2023 12:11

qJkee changed the title ~~OCPVE-647: annotate manifests with capability name~~ [WIP] OCPVE-647: annotate manifests with capability name Oct 9, 2023

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 9, 2023

openshift-ci bot requested a review from jstuever October 18, 2023 18:41

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 9, 2023

qJkee force-pushed the OCPVE-647 branch from 7e358cf to d0c028e Compare November 10, 2023 13:52

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 10, 2023

qJkee force-pushed the OCPVE-647 branch from d0c028e to 3f8a191 Compare November 10, 2023 14:40

qJkee force-pushed the OCPVE-647 branch from 3f8a191 to 32f8a6a Compare November 10, 2023 15:22

fxierh reviewed Nov 14, 2023

View reviewed changes

pkg/cmd/render/render.go Outdated Show resolved Hide resolved

pkg/cmd/render/render_test.go Outdated Show resolved Hide resolved

qJkee force-pushed the OCPVE-647 branch from 32f8a6a to 551e589 Compare November 17, 2023 07:27

qJkee changed the title ~~[WIP] OCPVE-647: annotate manifests with capability name~~ OCPVE-647: annotate manifests with capability name Nov 23, 2023

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 23, 2023

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 23, 2023

qJkee force-pushed the OCPVE-647 branch from d372eca to 8211fe0 Compare November 28, 2023 08:31

openshift-ci bot assigned dlom Nov 28, 2023

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 28, 2023

jstuever requested changes Nov 28, 2023

View reviewed changes

go.mod Outdated Show resolved Hide resolved

qJkee force-pushed the OCPVE-647 branch 3 times, most recently from 86a1337 to fb43d39 Compare December 4, 2023 20:02

qJkee added 2 commits December 4, 2023 15:31

annotate manifests with capability name

984bca2

add CloudCredential capability name to all manifests to make component optional

bump openshift/api

fc56019

qJkee force-pushed the OCPVE-647 branch from fb43d39 to 9491d60 Compare December 4, 2023 20:32

wking mentioned this pull request Dec 4, 2023

OCPVE-646: add cloud credential capability openshift/cluster-version-operator#963

Merged

wking reviewed Dec 4, 2023

View reviewed changes

manifests/0000_03_cloud-credential-operator_00_namespace.yaml Show resolved Hide resolved

wking reviewed Dec 4, 2023

View reviewed changes

pkg/cmd/render/render.go Outdated Show resolved Hide resolved

qJkee force-pushed the OCPVE-647 branch from 9491d60 to 6c0f5a3 Compare December 5, 2023 13:58

qJkee force-pushed the OCPVE-647 branch from 6c0f5a3 to f7f57a4 Compare December 5, 2023 16:50

qJkee added 2 commits December 5, 2023 14:22

modify render function

527d6bb

modify render function to return nothing in case if CCO is disabled in the cluster

bump priority for CRD and NS in CVO

2a56e33

Bump priority of the manifests in CVO order. This change is needed because some operators had higher priority for credentials request than actual CRD. This change solving the issue.

qJkee force-pushed the OCPVE-647 branch from f7f57a4 to 2a56e33 Compare December 5, 2023 19:22

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 6, 2023

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 7, 2023

openshift-merge-bot bot merged commit ba0e0a8 into openshift:master Dec 7, 2023

ming1013 pushed a commit to ming1013/cloud-credential-operator that referenced this pull request Dec 15, 2025

Merge pull request openshift#594 from qJkee/OCPVE-647

f47b34d

OCPVE-647: annotate manifests with capability name

OCPVE-647: annotate manifests with capability name #594

OCPVE-647: annotate manifests with capability name #594

Uh oh!

Conversation

qJkee commented Aug 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Aug 28, 2023 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abutcher commented Sep 12, 2023

Uh oh!

openshift-ci-robot commented Oct 9, 2023 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jstuever commented Oct 18, 2023

Uh oh!

codecov bot commented Nov 10, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

qJkee commented Nov 23, 2023

Uh oh!

openshift-ci-robot commented Nov 28, 2023 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dlom commented Nov 28, 2023

Uh oh!

dlom commented Nov 28, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fxierh commented Dec 5, 2023

Uh oh!

qJkee commented Dec 5, 2023

Uh oh!

fxierh commented Dec 5, 2023

Uh oh!

qJkee commented Dec 5, 2023

Uh oh!

qJkee commented Dec 5, 2023

Uh oh!

qJkee commented Dec 6, 2023

Uh oh!

dlom commented Dec 6, 2023

Uh oh!

dlom commented Dec 6, 2023

Uh oh!

openshift-ci bot commented Dec 6, 2023

Uh oh!

qJkee commented Dec 7, 2023

Uh oh!

openshift-ci bot commented Dec 7, 2023

Uh oh!

openshift-bot commented Dec 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

qJkee commented Aug 28, 2023 •

edited

Loading

openshift-ci-robot commented Aug 28, 2023 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Oct 9, 2023 •

edited by openshift-ci bot

Loading

codecov bot commented Nov 10, 2023 •

edited

Loading

openshift-ci-robot commented Nov 28, 2023 •

edited by openshift-ci bot

Loading