Bug 1954095: Setting user provided tags on bucket creation by ricardomaraschini · Pull Request #679 · openshift/cluster-image-registry-operator

ricardomaraschini · 2021-04-16T08:39:12Z

OpenShift now supports users providing custom AWS tags to be set in all created objects. This PR sets users provided tags, as per enhancement proposal, only when the bucket is created by the operator. Again, as per enhancement proposal, already existing buckets are not updated if user changes tags at Infrastructure level.

Enhancement proposal: openshift/enhancements#706
API changes: openshift/api#864

OpenShift now supports users providing custom AWS tags to be set in all created objects. This PR sets users provided tags, as per enhancement proposal, only when the bucket is created by the operator. Again, as per enhancement proposal, already existing buckets are not updated if user changes tags at Infrastructure level.

Adds an unit test to check s3 driver is creating user provided tags when creating a bucket.

We have two properties that implement Cronjobs(): V1 and V1beta1. As we have been using v1beta1 across our codebase this PR silences a lint complain by being specific about which function we want to call.

ricardomaraschini · 2021-04-16T11:12:00Z

/retest

ricardomaraschini · 2021-04-16T14:13:13Z

/retest

ricardomaraschini · 2021-04-17T07:00:26Z

/retest

ricardomaraschini · 2021-04-17T15:52:31Z

/retest

ricardomaraschini · 2021-04-19T09:01:53Z

/retest

ricardomaraschini · 2021-04-19T10:56:55Z

/assign @dmage

dmage · 2021-04-21T12:08:46Z

/hold
/lgtm
/assign @wzheng1 @bmcelvee @sferich888

This is a new feature, so it should get xxx-approved before we can merge it.

wzheng1 · 2021-04-22T12:42:45Z

@ricardomaraschini Could you please review test case created for this feature: https://url.corp.redhat.com/IR-188 ? Thanks!
cc @dmage

gregsheremeta · 2021-04-22T13:26:21Z

all of the acks are already on the epic, https://issues.redhat.com/browse/IR-187. Do we really need to hold this?

ricardomaraschini · 2021-04-22T13:39:48Z

@wzheng1 LGTM

bmcelvee · 2021-04-22T14:45:55Z

/label docs-approved

Note no-doc: comment in https://issues.redhat.com/browse/IR-187.

dmage · 2021-04-27T14:50:20Z

hm...
/label docs-approved

sferich888 · 2021-04-27T14:58:39Z

/label px-approved
/unassign @sferich888

dmage · 2021-04-27T15:10:55Z

/title Bug 1954095: Setting user provided tags on bucket creation

dmage · 2021-04-27T15:11:53Z

/retitle Bug 1954095: Setting user provided tags on bucket creation

ricardomaraschini · 2021-04-28T14:35:15Z

/retest

ricardomaraschini · 2021-04-28T19:17:41Z

/retest

openshift-ci · 2021-04-28T19:22:38Z

@ricardomaraschini: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/e2e-gcp	`c32b1ab`	link	`/test e2e-gcp`

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.

xiuwang · 2021-04-29T08:43:12Z

/label qe-approved
Validate the custom tags are created in S3 bucket.

dmage · 2021-04-29T09:47:05Z

/retitle Bug 1954095: Setting user provided tags on bucket creation

openshift-ci-robot · 2021-04-29T09:47:30Z

