Manual Sync of #137

[mprahl]

Closes #463

The conflict was in go.sum

[mprahl]

/cherry-pick release-2.9

[openshift-cherrypick-robot]

@mprahl: once the present PR merges, I will cherry-pick it on top of release-2.9 in a new PR and assign it to you.

In response to this:

/cherry-pick release-2.9

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-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JustinKuli, mprahl

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 [JustinKuli,mprahl]

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

[sonarqubecloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

86.8% Coverage
0.0% Duplication

[openshift-cherrypick-robot]

@mprahl: #464 failed to apply on top of branch "release-2.9":

Applying: Cache hub template queries
Using index info to reconstruct a base tree...
M	controllers/propagator/encryption.go
M	controllers/propagator/encryption_test.go
M	controllers/propagator/propagation.go
A	controllers/propagator/replicatedpolicy_controller.go
A	controllers/propagator/replicatedpolicy_setup.go
M	go.mod
M	go.sum
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
CONFLICT (content): Merge conflict in main.go
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (modify/delete): controllers/propagator/replicatedpolicy_setup.go deleted in HEAD and modified in Cache hub template queries. Version Cache hub template queries of controllers/propagator/replicatedpolicy_setup.go left in tree.
CONFLICT (modify/delete): controllers/propagator/replicatedpolicy_controller.go deleted in HEAD and modified in Cache hub template queries. Version Cache hub template queries of controllers/propagator/replicatedpolicy_controller.go left in tree.
Auto-merging controllers/propagator/propagation.go
CONFLICT (content): Merge conflict in controllers/propagator/propagation.go
Auto-merging controllers/propagator/encryption_test.go
Auto-merging controllers/propagator/encryption.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Cache hub template queries
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 release-2.9

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.

[mprahl]

/cherry-pick release-2.9

[openshift-cherrypick-robot]

@mprahl: new pull request created: #465

In response to this:

/cherry-pick release-2.9

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.