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

bump helm and helm-operator-plugins #6243

Merged
merged 2 commits into from
Jan 10, 2023

Conversation

rashmigottipati
Copy link
Member

Description of the change:

Motivation for the change:

  • helm version update for handling a CVE bug fix

Checklist

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

Signed-off-by: rashmigottipati chowdary.grashmi@gmail.com

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>
Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
@rashmigottipati rashmigottipati temporarily deployed to deploy January 10, 2023 15:52 — with GitHub Actions Inactive
Copy link
Member

@laxmikantbpandhare laxmikantbpandhare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2023
@grokspawn
Copy link
Contributor

/approve

@rashmigottipati rashmigottipati merged commit 346012f into operator-framework:master Jan 10, 2023
@everettraven
Copy link
Contributor

/cherry-pick v1.26.x

@openshift-cherrypick-robot

@everettraven: new pull request created: #6246

In response to this:

/cherry-pick v1.26.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.

@rashmigottipati
Copy link
Member Author

/cherry-pick v1.25.x

@openshift-cherrypick-robot

@rashmigottipati: #6243 failed to apply on top of branch "v1.25.x":

Applying: Bump helm version to latest and helm operator plugins to latest commit
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
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 Bump helm version to latest and helm operator plugins to latest commit
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.25.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.

@rashmigottipati
Copy link
Member Author

/cherry-pick v1.25.x

@openshift-cherrypick-robot

@rashmigottipati: #6243 failed to apply on top of branch "v1.25.x":

Applying: Bump helm version to latest and helm operator plugins to latest commit
Applying: run make test-sanity and update copyrights
Using index info to reconstruct a base tree...
M	.cncf-maintainers
M	testdata/go/v3/memcached-operator/README.md
M	testdata/go/v3/memcached-operator/api/v1alpha1/groupversion_info.go
M	testdata/go/v3/memcached-operator/api/v1alpha1/memcached_types.go
M	testdata/go/v3/memcached-operator/api/v1alpha1/memcached_webhook.go
M	testdata/go/v3/memcached-operator/api/v1alpha1/webhook_suite_test.go
M	testdata/go/v3/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go
M	testdata/go/v3/memcached-operator/controllers/memcached_controller.go
M	testdata/go/v3/memcached-operator/controllers/memcached_controller_test.go
M	testdata/go/v3/memcached-operator/controllers/suite_test.go
M	testdata/go/v3/memcached-operator/hack/boilerplate.go.txt
M	testdata/go/v3/memcached-operator/main.go
A	testdata/go/v3/monitoring/memcached-operator/README.md
A	testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go
A	testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go
A	testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go
A	testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go
A	testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go
A	testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go
A	testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go
A	testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go
A	testdata/go/v3/monitoring/memcached-operator/hack/boilerplate.go.txt
A	testdata/go/v3/monitoring/memcached-operator/main.go
A	testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go
A	testdata/go/v3/monitoring/memcached-operator/monitoring/metrics.go
A	testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go
M	testdata/go/v4-alpha/memcached-operator/README.md
M	testdata/go/v4-alpha/memcached-operator/api/v1alpha1/groupversion_info.go
M	testdata/go/v4-alpha/memcached-operator/api/v1alpha1/memcached_types.go
M	testdata/go/v4-alpha/memcached-operator/api/v1alpha1/memcached_webhook.go
M	testdata/go/v4-alpha/memcached-operator/api/v1alpha1/webhook_suite_test.go
M	testdata/go/v4-alpha/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go
M	testdata/go/v4-alpha/memcached-operator/controllers/memcached_controller.go
M	testdata/go/v4-alpha/memcached-operator/controllers/memcached_controller_test.go
M	testdata/go/v4-alpha/memcached-operator/controllers/suite_test.go
M	testdata/go/v4-alpha/memcached-operator/hack/boilerplate.go.txt
M	testdata/go/v4-alpha/memcached-operator/main.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/README.md
A	testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/memcached_types.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/controllers/memcached_controller.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/controllers/memcached_controller_test.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/controllers/suite_test.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/hack/boilerplate.go.txt
A	testdata/go/v4-alpha/monitoring/memcached-operator/main.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/alerts.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/metrics.go
A	testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/alerts.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/monitoring/alerts.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/main.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/main.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/controllers/suite_test.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/controllers/suite_test.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/controllers/memcached_controller_test.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/controllers/memcached_controller_test.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/controllers/memcached_controller.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/controllers/memcached_controller.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/memcached_types.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/memcached_types.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go left in tree.
CONFLICT (modify/delete): testdata/go/v4-alpha/monitoring/memcached-operator/README.md deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v4-alpha/monitoring/memcached-operator/README.md left in tree.
Auto-merging testdata/go/v4-alpha/memcached-operator/monitoring/metrics.go
CONFLICT (content): Merge conflict in testdata/go/v4-alpha/memcached-operator/monitoring/metrics.go
Auto-merging testdata/go/v4-alpha/memcached-operator/main.go
Auto-merging testdata/go/v4-alpha/memcached-operator/controllers/memcached_controller.go
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/monitoring/prom-rule-ci/rule-spec-dumper.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/monitoring/alerts.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/main.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/main.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/controllers/suite_test.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller_test.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/controllers/memcached_controller.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/zz_generated.deepcopy.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/webhook_suite_test.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_webhook.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/memcached_types.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/api/v1alpha1/groupversion_info.go left in tree.
CONFLICT (modify/delete): testdata/go/v3/monitoring/memcached-operator/README.md deleted in HEAD and modified in run make test-sanity and update copyrights. Version run make test-sanity and update copyrights of testdata/go/v3/monitoring/memcached-operator/README.md left in tree.
Auto-merging testdata/go/v3/memcached-operator/test/e2e/e2e_suite_test.go
Auto-merging testdata/go/v3/memcached-operator/monitoring/metrics.go
CONFLICT (content): Merge conflict in testdata/go/v3/memcached-operator/monitoring/metrics.go
Auto-merging testdata/go/v3/memcached-operator/main.go
Auto-merging testdata/go/v3/memcached-operator/controllers/memcached_controller.go
Auto-merging internal/plugins/helm/v1/scaffolds/doc.go
CONFLICT (content): Merge conflict in internal/plugins/helm/v1/scaffolds/doc.go
Auto-merging .cncf-maintainers
CONFLICT (content): Merge conflict in .cncf-maintainers
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 run make test-sanity and update copyrights
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.25.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.

rashmigottipati added a commit to rashmigottipati/operator-sdk that referenced this pull request Jan 26, 2023
* Bump helm and helm-operator-plugins

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>
rashmigottipati added a commit that referenced this pull request Jan 26, 2023
* Bump helm and helm-operator-plugins

Signed-off-by: rashmigottipati <chowdary.grashmi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants