fix(generate): exclude ServiceAccounts in the CSV from generated bundle #5120

estroz · 2021-08-04T21:45:39Z

Description of the change: exclude ServiceAccounts in the CSV from generated bundle dir.

Motivation for the change: since OLM owns ServiceAccounts specified in a CSV but will create any in a bundle, those already in a CSV should not be also included in a bundle. See #5119 for details.

/kind bug

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Add a new changelog fragment in changelog/fragments (see changelog/fragments/00-template.yaml)
Add or update relevant sections of the docs website in website/content/en/docs

Signed-off-by: Eric Stroczynski <[email protected]>

estroz · 2021-08-04T21:46:18Z

/cc @joelanford

estroz · 2021-08-04T21:56:14Z

/cherry-pick v1.10.x

openshift-cherrypick-robot · 2021-08-04T21:56:15Z

@estroz: once the present PR merges, I will cherry-pick it on top of v1.10.x in a new PR and assign it to you.

In response to this:

/cherry-pick v1.10.x

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.

estroz · 2021-08-04T21:56:20Z

/cherry-pick v1.9.x

openshift-cherrypick-robot · 2021-08-04T21:56:21Z

@estroz: once the present PR merges, I will cherry-pick it on top of v1.9.x in a new PR and assign it to you.

In response to this:

/cherry-pick v1.9.x

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.

estroz · 2021-08-04T21:56:43Z

Because we're releasing v1.8.2 anyway

/cherry-pick v1.8.x

openshift-cherrypick-robot · 2021-08-04T21:56:44Z

@estroz: once the present PR merges, I will cherry-pick it on top of v1.8.x in a new PR and assign it to you.

In response to this:

Because we're releasing v1.8.2 anyway

/cherry-pick v1.8.x

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.

fabianvf

/lgtm

fabianvf · 2021-08-05T16:47:37Z

internal/cmd/operator-sdk/generate/internal/manifests.go

 		objs = append(objs, &c.V1beta1CustomResourceDefinitions[i])
 	}

-	// All ServiceAccounts passed in should be written.


Does this do anything useful or was it just broken behavior from the beginning?

Broken behavior, based on incorrect assumptions.

rashmigottipati

/lgtm

openshift-cherrypick-robot · 2021-08-05T17:07:27Z

@estroz: new pull request created: #5124

In response to this:

/cherry-pick v1.10.x

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.

openshift-cherrypick-robot · 2021-08-05T17:08:00Z

@estroz: #5120 failed to apply on top of branch "v1.9.x":

Applying: fix(generate): exclude ServiceAccounts in the CSV from generated bundle
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Removing testdata/helm/memcached-operator/bundle/manifests/memcached-operator-controller-manager_v1_serviceaccount.yaml
Removing testdata/go/v3/memcached-operator/bundle/manifests/memcached-operator-controller-manager_v1_serviceaccount.yaml
Removing testdata/ansible/memcached-operator/bundle/manifests/memcached-operator-controller-manager_v1_serviceaccount.yaml
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix(generate): exclude ServiceAccounts in the CSV from generated bundle
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick v1.9.x

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.

openshift-cherrypick-robot · 2021-08-05T17:08:34Z

@estroz: #5120 failed to apply on top of branch "v1.8.x":

Applying: fix(generate): exclude ServiceAccounts in the CSV from generated bundle
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Removing testdata/helm/memcached-operator/bundle/manifests/memcached-operator-controller-manager_v1_serviceaccount.yaml
Removing testdata/go/v3/memcached-operator/bundle/manifests/memcached-operator-controller-manager_v1_serviceaccount.yaml
Removing testdata/ansible/memcached-operator/bundle/manifests/memcached-operator-controller-manager_v1_serviceaccount.yaml
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix(generate): exclude ServiceAccounts in the CSV from generated bundle
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

Because we're releasing v1.8.2 anyway

/cherry-pick v1.8.x

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.

…le (operator-framework#5120) Signed-off-by: Eric Stroczynski <[email protected]>

…rated bundle (#5124) This is an automated cherry-pick of #5120 Signed-off-by: Eric Stroczynski <[email protected]>

…ated bundle (#5126) Cherry-pick of #5120 Signed-off-by: Eric Stroczynski <[email protected]>

…ated bundle (#5127) Cherry-pick of #5120 Signed-off-by: Eric Stroczynski <[email protected]>

…le (operator-framework#5120) Signed-off-by: Eric Stroczynski <[email protected]>

…le (operator-framework#5120) Signed-off-by: Eric Stroczynski <[email protected]> Signed-off-by: Thierry Wasylczenko <[email protected]>

openshift-ci bot added the kind/bug Categorizes issue or PR as related to a bug. label Aug 4, 2021

openshift-ci bot requested review from asmacdo and rashmigottipati August 4, 2021 21:45

fix(generate): exclude ServiceAccounts in the CSV from generated bundle

80dab49

Signed-off-by: Eric Stroczynski <[email protected]>

estroz force-pushed the fix/bundle-sas branch from 64b742f to 80dab49 Compare August 4, 2021 21:45

openshift-ci bot requested a review from joelanford August 4, 2021 21:46

estroz mentioned this pull request Aug 4, 2021

Bump operator-framework api to 0.10.5 #5119

Merged

fabianvf approved these changes Aug 5, 2021

View reviewed changes

openshift-ci bot assigned fabianvf Aug 5, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 5, 2021

rashmigottipati approved these changes Aug 5, 2021

View reviewed changes

openshift-ci bot assigned rashmigottipati Aug 5, 2021

estroz merged commit 6f926b7 into operator-framework:master Aug 5, 2021

estroz deleted the fix/bundle-sas branch August 5, 2021 17:06

openshift-cherrypick-robot mentioned this pull request Aug 5, 2021

[v1.10.x] fix(generate): exclude ServiceAccounts in the CSV from generated bundle #5124

Merged

estroz pushed a commit to estroz/operator-sdk that referenced this pull request Aug 5, 2021

fix(generate): exclude ServiceAccounts in the CSV from generated bund…

d806c1c

…le (operator-framework#5120) Signed-off-by: Eric Stroczynski <[email protected]>

estroz pushed a commit to estroz/operator-sdk that referenced this pull request Aug 5, 2021

fix(generate): exclude ServiceAccounts in the CSV from generated bund…

1f09411

…le (operator-framework#5120) Signed-off-by: Eric Stroczynski <[email protected]>

This was referenced Aug 5, 2021

[v1.8.x] fix(generate): exclude ServiceAccounts in the CSV from generated bundle #5126

Merged

[v1.9.x] fix(generate): exclude ServiceAccounts in the CSV from generated bundle #5127

Merged

estroz pushed a commit that referenced this pull request Aug 5, 2021

[v1.10.x] fix(generate): exclude ServiceAccounts in the CSV from gene…

ca54e14

…rated bundle (#5124) This is an automated cherry-pick of #5120 Signed-off-by: Eric Stroczynski <[email protected]>

estroz pushed a commit that referenced this pull request Aug 5, 2021

[v1.8.x] fix(generate): exclude ServiceAccounts in the CSV from gener…

a3a6bcc

…ated bundle (#5126) Cherry-pick of #5120 Signed-off-by: Eric Stroczynski <[email protected]>

estroz pushed a commit that referenced this pull request Aug 5, 2021

[v1.9.x] fix(generate): exclude ServiceAccounts in the CSV from gener…

c51f730

…ated bundle (#5127) Cherry-pick of #5120 Signed-off-by: Eric Stroczynski <[email protected]>

bentito pushed a commit to bentito/operator-sdk that referenced this pull request Aug 24, 2021

fix(generate): exclude ServiceAccounts in the CSV from generated bund…

4747ce6

…le (operator-framework#5120) Signed-off-by: Eric Stroczynski <[email protected]>

ebaron mentioned this pull request Nov 1, 2021

Upgrade Operator SDK to at least 1.8.2 cryostatio/cryostat-operator#287

Closed

fix(generate): exclude ServiceAccounts in the CSV from generated bundle #5120

fix(generate): exclude ServiceAccounts in the CSV from generated bundle #5120

Uh oh!

Conversation

estroz commented Aug 4, 2021

Uh oh!

estroz commented Aug 4, 2021

Uh oh!

estroz commented Aug 4, 2021

Uh oh!

openshift-cherrypick-robot commented Aug 4, 2021

Uh oh!

estroz commented Aug 4, 2021

Uh oh!

openshift-cherrypick-robot commented Aug 4, 2021

Uh oh!

estroz commented Aug 4, 2021

Uh oh!

openshift-cherrypick-robot commented Aug 4, 2021

Uh oh!

fabianvf left a comment

Choose a reason for hiding this comment

Uh oh!

fabianvf Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

estroz Aug 5, 2021

Choose a reason for hiding this comment

Uh oh!

rashmigottipati left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-cherrypick-robot commented Aug 5, 2021

Uh oh!

openshift-cherrypick-robot commented Aug 5, 2021

Uh oh!

openshift-cherrypick-robot commented Aug 5, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants