eks-anywhere
eks-anywhere copied to clipboard
Changes to enable kube-rbac-proxy on CloudStack cluster controller's metrics port.
Issue #, if available:
Description of changes: Changes to cloudstack.go, clusterctl.go, bundles_template.yaml and various test/data files to actually use PR-2854's addition of kube-rbac-proxy to the bundle.
Testing (if applicable): Ran make test (unit and e2e) successfully. Provisioned and deleted a CloudStack cluster with this build of eks-a. Confirmed inclusion and correct operation of kube-rbac-proxy in the CAPC controller pod.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Codecov Report
Merging #2888 (de515c3) into main (9b1601f) will increase coverage by
0.00%. The diff coverage is100.00%.
@@ Coverage Diff @@
## main #2888 +/- ##
=======================================
Coverage 61.59% 61.59%
=======================================
Files 323 323
Lines 26379 26382 +3
=======================================
+ Hits 16248 16251 +3
Misses 8860 8860
Partials 1271 1271
| Impacted Files | Coverage Δ | |
|---|---|---|
| pkg/executables/clusterctl.go | 70.68% <100.00%> (+0.20%) |
:arrow_up: |
| pkg/providers/cloudstack/cloudstack.go | 68.67% <100.00%> (+0.03%) |
:arrow_up: |
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: abhay-krishna
The full list of commands accepted by this bot can be found here.
The pull request process is described here
- ~~OWNERS~~ [abhay-krishna]
Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment
/cherrypick release-0.11
@maxdrib: #2888 failed to apply on top of branch "release-0.11":
Applying: Changes to enable kube-rbac-proxy on CloudStack cluster controller's metrics port.
Using index info to reconstruct a base tree...
M pkg/executables/clusterctl.go
M pkg/executables/clusterctl_test.go
M pkg/executables/config/clusterctl.yaml
M pkg/executables/testdata/clusterctl_expected.yaml
M pkg/providers/cloudstack/cloudstack.go
M pkg/providers/cloudstack/cloudstack_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/providers/cloudstack/cloudstack_test.go
Auto-merging pkg/providers/cloudstack/cloudstack.go
CONFLICT (content): Merge conflict in pkg/providers/cloudstack/cloudstack.go
Auto-merging pkg/executables/testdata/clusterctl_expected.yaml
CONFLICT (content): Merge conflict in pkg/executables/testdata/clusterctl_expected.yaml
Auto-merging pkg/executables/config/clusterctl.yaml
CONFLICT (content): Merge conflict in pkg/executables/config/clusterctl.yaml
Auto-merging pkg/executables/clusterctl_test.go
Auto-merging pkg/executables/clusterctl.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 Changes to enable kube-rbac-proxy on CloudStack cluster controller's metrics port.
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:
/cherrypick release-0.11
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.