@ricardomaraschini: This pull request references Bugzilla bug 1954095, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.8.0) matches configured target release for branch (4.8.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

Requesting review from QA contact:
/cc @wzheng1

Details

In response to this:

Bug 1954095: Setting user provided tags on bucket creation

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.

dmage · 2021-04-29T09:47:40Z

/lgtm
/hold cancel

openshift-ci-robot · 2021-04-29T09:48:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dmage, ricardomaraschini

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~~ [dmage,ricardomaraschini]

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

dmage · 2021-04-29T11:08:50Z

/retest

openshift-bot · 2021-04-29T11:29:45Z

/retest

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

openshift-ci-robot · 2021-04-29T12:54:21Z

@ricardomaraschini: All pull requests linked via external trackers have merged:

openshift/cluster-image-registry-operator#679

Bugzilla bug 1954095 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1954095: Setting user provided tags on bucket creation

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.

ricardomaraschini · 2021-04-29T14:50:50Z

/cherrypick release-4.7

openshift-cherrypick-robot · 2021-04-29T14:51:38Z

@ricardomaraschini: #679 failed to apply on top of branch "release-4.7":

Applying: Bumping openshift/api
.git/rebase-apply/patch:9849: trailing whitespace.
          codeCoverageTool: Cobertura 
.git/rebase-apply/patch:40833: trailing whitespace.
	
.git/rebase-apply/patch:98305: space before tab in indent.
    	var node = nodes[i];
.git/rebase-apply/patch:98306: space before tab in indent.
    	var name = node.id.toString();
.git/rebase-apply/patch:98307: space before tab in indent.
    	var block = name.substring(name.lastIndexOf("_")+1);
warning: squelched 25 whitespace errors
warning: 30 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing vendor/k8s.io/component-base/version/def.bzl
Removing vendor/k8s.io/client-go/pkg/version/def.bzl
Removing vendor/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go
Removing vendor/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/podpreset.go
Removing vendor/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go
Removing vendor/k8s.io/apiserver/pkg/registry/rest/export.go
Removing vendor/k8s.io/api/settings/v1alpha1/types_swagger_doc_generated.go
Removing vendor/k8s.io/api/settings/v1alpha1/types.go
Removing vendor/k8s.io/api/settings/v1alpha1/generated.proto
Removing vendor/k8s.io/api/batch/v2alpha1/types_swagger_doc_generated.go
Removing vendor/k8s.io/api/batch/v2alpha1/types.go
Removing vendor/k8s.io/api/batch/v2alpha1/generated.proto
Removing vendor/honnef.co/go/tools/staticcheck/vrp/vrp.go
Removing vendor/honnef.co/go/tools/staticcheck/vrp/string.go
Removing vendor/honnef.co/go/tools/staticcheck/vrp/slice.go
Removing vendor/honnef.co/go/tools/staticcheck/vrp/int.go
Removing vendor/honnef.co/go/tools/staticcheck/vrp/channel.go
Removing vendor/honnef.co/go/tools/staticcheck/knowledge.go
Removing vendor/honnef.co/go/tools/staticcheck/CONTRIBUTING.md
Removing vendor/honnef.co/go/tools/ssautil/ssautil.go
Removing vendor/honnef.co/go/tools/ssa/write.go
Removing vendor/honnef.co/go/tools/ssa/testmain.go
Removing vendor/honnef.co/go/tools/ssa/lift.go
Removing vendor/honnef.co/go/tools/simple/CONTRIBUTING.md
Removing vendor/honnef.co/go/tools/internal/passes/buildssa/buildssa.go
Removing vendor/honnef.co/go/tools/functions/pure.go
Removing vendor/google.golang.org/protobuf/internal/genname/name.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/wrappers_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/type_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/timestamp_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/struct_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/source_context_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/field_mask_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/empty_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/duration_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/doc.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/descriptor_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/api_gen.go
Removing vendor/google.golang.org/protobuf/internal/fieldnum/any_gen.go
Removing vendor/google.golang.org/api/internal/pool.go
Removing vendor/golang.org/x/exp/cmd/apidiff/main.go
Removing vendor/golang.org/x/exp/apidiff/report.go
Removing vendor/golang.org/x/exp/apidiff/messageset.go
Removing vendor/golang.org/x/exp/apidiff/correspondence.go
Removing vendor/golang.org/x/exp/apidiff/compatibility.go
Removing vendor/golang.org/x/exp/apidiff/apidiff.go
Removing vendor/golang.org/x/exp/apidiff/README.md
Removing vendor/github.com/prometheus/procfs/cpuinfo_ppc64le.go
Removing vendor/github.com/prometheus/procfs/cpuinfo_mipsle.go
Removing vendor/github.com/prometheus/procfs/cpuinfo_mips64le.go
Removing vendor/github.com/prometheus/procfs/cpuinfo_arm64.go
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/sequences_dummy.go
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/sequences.go
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/go.mod
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/README.md
Removing vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE
Removing vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
Removing vendor/cloud.google.com/go/storage/.repo-metadata.json
Removing vendor/cloud.google.com/go/issue_template.md
Removing vendor/cloud.google.com/go/iam/.repo-metadata.json
Removing vendor/cloud.google.com/go/compute/metadata/.repo-metadata.json
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bumping openshift/api
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".

Details

In response to this:

/cherrypick release-4.7

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.

ricardomaraschini added 3 commits April 16, 2021 10:36

Bumping openshift/api

5f837a3

Adding test for user tags

07eddd6

Adds an unit test to check s3 driver is creating user provided tags when creating a bucket.

openshift-ci-robot requested review from adambkaplan and dmage April 16, 2021 08:39

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2021

ricardomaraschini changed the title ~~Setting user provided tags on bucket creation~~ IR-188: Setting user provided tags on bucket creation Apr 16, 2021

ricardomaraschini mentioned this pull request Apr 16, 2021

WIP - Setting user provided tags on bucket creation #675

Closed

Fix lint by being specific about CronJobs version

08dd177

We have two properties that implement Cronjobs(): V1 and V1beta1. As we have been using v1beta1 across our codebase this PR silences a lint complain by being specific about which function we want to call.

openshift-ci-robot assigned dmage Apr 19, 2021

openshift-ci-robot assigned bmcelvee and sferich888 Apr 21, 2021

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 21, 2021

openshift-ci-robot assigned wzheng1 Apr 21, 2021

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 21, 2021

openshift-ci-robot added the docs-approved Signifies that Docs has signed off on this PR label Apr 27, 2021

openshift-ci-robot unassigned sferich888 Apr 27, 2021

openshift-ci-robot added the px-approved Signifies that Product Support has signed off on this PR label Apr 27, 2021

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2021

Improve logging around bucket tagging process

c32b1ab

openshift-ci-robot added the qe-approved Signifies that QE has signed off on this PR label Apr 29, 2021

openshift-ci-robot changed the title ~~IR-188: Setting user provided tags on bucket creation~~ Bug 1954095: Setting user provided tags on bucket creation Apr 29, 2021

openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Apr 29, 2021

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 29, 2021

openshift-ci-robot requested a review from wzheng1 April 29, 2021 09:47

openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Apr 29, 2021

openshift-merge-robot merged commit b86b056 into openshift:master Apr 29, 2021

ricardomaraschini mentioned this pull request Apr 29, 2021

[release-4.7] Bug 1955176: Setting user provided tags on bucket creation #682

Merged

Conversation

ricardomaraschini commented Apr 16, 2021

Uh oh!

ricardomaraschini commented Apr 16, 2021

Uh oh!

ricardomaraschini commented Apr 16, 2021

Uh oh!

ricardomaraschini commented Apr 17, 2021

Uh oh!

ricardomaraschini commented Apr 17, 2021

Uh oh!

ricardomaraschini commented Apr 19, 2021

Uh oh!

ricardomaraschini commented Apr 19, 2021

Uh oh!

dmage commented Apr 21, 2021

Uh oh!

wzheng1 commented Apr 22, 2021

Uh oh!

gregsheremeta commented Apr 22, 2021

Uh oh!

ricardomaraschini commented Apr 22, 2021

Uh oh!

bmcelvee commented Apr 22, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dmage commented Apr 27, 2021

Uh oh!

sferich888 commented Apr 27, 2021

Uh oh!

dmage commented Apr 27, 2021

Uh oh!

dmage commented Apr 27, 2021

Uh oh!

ricardomaraschini commented Apr 28, 2021

Uh oh!

ricardomaraschini commented Apr 28, 2021

Uh oh!

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

Uh oh!

Uh oh!

xiuwang commented Apr 29, 2021

Uh oh!

dmage commented Apr 29, 2021

Uh oh!

openshift-ci-robot commented Apr 29, 2021

Uh oh!

dmage commented Apr 29, 2021

Uh oh!

openshift-ci-robot commented Apr 29, 2021

Uh oh!

dmage commented Apr 29, 2021

Uh oh!

openshift-bot commented Apr 29, 2021

Uh oh!

openshift-ci-robot commented Apr 29, 2021

Uh oh!

ricardomaraschini commented Apr 29, 2021

Uh oh!

openshift-cherrypick-robot commented Apr 29, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

bmcelvee commented Apr 22, 2021 •

edited

Loading

openshift-ci bot commented Apr 28, 2021 •

edited

Loading