Repository: argoproj/argo-cd
Pull request #8607 (2022-02-24 19:49:28)

fix: Move pod logs containers to dropdown in pod logs toolbar
signed off: yicai@redhat.com
Closes: #8531 

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the *Details* link next to the DCO action for instructions on how to resolve this.

Checklist:

* [x] Either (a) I've created an [enhancement proposal](https://github.com/argoproj/argo-cd/issues/new/choose) and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
* [x] The title of the PR states what changed and the related issues number (used for the release note).
* [x] I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
* [ ] I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
* [ ] Does this PR require documentation updates?
* [ ] I've updated documentation as required by this PR.
* [ ] Optional. My organization is added to USERS.md.
* [x] I have signed off all my commits as required by [DCO](https://github.com/argoproj/argoproj/tree/master/community#contributing-to-argo)
* [ ] I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
* [x] My build is green ([troubleshooting builds](https://argo-cd.readthedocs.io/en/latest/developer-guide/ci/)). 

Screenshot
<img width="1439" alt="Screen Shot 2022-02-24 at 12 20 31 PM" src="https://user-images.githubusercontent.com/26255262/156455606-91985d66-9475-48d8-8442-7ada9c17db5d.png">


codecov[bot]: # [Codecov](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) Report
> Merging [#8607](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) (01dbe4b) into [master](https://codecov.io/gh/argoproj/argo-cd/commit/bfe5ef48b4bc396666cff8fde555d395c63b0f44?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) (bfe5ef4) will **increase** coverage by `0.01%`.
> The diff coverage is `n/a`.

> :exclamation: Current head 01dbe4b differs from pull request most recent head 4e61617. Consider uploading reports for the commit 4e61617 to get more accurate results

[![Impacted file tree graph](https://codecov.io/gh/argoproj/argo-cd/pull/8607/graphs/tree.svg?width=650&height=150&src=pr&token=kf5kwuegwE&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj)](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj)

```diff
@@            Coverage Diff             @@
##           master    #8607      +/-   ##
==========================================
+ Coverage   42.57%   42.59%   +0.01%     
==========================================
  Files         177      183       +6     
  Lines       22988    23102     +114     
==========================================
+ Hits         9787     9840      +53     
- Misses      11804    11853      +49     
- Partials     1397     1409      +12     
```


| [Impacted Files](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) | Coverage Δ | |
|---|---|---|
| [util/helm/client.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9oZWxtL2NsaWVudC5nbw==) | `45.14% <0.00%> (-3.37%)` | :arrow_down: |
| [reposerver/repository/repository.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-cmVwb3NlcnZlci9yZXBvc2l0b3J5L3JlcG9zaXRvcnkuZ28=) | `58.49% <0.00%> (-0.18%)` | :arrow_down: |
| [util/settings/settings.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9zZXR0aW5ncy9zZXR0aW5ncy5nbw==) | `47.91% <0.00%> (ø)` | |
| [reposerver/repository/lock.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-cmVwb3NlcnZlci9yZXBvc2l0b3J5L2xvY2suZ28=) | `100.00% <0.00%> (ø)` | |
| [util/io/bytereadseeker.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9pby9ieXRlcmVhZHNlZWtlci5nbw==) | `0.00% <0.00%> (ø)` | |
| [util/grpc/sanitizer.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9ncnBjL3Nhbml0aXplci5nbw==) | `85.00% <0.00%> (ø)` | |
| [util/io/closer.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9pby9jbG9zZXIuZ28=) | `14.28% <0.00%> (ø)` | |
| [util/io/subdirfs.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9pby9zdWJkaXJmcy5nbw==) | `0.00% <0.00%> (ø)` | |
| [util/io/paths.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9pby9wYXRocy5nbw==) | `68.75% <0.00%> (ø)` | |
| [util/io/componsablefs.go](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj#diff-dXRpbC9pby9jb21wb25zYWJsZWZzLmdv) | `0.00% <0.00%> (ø)` | |
| ... and [1 more](https://codecov.io/gh/argoproj/argo-cd/pull/8607/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj). Last update [bfe5ef4...4e61617](https://codecov.io/gh/argoproj/argo-cd/pull/8607?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj).

ciiay: > Also LGTM besides the suggestion from Remington. One other thing I thought of when trying it out is that it would be nice to be able to click on the button again to get rid of the dropdown, similar to a toggle. Right now if the dropdown is visible, one would have to click outside of the area to get rid of it when it would be much easier to not have to move the mouse at all to remove it. Otherwise works great!

Thanks for the review @reginapizza . I see what you mean. I reused the dropdown menu component and I thought it was better to keep the behavior consistent.

@rbreeze How do you think?
rbreeze: I think it's a good idea to have the dropdown act as a toggle, but that's something we should probably implement in argo-ui to be applied to *all* dropdowns. So for this PR, it's okay as is

Patch:
diff --git a/cmpserver/apiclient/plugin.pb.go b/cmpserver/apiclient/plugin.pb.go
index bcffb01cf..ecc28da7c 100644
--- a/cmpserver/apiclient/plugin.pb.go
+++ b/cmpserver/apiclient/plugin.pb.go
@@ -11,7 +11,6 @@ import (
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/api/core/v1"
 	math "math"
 	math_bits "math/bits"
 )
@@ -422,39 +421,38 @@ func init() {
 func init() { proto.RegisterFile("cmpserver/plugin/plugin.proto", fileDescriptor_b21875a7079a06ed) }
 
 var fileDescriptor_b21875a7079a06ed = []byte{
-	// 506 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xc1, 0x8e, 0xd3, 0x3c,
-	0x10, 0xde, 0xfc, 0xed, 0xee, 0xb6, 0xb3, 0x2b, 0xfd, 0x95, 0x85, 0x44, 0x54, 0xed, 0x96, 0x2a,
-	0xa7, 0x5e, 0x68, 0x44, 0x41, 0x88, 0x0b, 0x12, 0x2c, 0x5a, 0x58, 0x81, 0x8a, 0x2a, 0x97, 0x13,
-	0x37, 0xaf, 0x3b, 0x4d, 0x4d, 0x13, 0xdb, 0xd8, 0x4e, 0xa4, 0x72, 0xe2, 0x6d, 0x78, 0x05, 0x1e,
-	0x81, 0x23, 0x8f, 0x80, 0xfa, 0x24, 0x28, 0x4e, 0xd2, 0x56, 0xac, 0xe0, 0x94, 0x99, 0x6f, 0x66,
-	0x3e, 0x7f, 0x9f, 0x33, 0x86, 0x4b, 0x9e, 0x69, 0x8b, 0xa6, 0x40, 0x13, 0xeb, 0x34, 0x4f, 0x84,
-	0xac, 0x3f, 0x63, 0x6d, 0x94, 0x53, 0xe4, 0xa4, 0xca, 0xfa, 0xd1, 0xfa, 0x99, 0x1d, 0x0b, 0x15,
-	0x33, 0x2d, 0x62, 0xae, 0x0c, 0xc6, 0xc5, 0xa3, 0x38, 0x41, 0x89, 0x86, 0x39, 0x5c, 0x54, 0xbd,
-	0xd1, 0xd7, 0x00, 0x7a, 0x2f, 0xb5, 0x9e, 0x3b, 0x83, 0x2c, 0xa3, 0xf8, 0x39, 0x47, 0xeb, 0xc8,
-	0x73, 0xe8, 0x64, 0xe8, 0xd8, 0x82, 0x39, 0x16, 0x06, 0xc3, 0x60, 0x74, 0x36, 0x79, 0x30, 0xae,
-	0x4f, 0x98, 0x32, 0x29, 0x96, 0x68, 0x5d, 0xdd, 0x3a, 0xad, 0xdb, 0x6e, 0x8e, 0xe8, 0x6e, 0x84,
-	0x44, 0xd0, 0x5e, 0x8a, 0x14, 0xc3, 0xff, 0xfc, 0xe8, 0x79, 0x33, 0xfa, 0x5a, 0xa4, 0x78, 0x73,
-	0x44, 0x7d, 0xed, 0xaa, 0x0b, 0xa7, 0xa6, 0xa2, 0x88, 0xbe, 0x05, 0x70, 0xff, 0x2f, 0xb4, 0x24,
-	0x84, 0x53, 0xa6, 0xf5, 0x7b, 0x96, 0xa1, 0x17, 0xd2, 0xa5, 0x4d, 0x4a, 0x06, 0x00, 0x4c, 0x6b,
-	0x8a, 0xe9, 0x8c, 0xb9, 0x95, 0x3f, 0xaa, 0x4b, 0x0f, 0x10, 0xd2, 0x87, 0x0e, 0x5f, 0x21, 0x5f,
-	0xdb, 0x3c, 0x0b, 0x5b, 0xbe, 0xba, 0xcb, 0x09, 0x81, 0xb6, 0x15, 0x5f, 0x30, 0x6c, 0x0f, 0x83,
-	0x51, 0x8b, 0xfa, 0x98, 0x44, 0xd0, 0x42, 0x59, 0x84, 0xc7, 0xc3, 0xd6, 0xe8, 0x6c, 0xd2, 0x6b,
-	0x34, 0x5f, 0xcb, 0xe2, 0x5a, 0x3a, 0xb3, 0xa1, 0x65, 0x31, 0x7a, 0x02, 0x9d, 0x06, 0x28, 0x39,
-	0xe4, 0x5e, 0x96, 0x8f, 0xc9, 0x3d, 0x38, 0x2e, 0x58, 0x9a, 0x63, 0x2d, 0xa7, 0x4a, 0xa2, 0x19,
-	0xf4, 0xf6, 0xf6, 0xac, 0x56, 0xd2, 0x22, 0xb9, 0x80, 0x6e, 0x56, 0x63, 0x36, 0x0c, 0x86, 0xad,
-	0x51, 0x97, 0xee, 0x81, 0xd2, 0x9b, 0x55, 0xb9, 0xe1, 0xf8, 0x61, 0xa3, 0x1b, 0xb2, 0x03, 0x24,
-	0x7a, 0x0a, 0x84, 0xa2, 0x56, 0x56, 0x38, 0x65, 0x36, 0x3b, 0xce, 0x21, 0x9c, 0x09, 0x3b, 0xcf,
-	0xb5, 0x56, 0xc6, 0xe1, 0xc2, 0x0b, 0xeb, 0xd0, 0x43, 0x28, 0xba, 0x80, 0x76, 0xf9, 0x13, 0x4a,
-	0x9d, 0x7c, 0x95, 0xcb, 0xb5, 0xef, 0x39, 0xa7, 0x55, 0x32, 0xf9, 0x1e, 0xc0, 0xe5, 0x2b, 0x25,
-	0x97, 0x22, 0x99, 0x32, 0xc9, 0x12, 0xcc, 0x50, 0xba, 0x99, 0xbf, 0x86, 0x39, 0x9a, 0x42, 0x70,
-	0x24, 0x6f, 0xa1, 0xf7, 0xa6, 0xde, 0x9f, 0xc6, 0x11, 0x09, 0x9b, 0xab, 0xfa, 0x73, 0x8b, 0xfa,
-	0xe1, 0xdd, 0x9d, 0xa9, 0x94, 0x46, 0x47, 0xa3, 0x80, 0xbc, 0x83, 0xff, 0xa7, 0xcc, 0xf1, 0xd5,
-	0xde, 0xc8, 0x3f, 0xa8, 0xfa, 0x4d, 0xe5, 0xae, 0xed, 0x92, 0xec, 0xea, 0xc5, 0x8f, 0xed, 0x20,
-	0xf8, 0xb9, 0x1d, 0x04, 0xbf, 0xb6, 0x83, 0xe0, 0xe3, 0x24, 0x11, 0x6e, 0x95, 0xdf, 0x8e, 0xb9,
-	0xca, 0x62, 0x66, 0x12, 0xa5, 0x8d, 0xfa, 0xe4, 0x83, 0x87, 0x7c, 0x11, 0x17, 0x93, 0x78, 0xff,
-	0x7a, 0x98, 0x16, 0x3c, 0x15, 0x28, 0xdd, 0xed, 0x89, 0x7f, 0x0e, 0x8f, 0x7f, 0x07, 0x00, 0x00,
-	0xff, 0xff, 0x75, 0x01, 0x97, 0x9d, 0x5b, 0x03, 0x00, 0x00,
+	// 483 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xd1, 0x8e, 0x12, 0x3d,
+	0x14, 0xa6, 0x3f, 0xec, 0x2e, 0x1c, 0x36, 0xf9, 0x49, 0x63, 0xe2, 0x84, 0xec, 0x22, 0x99, 0x2b,
+	0x6e, 0x84, 0x04, 0x8d, 0x77, 0x26, 0xba, 0x66, 0x75, 0xa3, 0xc1, 0x90, 0xe2, 0x95, 0x77, 0xdd,
+	0x72, 0x80, 0xba, 0x33, 0x6d, 0x6d, 0x3b, 0x93, 0xe0, 0x95, 0x6f, 0xe3, 0x2b, 0xf8, 0x08, 0x5e,
+	0xfa, 0x08, 0x86, 0x27, 0x31, 0x53, 0x66, 0x18, 0xe2, 0x46, 0xaf, 0x38, 0xdf, 0x77, 0xce, 0xf9,
+	0xf8, 0xbe, 0x4e, 0x0b, 0x97, 0x22, 0x35, 0x0e, 0x6d, 0x8e, 0x76, 0x62, 0x92, 0x6c, 0x2d, 0x55,
+	0xf9, 0x33, 0x36, 0x56, 0x7b, 0x4d, 0x4f, 0xf7, 0x28, 0xfe, 0x4a, 0xa0, 0xf7, 0xd2, 0x98, 0x85,
+	0xb7, 0xc8, 0x53, 0x86, 0x9f, 0x33, 0x74, 0x9e, 0x3e, 0x87, 0x76, 0x8a, 0x9e, 0x2f, 0xb9, 0xe7,
+	0x11, 0x19, 0x92, 0x51, 0x77, 0xfa, 0x68, 0x5c, 0x6e, 0xcf, 0xb8, 0x92, 0x2b, 0x74, 0xbe, 0x1c,
+	0x9d, 0x95, 0x63, 0x37, 0x0d, 0x76, 0x58, 0xa1, 0x31, 0xb4, 0x56, 0x32, 0xc1, 0xe8, 0xbf, 0xb0,
+	0x7a, 0x5e, 0xad, 0xbe, 0x96, 0x09, 0xde, 0x34, 0x58, 0xe8, 0x5d, 0x75, 0xe0, 0xcc, 0xee, 0x25,
+	0xe2, 0x6f, 0x04, 0x1e, 0xfe, 0x45, 0x96, 0x46, 0x70, 0xc6, 0x8d, 0x79, 0xcf, 0x53, 0x0c, 0x46,
+	0x3a, 0xac, 0x82, 0x74, 0x00, 0xc0, 0x8d, 0x61, 0x98, 0xcc, 0xb9, 0xdf, 0x84, 0xbf, 0xea, 0xb0,
+	0x23, 0x86, 0xf6, 0xa1, 0x2d, 0x36, 0x28, 0xee, 0x5c, 0x96, 0x46, 0xcd, 0xd0, 0x3d, 0x60, 0x4a,
+	0xa1, 0xe5, 0xe4, 0x17, 0x8c, 0x5a, 0x43, 0x32, 0x6a, 0xb2, 0x50, 0xd3, 0x18, 0x9a, 0xa8, 0xf2,
+	0xe8, 0x64, 0xd8, 0x1c, 0x75, 0xa7, 0xbd, 0xca, 0xf3, 0xb5, 0xca, 0xaf, 0x95, 0xb7, 0x5b, 0x56,
+	0x34, 0xe3, 0xa7, 0xd0, 0xae, 0x88, 0x42, 0x43, 0xd5, 0xb6, 0x42, 0x4d, 0x1f, 0xc0, 0x49, 0xce,
+	0x93, 0x0c, 0x4b, 0x3b, 0x7b, 0x10, 0xcf, 0xa1, 0x57, 0xc7, 0x73, 0x46, 0x2b, 0x87, 0xf4, 0x02,
+	0x3a, 0x69, 0xc9, 0xb9, 0x88, 0x0c, 0x9b, 0xa3, 0x0e, 0xab, 0x89, 0x22, 0x9b, 0xd3, 0x99, 0x15,
+	0xf8, 0x61, 0x6b, 0x2a, 0xb1, 0x23, 0x26, 0x7e, 0x06, 0x94, 0xa1, 0xd1, 0x4e, 0x7a, 0x6d, 0xb7,
+	0x07, 0xcd, 0x21, 0x74, 0xa5, 0x5b, 0x64, 0xc6, 0x68, 0xeb, 0x71, 0x19, 0x8c, 0xb5, 0xd9, 0x31,
+	0x15, 0x5f, 0x40, 0xab, 0xf8, 0x08, 0x85, 0x4f, 0xb1, 0xc9, 0xd4, 0x5d, 0x98, 0x39, 0x67, 0x7b,
+	0x30, 0xfd, 0x4e, 0xe0, 0xf2, 0x95, 0x56, 0x2b, 0xb9, 0x9e, 0x71, 0xc5, 0xd7, 0x98, 0xa2, 0xf2,
+	0xf3, 0x70, 0x0c, 0x0b, 0xb4, 0xb9, 0x14, 0x48, 0xdf, 0x42, 0xef, 0x0d, 0x2a, 0xb4, 0xdc, 0x63,
+	0x95, 0x88, 0x46, 0xd5, 0x51, 0xfd, 0x79, 0x8b, 0xfa, 0xd1, 0xfd, 0x3b, 0xb3, 0x77, 0x1a, 0x37,
+	0x46, 0x84, 0xbe, 0x83, 0xff, 0x67, 0xdc, 0x8b, 0x4d, 0x1d, 0xe4, 0x1f, 0x52, 0xfd, 0xaa, 0x73,
+	0x3f, 0x76, 0x21, 0x76, 0xf5, 0xe2, 0xc7, 0x6e, 0x40, 0x7e, 0xee, 0x06, 0xe4, 0xd7, 0x6e, 0x40,
+	0x3e, 0x4e, 0xd7, 0xd2, 0x6f, 0xb2, 0xdb, 0xb1, 0xd0, 0xe9, 0x84, 0xdb, 0xb5, 0x36, 0x56, 0x7f,
+	0x0a, 0xc5, 0x63, 0xb1, 0x9c, 0xe4, 0xd3, 0x49, 0xfd, 0x32, 0xb8, 0x91, 0x22, 0x91, 0xa8, 0xfc,
+	0xed, 0x69, 0x78, 0x16, 0x4f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x83, 0x01, 0x5e, 0x48, 0x37,
+	0x03, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/cmpserver/plugin/plugin.proto b/cmpserver/plugin/plugin.proto
index 2940f8a5b..ce4452d63 100644
--- a/cmpserver/plugin/plugin.proto
+++ b/cmpserver/plugin/plugin.proto
@@ -3,8 +3,6 @@ option go_package = "github.com/argoproj/argo-cd/v2/cmpserver/apiclient";
 
 package plugin;
 
-import "k8s.io/api/core/v1/generated.proto";
-
 // AppStreamRequest is the request object used to send the application's
 // files over a stream.
 message AppStreamRequest {
diff --git a/pkg/apiclient/account/account.pb.go b/pkg/apiclient/account/account.pb.go
index d7015a3c3..aa88c94e8 100644
--- a/pkg/apiclient/account/account.pb.go
+++ b/pkg/apiclient/account/account.pb.go
@@ -6,7 +6,6 @@ package account
 import (
 	context "context"
 	fmt "fmt"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -779,54 +778,53 @@ func init() {
 func init() { proto.RegisterFile("server/account/account.proto", fileDescriptor_56d089a9b5e998c0) }
 
 var fileDescriptor_56d089a9b5e998c0 = []byte{
-	// 743 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4d, 0x6f, 0xd3, 0x4c,
-	0x10, 0x96, 0x93, 0xa6, 0x1f, 0x93, 0xbc, 0xe9, 0xdb, 0x25, 0x0d, 0x96, 0x09, 0x21, 0xdd, 0x56,
-	0x6d, 0x28, 0x6a, 0x2d, 0x02, 0xe2, 0xeb, 0x82, 0xda, 0x82, 0x50, 0x25, 0x0e, 0x10, 0x3e, 0x0e,
-	0xe5, 0xb4, 0x71, 0x56, 0x61, 0x69, 0x62, 0xbb, 0xde, 0x75, 0x0a, 0x8a, 0x72, 0x81, 0x9f, 0xc0,
-	0x89, 0x7f, 0xc4, 0x11, 0x89, 0x3f, 0x80, 0x2a, 0x7e, 0x08, 0xf2, 0x7a, 0xd7, 0x71, 0x9c, 0x14,
-	0x71, 0xf2, 0xce, 0xcc, 0xee, 0x3c, 0xcf, 0xcc, 0x3e, 0xe3, 0x85, 0x1a, 0xa7, 0xc1, 0x90, 0x06,
-	0x36, 0x71, 0x1c, 0x2f, 0x74, 0x85, 0xfe, 0xee, 0xfb, 0x81, 0x27, 0x3c, 0xb4, 0xa4, 0x4c, 0xab,
-	0xd2, 0xf3, 0x7a, 0x9e, 0xf4, 0xd9, 0xd1, 0x2a, 0x0e, 0x5b, 0xb5, 0x9e, 0xe7, 0xf5, 0xfa, 0xd4,
-	0x26, 0x3e, 0xb3, 0x89, 0xeb, 0x7a, 0x82, 0x08, 0xe6, 0xb9, 0x3c, 0x8e, 0xe2, 0x73, 0x58, 0x7f,
-	0xe3, 0x77, 0x89, 0xa0, 0x2f, 0x08, 0xe7, 0xe7, 0x5e, 0xd0, 0x6d, 0xd3, 0xb3, 0x90, 0x72, 0x81,
-	0x1a, 0x50, 0x74, 0xe9, 0xb9, 0xf6, 0x9a, 0x46, 0xc3, 0x68, 0xae, 0xb4, 0xd3, 0x2e, 0xd4, 0x84,
-	0x55, 0x27, 0x0c, 0x02, 0xea, 0x8a, 0x64, 0x57, 0x4e, 0xee, 0xca, 0xba, 0x11, 0x82, 0x05, 0x97,
-	0x0c, 0xa8, 0x99, 0x97, 0x61, 0xb9, 0xc6, 0x26, 0x54, 0xb3, 0xc0, 0xdc, 0xf7, 0x5c, 0x4e, 0xb1,
-	0x03, 0xc5, 0x23, 0xe2, 0x1e, 0x6b, 0x22, 0x16, 0x2c, 0x07, 0x94, 0x7b, 0x61, 0xe0, 0x50, 0xc5,
-	0x22, 0xb1, 0x51, 0x15, 0x16, 0x89, 0x13, 0x95, 0xa3, 0x90, 0x95, 0x15, 0x91, 0xe7, 0x61, 0x27,
-	0x39, 0x16, 0xe3, 0xa6, 0x5d, 0x78, 0x0b, 0x4a, 0x31, 0x48, 0x0c, 0x8a, 0x2a, 0x50, 0x18, 0x92,
-	0x7e, 0xa8, 0x21, 0x62, 0x03, 0xef, 0xc0, 0xda, 0x33, 0x2a, 0x0e, 0xe2, 0xfe, 0x6a, 0x42, 0xba,
-	0x1a, 0x23, 0x55, 0xcd, 0x17, 0x03, 0x96, 0xd4, 0xb6, 0x79, 0x71, 0x64, 0xc2, 0x12, 0x75, 0x49,
-	0xa7, 0x4f, 0xe3, 0x1e, 0x2d, 0xb7, 0xb5, 0x89, 0x30, 0x94, 0x1c, 0xe2, 0x93, 0x0e, 0xeb, 0x33,
-	0xc1, 0x28, 0x37, 0xf3, 0x8d, 0x7c, 0x73, 0xa5, 0x3d, 0xe5, 0x43, 0xdb, 0xb0, 0x28, 0xbc, 0x53,
-	0xea, 0x72, 0x73, 0xa1, 0x91, 0x6f, 0x16, 0x5b, 0xe5, 0x7d, 0xad, 0x80, 0xd7, 0x91, 0xbb, 0xad,
-	0xa2, 0xf8, 0x1e, 0x94, 0x14, 0x09, 0xfe, 0x9c, 0x71, 0x81, 0xb6, 0xa1, 0xc0, 0x04, 0x1d, 0x70,
-	0xd3, 0x90, 0xc7, 0xfe, 0x4f, 0x8e, 0xe9, 0x8a, 0xe2, 0x30, 0x7e, 0x09, 0x05, 0x99, 0x08, 0x95,
-	0x21, 0xc7, 0xf4, 0x5d, 0xe7, 0x58, 0x37, 0xea, 0x3d, 0xe3, 0x3c, 0xa4, 0xdd, 0x03, 0x21, 0x79,
-	0xe7, 0xdb, 0x89, 0x8d, 0x6a, 0xb0, 0x42, 0x3f, 0xfa, 0x2c, 0xa0, 0xfc, 0x40, 0xc8, 0x0e, 0xe7,
-	0xdb, 0x13, 0x07, 0x6e, 0x01, 0xc8, 0x94, 0x31, 0x91, 0xad, 0x69, 0x22, 0x59, 0xfe, 0x8a, 0xc6,
-	0x5b, 0x40, 0x47, 0x01, 0x25, 0x82, 0xc6, 0xde, 0xcb, 0xdb, 0x9d, 0xc2, 0x3e, 0x76, 0x15, 0xb1,
-	0x89, 0x43, 0x55, 0x91, 0xd7, 0x55, 0xe0, 0x5b, 0x70, 0x65, 0x2a, 0xef, 0xe4, 0xca, 0x65, 0xdf,
-	0xf4, 0x95, 0x4b, 0x03, 0x3f, 0x00, 0xf4, 0x84, 0xf6, 0xe9, 0x3f, 0x90, 0x88, 0x61, 0x72, 0x09,
-	0x4c, 0x05, 0x50, 0x54, 0xec, 0xb4, 0x5a, 0xf0, 0x2a, 0xfc, 0xf7, 0x74, 0xe0, 0x8b, 0x4f, 0x1a,
-	0xb6, 0xf5, 0xad, 0x00, 0x65, 0xb5, 0xe7, 0x15, 0x0d, 0x86, 0xcc, 0xa1, 0x48, 0xc0, 0x42, 0x24,
-	0x46, 0x54, 0x49, 0xfa, 0x92, 0x1a, 0x00, 0x6b, 0x3d, 0xe3, 0x55, 0x63, 0xf2, 0xf8, 0xf3, 0xcf,
-	0xdf, 0x5f, 0x73, 0x0f, 0xd1, 0x7d, 0x39, 0xd9, 0xc3, 0xdb, 0xc9, 0xdf, 0xc1, 0x21, 0xee, 0x1e,
-	0xb3, 0x47, 0x5a, 0xea, 0x63, 0x7b, 0x14, 0x4f, 0xc5, 0xd8, 0x1e, 0xa5, 0x26, 0x60, 0x8c, 0x86,
-	0x50, 0x9e, 0x9e, 0x40, 0x54, 0x4f, 0x90, 0xe6, 0xfe, 0x13, 0xac, 0x1b, 0x97, 0xc6, 0x15, 0xa7,
-	0x4d, 0xc9, 0xe9, 0xba, 0x65, 0x66, 0x39, 0xf9, 0x6a, 0xe7, 0x23, 0x63, 0x17, 0xbd, 0x83, 0x52,
-	0xaa, 0x4f, 0x1c, 0x5d, 0x4b, 0xb2, 0xce, 0xb6, 0x2f, 0x55, 0x7c, 0x5a, 0xd9, 0xf8, 0xaa, 0x04,
-	0x5a, 0x43, 0xab, 0x19, 0x20, 0x74, 0x02, 0x30, 0x99, 0x58, 0x64, 0x25, 0xa7, 0x67, 0xc6, 0xd8,
-	0x9a, 0x99, 0x06, 0x5c, 0x97, 0x49, 0x4d, 0x54, 0xcd, 0xb2, 0x1f, 0x45, 0xf7, 0x3d, 0x46, 0x67,
-	0x50, 0x4c, 0xe9, 0x28, 0xc5, 0x7b, 0x56, 0xb5, 0x56, 0x6d, 0x7e, 0x50, 0xf5, 0x69, 0x47, 0x22,
-	0x6d, 0xe0, 0xda, 0x7c, 0x24, 0x5b, 0x4a, 0x31, 0xea, 0xd5, 0x00, 0x8a, 0x29, 0x35, 0xa6, 0x20,
-	0x67, 0x35, 0x6a, 0x55, 0x93, 0xe0, 0x94, 0xe0, 0xf0, 0x4d, 0x09, 0xb6, 0xb9, 0xbb, 0xf1, 0x37,
-	0x30, 0x7b, 0xc4, 0xba, 0xe3, 0xc3, 0xc3, 0xef, 0x17, 0x75, 0xe3, 0xc7, 0x45, 0xdd, 0xf8, 0x75,
-	0x51, 0x37, 0x4e, 0xee, 0xf6, 0x98, 0x78, 0x1f, 0x76, 0xf6, 0x1d, 0x6f, 0x60, 0x93, 0x40, 0x3e,
-	0x2d, 0x1f, 0xe4, 0x62, 0xcf, 0xe9, 0xda, 0xc3, 0x96, 0xed, 0x9f, 0xf6, 0xa2, 0x94, 0x4e, 0x9f,
-	0xd1, 0xc9, 0xa3, 0xd4, 0x59, 0x94, 0x0f, 0xcb, 0x9d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa7,
-	0xbc, 0x40, 0x6e, 0xb5, 0x06, 0x00, 0x00,
+	// 734 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4b, 0x6f, 0xd3, 0x4a,
+	0x14, 0x96, 0x93, 0xa6, 0x8f, 0x93, 0xdc, 0xf4, 0x76, 0x6e, 0x9b, 0x6b, 0xf9, 0xe6, 0x86, 0x74,
+	0x5a, 0xb5, 0xa1, 0xa8, 0xb5, 0x08, 0x88, 0xd7, 0x06, 0xb5, 0x05, 0xa1, 0x4a, 0x2c, 0x20, 0x3c,
+	0x16, 0x65, 0x35, 0x71, 0x8e, 0xc2, 0xd0, 0xc4, 0x76, 0x3d, 0xe3, 0x14, 0x14, 0x65, 0x03, 0x3f,
+	0x81, 0x15, 0xff, 0x88, 0x25, 0x12, 0x7f, 0x00, 0x55, 0xfc, 0x10, 0xe4, 0xf1, 0xd8, 0x71, 0x1e,
+	0x45, 0xac, 0xec, 0xf3, 0x98, 0xf3, 0x7d, 0xe7, 0x9b, 0x73, 0x6c, 0xa8, 0x0a, 0x0c, 0x06, 0x18,
+	0xd8, 0xcc, 0x71, 0xbc, 0xd0, 0x95, 0xc9, 0xf3, 0xc0, 0x0f, 0x3c, 0xe9, 0x91, 0x25, 0x6d, 0x5a,
+	0xd5, 0xae, 0xe7, 0x75, 0x7b, 0x68, 0x33, 0x9f, 0xdb, 0xcc, 0x75, 0x3d, 0xc9, 0x24, 0xf7, 0x5c,
+	0x11, 0xa7, 0xd1, 0x0b, 0xd8, 0x78, 0xe5, 0x77, 0x98, 0xc4, 0x67, 0x4c, 0x88, 0x0b, 0x2f, 0xe8,
+	0xb4, 0xf0, 0x3c, 0x44, 0x21, 0x49, 0x1d, 0x8a, 0x2e, 0x5e, 0x24, 0x5e, 0xd3, 0xa8, 0x1b, 0x8d,
+	0x95, 0x56, 0xd6, 0x45, 0x1a, 0xb0, 0xea, 0x84, 0x41, 0x80, 0xae, 0x4c, 0xb3, 0x72, 0x2a, 0x6b,
+	0xda, 0x4d, 0x08, 0x2c, 0xb8, 0xac, 0x8f, 0x66, 0x5e, 0x85, 0xd5, 0x3b, 0x35, 0xa1, 0x32, 0x0d,
+	0x2c, 0x7c, 0xcf, 0x15, 0x48, 0x1d, 0x28, 0x1e, 0x33, 0xf7, 0x24, 0x21, 0x62, 0xc1, 0x72, 0x80,
+	0xc2, 0x0b, 0x03, 0x07, 0x35, 0x8b, 0xd4, 0x26, 0x15, 0x58, 0x64, 0x4e, 0xd4, 0x8e, 0x46, 0xd6,
+	0x56, 0x44, 0x5e, 0x84, 0xed, 0xf4, 0x58, 0x8c, 0x9b, 0x75, 0xd1, 0x6d, 0x28, 0xc5, 0x20, 0x31,
+	0x28, 0x59, 0x87, 0xc2, 0x80, 0xf5, 0xc2, 0x04, 0x22, 0x36, 0xe8, 0x2e, 0xac, 0x3d, 0x41, 0x79,
+	0x18, 0x2b, 0x99, 0x10, 0x4a, 0xba, 0x31, 0x32, 0xdd, 0x7c, 0x32, 0x60, 0x49, 0xa7, 0xcd, 0x8b,
+	0x13, 0x13, 0x96, 0xd0, 0x65, 0xed, 0x1e, 0xc6, 0x1a, 0x2d, 0xb7, 0x12, 0x93, 0x50, 0x28, 0x39,
+	0xcc, 0x67, 0x6d, 0xde, 0xe3, 0x92, 0xa3, 0x30, 0xf3, 0xf5, 0x7c, 0x63, 0xa5, 0x35, 0xe1, 0x23,
+	0x3b, 0xb0, 0x28, 0xbd, 0x33, 0x74, 0x85, 0xb9, 0x50, 0xcf, 0x37, 0x8a, 0xcd, 0xf2, 0x41, 0x72,
+	0xd7, 0x2f, 0x23, 0x77, 0x4b, 0x47, 0xe9, 0x1d, 0x28, 0x69, 0x12, 0xe2, 0x29, 0x17, 0x92, 0xec,
+	0x40, 0x81, 0x4b, 0xec, 0x0b, 0xd3, 0x50, 0xc7, 0xfe, 0x4e, 0x8f, 0x25, 0x1d, 0xc5, 0x61, 0xfa,
+	0x1c, 0x0a, 0xaa, 0x10, 0x29, 0x43, 0x8e, 0x27, 0x77, 0x9d, 0xe3, 0x9d, 0x48, 0x7b, 0x2e, 0x44,
+	0x88, 0x9d, 0x43, 0xa9, 0x78, 0xe7, 0x5b, 0xa9, 0x4d, 0xaa, 0xb0, 0x82, 0xef, 0x7d, 0x1e, 0xa0,
+	0x38, 0x94, 0x4a, 0xe1, 0x7c, 0x6b, 0xec, 0xa0, 0x4d, 0x00, 0x55, 0x32, 0x26, 0xb2, 0x3d, 0x49,
+	0x64, 0x9a, 0xbf, 0xa6, 0xf1, 0x1a, 0xc8, 0x71, 0x80, 0x4c, 0x62, 0xec, 0xbd, 0x5a, 0xee, 0x0c,
+	0xf6, 0x89, 0xab, 0x89, 0x8d, 0x1d, 0xba, 0x8b, 0x7c, 0xd2, 0x05, 0xbd, 0x01, 0xff, 0x4c, 0xd4,
+	0x1d, 0x5f, 0xb9, 0xd2, 0x2d, 0xb9, 0x72, 0x65, 0xd0, 0x7b, 0x40, 0x1e, 0x61, 0x0f, 0xff, 0x80,
+	0x44, 0x0c, 0x93, 0x4b, 0x61, 0xd6, 0x81, 0x44, 0xcd, 0x4e, 0x4e, 0x0b, 0x5d, 0x85, 0xbf, 0x1e,
+	0xf7, 0x7d, 0xf9, 0x21, 0x81, 0x6d, 0x7e, 0x29, 0x40, 0x59, 0xe7, 0xbc, 0xc0, 0x60, 0xc0, 0x1d,
+	0x24, 0x12, 0x16, 0xa2, 0x61, 0x24, 0xeb, 0xa9, 0x2e, 0x99, 0x05, 0xb0, 0x36, 0xa6, 0xbc, 0x7a,
+	0x4d, 0x1e, 0x7e, 0xfc, 0xfe, 0xf3, 0x73, 0xee, 0x3e, 0xb9, 0xab, 0x36, 0x7b, 0x70, 0x33, 0xfd,
+	0x0e, 0x38, 0xcc, 0xdd, 0xe7, 0xf6, 0x30, 0x19, 0xf5, 0x91, 0x3d, 0x8c, 0xb7, 0x62, 0x64, 0x0f,
+	0x33, 0x1b, 0x30, 0x22, 0x03, 0x28, 0x4f, 0x6e, 0x20, 0xa9, 0xa5, 0x48, 0x73, 0xbf, 0x09, 0xd6,
+	0xb5, 0x2b, 0xe3, 0x9a, 0xd3, 0x96, 0xe2, 0xf4, 0xbf, 0x65, 0x4e, 0x73, 0xf2, 0x75, 0xe6, 0x03,
+	0x63, 0x8f, 0xbc, 0x81, 0x52, 0x46, 0x27, 0x41, 0xfe, 0x4b, 0xab, 0xce, 0xca, 0x97, 0x69, 0x3e,
+	0x3b, 0xd9, 0xf4, 0x5f, 0x05, 0xb4, 0x46, 0x56, 0xa7, 0x80, 0xc8, 0x29, 0xc0, 0x78, 0x63, 0x89,
+	0x95, 0x9e, 0x9e, 0x59, 0x63, 0x6b, 0x66, 0x1b, 0x68, 0x4d, 0x15, 0x35, 0x49, 0x65, 0x9a, 0xfd,
+	0x30, 0xba, 0xef, 0x11, 0x39, 0x87, 0x62, 0x66, 0x8e, 0x32, 0xbc, 0x67, 0xa7, 0xd6, 0xaa, 0xce,
+	0x0f, 0x6a, 0x9d, 0x76, 0x15, 0xd2, 0x26, 0xad, 0xce, 0x47, 0xb2, 0xd5, 0x28, 0x46, 0x5a, 0xf5,
+	0xa1, 0x98, 0x99, 0xc6, 0x0c, 0xe4, 0xec, 0x8c, 0x5a, 0x95, 0x34, 0x38, 0x31, 0x70, 0xf4, 0xba,
+	0x02, 0xdb, 0xda, 0xdb, 0xfc, 0x1d, 0x98, 0x3d, 0xe4, 0x9d, 0xd1, 0xd1, 0xd1, 0xd7, 0xcb, 0x9a,
+	0xf1, 0xed, 0xb2, 0x66, 0xfc, 0xb8, 0xac, 0x19, 0xa7, 0xb7, 0xbb, 0x5c, 0xbe, 0x0d, 0xdb, 0x07,
+	0x8e, 0xd7, 0xb7, 0x59, 0xd0, 0xf5, 0xfc, 0xc0, 0x7b, 0xa7, 0x5e, 0xf6, 0x9d, 0x8e, 0x3d, 0x68,
+	0xda, 0xfe, 0x59, 0x37, 0x2a, 0xe9, 0xf4, 0x38, 0x8e, 0x7f, 0x3f, 0xed, 0x45, 0xf5, 0x63, 0xb9,
+	0xf5, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x0b, 0x75, 0xc0, 0x9f, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/certificate/certificate.pb.go b/pkg/apiclient/certificate/certificate.pb.go
index e4cb34b38..e236c418e 100644
--- a/pkg/apiclient/certificate/certificate.pb.go
+++ b/pkg/apiclient/certificate/certificate.pb.go
@@ -12,7 +12,6 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -209,36 +208,35 @@ func init() {
 }
 
 var fileDescriptor_387c41efc0710f00 = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x4f, 0x6b, 0x14, 0x31,
-	0x14, 0x27, 0x55, 0x4a, 0x4d, 0x05, 0x6d, 0x28, 0xa5, 0x0c, 0x75, 0x2d, 0x43, 0xc1, 0x52, 0x30,
-	0x61, 0xc7, 0x8b, 0x78, 0x74, 0xc5, 0x53, 0x11, 0x9d, 0x0a, 0x82, 0x17, 0xc9, 0xce, 0x3e, 0x67,
-	0x63, 0xa7, 0x49, 0x4c, 0xde, 0x0c, 0x2c, 0xde, 0xc4, 0x6f, 0xe0, 0x37, 0xd1, 0x93, 0xdf, 0x40,
-	0xf1, 0x22, 0xf8, 0x05, 0x64, 0xf1, 0x83, 0xc8, 0x64, 0x5b, 0x9b, 0x91, 0x11, 0xbd, 0x2c, 0xf4,
-	0xf6, 0xf2, 0x5e, 0xde, 0x7b, 0xbf, 0x3f, 0x21, 0x74, 0xcf, 0x83, 0x6b, 0xc0, 0x89, 0x02, 0x1c,
-	0xaa, 0x97, 0xaa, 0x90, 0x08, 0x71, 0xcc, 0xad, 0x33, 0x68, 0xd8, 0x7a, 0x94, 0x4a, 0x36, 0x4b,
-	0x53, 0x9a, 0x90, 0x17, 0x6d, 0xb4, 0xb8, 0x92, 0xec, 0x94, 0xc6, 0x94, 0x15, 0x08, 0x69, 0x95,
-	0x90, 0x5a, 0x1b, 0x94, 0xa8, 0x8c, 0xf6, 0xa7, 0xd5, 0xc3, 0x52, 0xe1, 0xb4, 0x1e, 0xf3, 0xc2,
-	0x9c, 0x08, 0xe9, 0x42, 0xfb, 0xab, 0x10, 0xdc, 0x2e, 0x26, 0xa2, 0xc9, 0x84, 0x3d, 0x2e, 0xdb,
-	0x4e, 0x2f, 0xa4, 0xb5, 0x55, 0xbb, 0x46, 0x19, 0x2d, 0x9a, 0xa1, 0xac, 0xec, 0x54, 0x0e, 0x45,
-	0x09, 0x1a, 0x9c, 0x44, 0x98, 0x2c, 0xa6, 0xa5, 0xef, 0x08, 0x4d, 0x72, 0xb0, 0xc6, 0x2b, 0x34,
-	0x6e, 0x36, 0x3a, 0xc7, 0xf6, 0xa4, 0x06, 0x37, 0x63, 0xfb, 0xf4, 0xda, 0xd4, 0x78, 0x7c, 0x24,
-	0x4f, 0xe0, 0xb1, 0x44, 0x04, 0xa7, 0xb7, 0xc9, 0x2e, 0xd9, 0xbf, 0x92, 0xff, 0x99, 0x66, 0x09,
-	0x5d, 0x6b, 0x99, 0x3d, 0x9d, 0x59, 0xd8, 0x5e, 0x09, 0x57, 0x7e, 0x9f, 0xd9, 0x2e, 0x0d, 0xac,
-	0x8f, 0xea, 0x71, 0x28, 0x5f, 0x0a, 0xe5, 0x38, 0x95, 0x7e, 0x22, 0x34, 0xed, 0x85, 0x31, 0x72,
-	0x20, 0x11, 0x72, 0x78, 0x5d, 0x83, 0x47, 0xf6, 0x86, 0x5e, 0x8d, 0xe4, 0xf3, 0x01, 0xcb, 0x7a,
-	0xf6, 0x8c, 0x9f, 0x4b, 0xc2, 0xcf, 0x24, 0x09, 0xc1, 0x8b, 0x62, 0xc2, 0x9b, 0x8c, 0xdb, 0xe3,
-	0x92, 0xb7, 0x92, 0xf0, 0x48, 0x12, 0x7e, 0x26, 0x09, 0xef, 0xdd, 0x7b, 0xa8, 0x3c, 0xe6, 0x9d,
-	0x65, 0x6c, 0x8b, 0xae, 0xd6, 0xd6, 0x83, 0xc3, 0xc0, 0x6f, 0x2d, 0x3f, 0x3d, 0xa5, 0x37, 0xe9,
-	0x8d, 0xde, 0x11, 0x39, 0x78, 0x6b, 0xb4, 0x87, 0xec, 0xeb, 0x65, 0xca, 0xa2, 0xfc, 0x11, 0xb8,
-	0x46, 0x15, 0xc0, 0x3e, 0x10, 0x7a, 0xbd, 0x5d, 0x33, 0x8a, 0x97, 0xdc, 0xe2, 0xf1, 0x93, 0xf9,
-	0xbb, 0x33, 0xc9, 0xb2, 0x48, 0xa7, 0x3b, 0x6f, 0xbf, 0xff, 0x7c, 0xbf, 0xb2, 0xc5, 0x36, 0xc3,
-	0xfb, 0x6b, 0x86, 0xa2, 0x23, 0xc2, 0x17, 0x42, 0x37, 0x16, 0x9e, 0x44, 0x7d, 0x4c, 0xfc, 0x1b,
-	0x75, 0xc7, 0xc8, 0xe5, 0xa1, 0x3f, 0x08, 0xe8, 0xf7, 0xd2, 0x5e, 0xf4, 0xf7, 0xba, 0x86, 0x7e,
-	0x24, 0x74, 0xe3, 0x01, 0x54, 0xd0, 0xe5, 0x72, 0x61, 0x1c, 0x38, 0xe8, 0xe5, 0x70, 0xff, 0xe1,
-	0xe7, 0xf9, 0x80, 0x7c, 0x9b, 0x0f, 0xc8, 0x8f, 0xf9, 0x80, 0x3c, 0xbf, 0xfb, 0x7f, 0xbf, 0x41,
-	0x51, 0x29, 0xd0, 0x18, 0x0f, 0x1a, 0xaf, 0x86, 0x0f, 0xe0, 0xce, 0xaf, 0x00, 0x00, 0x00, 0xff,
-	0xff, 0x35, 0xdf, 0x5b, 0xaf, 0xb7, 0x04, 0x00, 0x00,
+	// 448 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xcf, 0x6a, 0x14, 0x31,
+	0x18, 0x27, 0x55, 0x4a, 0x4d, 0x05, 0x6d, 0x90, 0x52, 0x86, 0xba, 0x96, 0xa1, 0x60, 0x29, 0x98,
+	0xb0, 0xe3, 0x45, 0x3c, 0xba, 0xe2, 0xa9, 0x88, 0x4e, 0x05, 0xc1, 0x8b, 0x64, 0x67, 0x3f, 0x67,
+	0x63, 0xa7, 0x49, 0x4c, 0xbe, 0x19, 0x58, 0xbc, 0x89, 0x6f, 0xe0, 0x9b, 0xe8, 0xc9, 0x37, 0x50,
+	0xbc, 0x08, 0xbe, 0x80, 0x2c, 0x3e, 0x88, 0x4c, 0xd6, 0xba, 0x19, 0x19, 0xd1, 0xcb, 0x42, 0x6f,
+	0x5f, 0xbe, 0x24, 0xdf, 0xef, 0x5f, 0x08, 0xdd, 0xf7, 0xe0, 0x1a, 0x70, 0xa2, 0x00, 0x87, 0xea,
+	0x85, 0x2a, 0x24, 0x42, 0x5c, 0x73, 0xeb, 0x0c, 0x1a, 0xb6, 0x19, 0xb5, 0x92, 0xdd, 0xd2, 0x98,
+	0xb2, 0x02, 0x21, 0xad, 0x12, 0x52, 0x6b, 0x83, 0x12, 0x95, 0xd1, 0x7e, 0x71, 0x34, 0x39, 0x2a,
+	0x15, 0x4e, 0xeb, 0x31, 0x2f, 0xcc, 0xa9, 0x90, 0xae, 0x34, 0xd6, 0x99, 0x97, 0xa1, 0xb8, 0x55,
+	0x4c, 0x44, 0x93, 0x09, 0x7b, 0x52, 0xb6, 0x37, 0xbd, 0x90, 0xd6, 0x56, 0xed, 0x40, 0x65, 0xb4,
+	0x68, 0x86, 0xb2, 0xb2, 0x53, 0x39, 0x14, 0x25, 0x68, 0x70, 0x12, 0x61, 0xb2, 0x98, 0x96, 0xbe,
+	0x25, 0x34, 0xc9, 0xc1, 0x1a, 0xaf, 0xd0, 0xb8, 0xd9, 0x68, 0xc9, 0xe2, 0x71, 0x0d, 0x6e, 0xc6,
+	0x0e, 0xe8, 0x95, 0xa9, 0xf1, 0xf8, 0x50, 0x9e, 0xc2, 0x23, 0x89, 0x08, 0x4e, 0xef, 0x90, 0x3d,
+	0x72, 0x70, 0x29, 0xff, 0xb3, 0xcd, 0x12, 0xba, 0xd1, 0x6a, 0x78, 0x32, 0xb3, 0xb0, 0xb3, 0x16,
+	0x8e, 0xfc, 0x5e, 0xb3, 0x3d, 0x1a, 0xf4, 0x1d, 0xd7, 0xe3, 0xb0, 0x7d, 0x21, 0x6c, 0xc7, 0xad,
+	0xf4, 0x23, 0xa1, 0x69, 0x2f, 0x8d, 0x91, 0x03, 0x89, 0x90, 0xc3, 0xab, 0x1a, 0x3c, 0xb2, 0xd7,
+	0xf4, 0x72, 0x64, 0x94, 0x0f, 0x5c, 0x36, 0xb3, 0xa7, 0x7c, 0x69, 0x09, 0x3f, 0xb3, 0x24, 0x14,
+	0xcf, 0x8b, 0x09, 0x6f, 0x32, 0x6e, 0x4f, 0x4a, 0xde, 0x5a, 0xc2, 0x23, 0x4b, 0xf8, 0x99, 0x25,
+	0xbc, 0x17, 0xf7, 0x48, 0x79, 0xcc, 0x3b, 0x60, 0x6c, 0x9b, 0xae, 0xd7, 0xd6, 0x83, 0xc3, 0xa0,
+	0x6f, 0x23, 0xff, 0xb5, 0x4a, 0x6f, 0xd0, 0xeb, 0xbd, 0x23, 0x72, 0xf0, 0xd6, 0x68, 0x0f, 0xd9,
+	0x97, 0x8b, 0x94, 0x45, 0xfd, 0x63, 0x70, 0x8d, 0x2a, 0x80, 0xbd, 0x27, 0xf4, 0x6a, 0x0b, 0x33,
+	0x8a, 0x41, 0x6e, 0xf2, 0xf8, 0x71, 0xfc, 0x3d, 0x99, 0x64, 0x55, 0xa2, 0xd3, 0xdd, 0x37, 0xdf,
+	0x7e, 0xbc, 0x5b, 0xdb, 0x66, 0xd7, 0xc2, 0xfb, 0x6b, 0x86, 0xa2, 0x63, 0xc2, 0x67, 0x42, 0xb7,
+	0x16, 0x99, 0x44, 0xf7, 0x98, 0xf8, 0x37, 0xeb, 0x4e, 0x90, 0xab, 0x63, 0x7f, 0x18, 0xd8, 0xef,
+	0xa7, 0xbd, 0xec, 0xef, 0x76, 0x03, 0xfd, 0x40, 0xe8, 0xd6, 0x7d, 0xa8, 0xa0, 0xab, 0xe5, 0xdc,
+	0x24, 0x70, 0xd8, 0xab, 0xe1, 0xde, 0x83, 0x4f, 0xf3, 0x01, 0xf9, 0x3a, 0x1f, 0x90, 0xef, 0xf3,
+	0x01, 0x79, 0x76, 0xe7, 0xff, 0x7e, 0x83, 0xa2, 0x52, 0xa0, 0x31, 0x1e, 0x34, 0x5e, 0x0f, 0x1f,
+	0xc0, 0xed, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x19, 0x1a, 0x3e, 0x95, 0xa1, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/cluster/cluster.pb.go b/pkg/apiclient/cluster/cluster.pb.go
index d0439312d..605be6d30 100644
--- a/pkg/apiclient/cluster/cluster.pb.go
+++ b/pkg/apiclient/cluster/cluster.pb.go
@@ -11,14 +11,12 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/api/core/v1"
 	math "math"
 	math_bits "math/bits"
 )
@@ -324,46 +322,45 @@ func init() {
 func init() { proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_a6b5ba0b5aa57b32) }
 
 var fileDescriptor_a6b5ba0b5aa57b32 = []byte{
-	// 617 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcf, 0x6b, 0x14, 0x31,
-	0x14, 0xc7, 0xc9, 0xb6, 0x6e, 0x6d, 0xaa, 0x56, 0x43, 0x95, 0x61, 0xfb, 0x83, 0x1a, 0x45, 0xab,
-	0xb4, 0x09, 0x5d, 0x2b, 0x88, 0x37, 0xdb, 0xaa, 0x2c, 0xf4, 0xe2, 0x88, 0x17, 0x0f, 0x2d, 0xe9,
-	0xcc, 0x63, 0x36, 0xee, 0x74, 0x32, 0x4e, 0x32, 0x03, 0x45, 0xbc, 0xf4, 0xe4, 0x4d, 0xc4, 0xab,
-	0x57, 0xff, 0x10, 0x6f, 0x82, 0x17, 0xc1, 0x7f, 0x40, 0x16, 0xff, 0x10, 0x99, 0xcc, 0xcc, 0xae,
-	0xbb, 0x4b, 0x97, 0x0a, 0xab, 0xa7, 0x7d, 0x79, 0xd9, 0x97, 0xef, 0xe7, 0x7d, 0x93, 0x4c, 0xf0,
-	0x92, 0x86, 0x24, 0x83, 0x84, 0x7b, 0x61, 0xaa, 0x4d, 0xff, 0x97, 0xc5, 0x89, 0x32, 0x8a, 0xcc,
-	0x94, 0xc3, 0xc6, 0x42, 0xa0, 0x02, 0x65, 0x73, 0x3c, 0x8f, 0x8a, 0xe9, 0xc6, 0x52, 0xa0, 0x54,
-	0x10, 0x02, 0x17, 0xb1, 0xe4, 0x22, 0x8a, 0x94, 0x11, 0x46, 0xaa, 0x48, 0x97, 0xb3, 0xb4, 0xf3,
-	0x40, 0x33, 0xa9, 0xec, 0xac, 0xa7, 0x12, 0xe0, 0xd9, 0x26, 0x0f, 0x20, 0x82, 0x44, 0x18, 0xf0,
-	0xcb, 0xff, 0xec, 0x05, 0xd2, 0xb4, 0xd3, 0x43, 0xe6, 0xa9, 0x23, 0x2e, 0x12, 0x2b, 0xf1, 0xca,
-	0x06, 0x1b, 0x9e, 0xcf, 0xb3, 0x26, 0x8f, 0x3b, 0x41, 0x5e, 0xaf, 0xb9, 0x88, 0xe3, 0x50, 0x7a,
-	0x76, 0x7d, 0x9e, 0x6d, 0x8a, 0x30, 0x6e, 0x8b, 0x91, 0xd5, 0xe8, 0x7d, 0x3c, 0xbb, 0x53, 0x00,
-	0xb7, 0x76, 0x09, 0xc1, 0xd3, 0xe6, 0x38, 0x06, 0x07, 0xad, 0xa2, 0xb5, 0x59, 0xd7, 0xc6, 0x64,
-	0x01, 0x9f, 0xcb, 0x44, 0x98, 0x82, 0x53, 0xb3, 0xc9, 0x62, 0x40, 0xf7, 0xf1, 0x85, 0xb2, 0xec,
-	0x59, 0x0a, 0xc9, 0x31, 0xb9, 0x86, 0xeb, 0x85, 0x2b, 0x65, 0x6d, 0x39, 0xca, 0x57, 0x8c, 0xc4,
-	0x51, 0x55, 0x6c, 0x63, 0x42, 0x71, 0x4d, 0xfa, 0xce, 0xd4, 0x2a, 0x5a, 0x9b, 0x6b, 0x12, 0x56,
-	0xb9, 0xd7, 0xa3, 0x70, 0x6b, 0xd2, 0xa7, 0x57, 0xf0, 0x7c, 0x99, 0x70, 0x41, 0xc7, 0x2a, 0xd2,
-	0x40, 0xdf, 0x23, 0xbc, 0x50, 0xe6, 0x76, 0x12, 0x10, 0x06, 0x5c, 0x78, 0x9d, 0x82, 0x36, 0xe4,
-	0x00, 0x57, 0x9e, 0x5b, 0xf1, 0xb9, 0xe6, 0x63, 0xd6, 0xb7, 0x88, 0x55, 0x16, 0xd9, 0xe0, 0xc0,
-	0xf3, 0x59, 0xd6, 0x64, 0x71, 0x27, 0x60, 0xb9, 0x45, 0xec, 0x0f, 0x8b, 0x58, 0x65, 0x51, 0x45,
-	0xe2, 0x56, 0xab, 0xe6, 0xcd, 0xa5, 0xb1, 0x86, 0xc4, 0xd8, 0x36, 0xce, 0xbb, 0xe5, 0x88, 0x7e,
-	0xe9, 0x13, 0xbd, 0x88, 0xfd, 0xff, 0x49, 0x74, 0x13, 0x5f, 0x4c, 0xad, 0xa2, 0xff, 0x44, 0x42,
-	0xe8, 0x6b, 0xa7, 0xb6, 0x3a, 0xb5, 0x36, 0xeb, 0x0e, 0x26, 0xcf, 0x62, 0x74, 0xf3, 0xdb, 0x0c,
-	0xbe, 0x54, 0x66, 0x9e, 0x43, 0x92, 0x49, 0x0f, 0xc8, 0x09, 0xc2, 0xd3, 0x7b, 0x52, 0x1b, 0x72,
-	0x75, 0xb8, 0xc6, 0xee, 0x75, 0xa3, 0x35, 0x91, 0x66, 0x72, 0x05, 0xea, 0x9c, 0xfc, 0xf8, 0xf5,
-	0xb1, 0x46, 0xc8, 0x65, 0x7b, 0xe2, 0xb3, 0xcd, 0xea, 0x2e, 0x69, 0xf2, 0x01, 0xe1, 0x7a, 0xb1,
-	0xcd, 0x64, 0x79, 0x18, 0x63, 0x60, 0xfb, 0x1b, 0x93, 0xf1, 0x96, 0x5e, 0xb7, 0x28, 0x8b, 0x74,
-	0x04, 0xe5, 0x61, 0xcf, 0xf5, 0x77, 0x08, 0x4f, 0x3d, 0x85, 0x53, 0x7d, 0x99, 0x10, 0xc8, 0x0d,
-	0x0b, 0xb2, 0x4c, 0x16, 0x87, 0x41, 0xf8, 0x1b, 0xe9, 0x33, 0x7b, 0xfd, 0xde, 0x92, 0x4f, 0x08,
-	0xd7, 0x8b, 0x33, 0x37, 0x6a, 0xcf, 0xc0, 0x59, 0x9c, 0x14, 0xd5, 0xba, 0xa5, 0xba, 0xd5, 0x18,
-	0x47, 0xd5, 0x77, 0x6a, 0x1f, 0xd7, 0x77, 0x21, 0x04, 0x03, 0xa7, 0x79, 0xe5, 0x0c, 0xa7, 0x7b,
-	0xd7, 0xbc, 0x6c, 0xff, 0xee, 0xd8, 0xf6, 0x23, 0x8c, 0xdd, 0xfc, 0xd3, 0x09, 0x8f, 0x52, 0xd3,
-	0xfe, 0x7b, 0x0d, 0x6e, 0x35, 0xee, 0xd0, 0xdb, 0x63, 0x34, 0x78, 0x62, 0x05, 0x36, 0x44, 0xae,
-	0xf0, 0x19, 0xe1, 0xf9, 0x56, 0x94, 0x89, 0x50, 0xe6, 0xd6, 0xee, 0x08, 0xaf, 0x0d, 0xff, 0xf8,
-	0x14, 0x6c, 0x59, 0x44, 0x46, 0xd7, 0xc7, 0x21, 0xca, 0x1e, 0xd2, 0x86, 0x97, 0x33, 0x6d, 0x6f,
-	0x7f, 0xed, 0xae, 0xa0, 0xef, 0xdd, 0x15, 0xf4, 0xb3, 0xbb, 0x82, 0x5e, 0x6e, 0x9d, 0xed, 0xa5,
-	0xf0, 0x42, 0x09, 0x91, 0xa9, 0x04, 0x0e, 0xeb, 0xf6, 0x61, 0xb8, 0xf7, 0x3b, 0x00, 0x00, 0xff,
-	0xff, 0xbd, 0xd0, 0x41, 0xca, 0xe7, 0x06, 0x00, 0x00,
+	// 597 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xc1, 0x6f, 0xd3, 0x3e,
+	0x14, 0xc7, 0xe5, 0x6e, 0xbf, 0xee, 0x57, 0x0f, 0x18, 0x58, 0x03, 0x45, 0xdd, 0x56, 0x95, 0x80,
+	0xa0, 0xa0, 0xd5, 0x56, 0xcb, 0xb8, 0x70, 0x63, 0x1d, 0xa0, 0x4a, 0xbb, 0x10, 0xc4, 0x85, 0xc3,
+	0x26, 0x2f, 0x79, 0x4a, 0xcd, 0xb2, 0xc4, 0xc4, 0x4e, 0xa4, 0x09, 0x71, 0xd9, 0x89, 0x1b, 0x42,
+	0x5c, 0xb9, 0xf2, 0x87, 0x70, 0x43, 0xe2, 0x82, 0xc4, 0x3f, 0x80, 0x2a, 0xfe, 0x10, 0x14, 0x27,
+	0x69, 0x69, 0xa7, 0x55, 0x43, 0x2a, 0x9c, 0xea, 0xf7, 0xd4, 0xe7, 0xef, 0xe7, 0x7d, 0xfd, 0x1c,
+	0xe3, 0x75, 0x05, 0x71, 0x0a, 0x31, 0x73, 0x83, 0x44, 0xe9, 0xf1, 0x2f, 0x95, 0x71, 0xa4, 0x23,
+	0xb2, 0x54, 0x84, 0xf5, 0x75, 0x3f, 0x8a, 0xfc, 0x00, 0x18, 0x97, 0x82, 0xf1, 0x30, 0x8c, 0x34,
+	0xd7, 0x22, 0x0a, 0x55, 0xfe, 0xb7, 0xfa, 0xae, 0x2f, 0xf4, 0x20, 0x39, 0xa0, 0x6e, 0x74, 0xc4,
+	0x78, 0xec, 0x47, 0x32, 0x8e, 0x5e, 0x9a, 0x45, 0xdb, 0xf5, 0x58, 0xda, 0x65, 0xf2, 0xd0, 0xcf,
+	0x2a, 0x15, 0xe3, 0x52, 0x06, 0xc2, 0x35, 0xb5, 0x2c, 0xed, 0xf0, 0x40, 0x0e, 0x78, 0x87, 0xf9,
+	0x10, 0x42, 0xcc, 0x35, 0x78, 0xf9, 0x6e, 0xf6, 0x7d, 0x5c, 0xeb, 0xe5, 0xb2, 0xfd, 0x1d, 0x42,
+	0xf0, 0xa2, 0x3e, 0x96, 0x60, 0xa1, 0x26, 0x6a, 0xd5, 0x1c, 0xb3, 0x26, 0xab, 0xf8, 0xbf, 0x94,
+	0x07, 0x09, 0x58, 0x15, 0x93, 0xcc, 0x03, 0x7b, 0x0f, 0x5f, 0x28, 0xca, 0x9e, 0x26, 0x10, 0x1f,
+	0x93, 0x6b, 0xb8, 0x9a, 0xf7, 0x56, 0xd4, 0x16, 0x51, 0xb6, 0x63, 0xc8, 0x8f, 0xca, 0x62, 0xb3,
+	0x26, 0x36, 0xae, 0x08, 0xcf, 0x5a, 0x68, 0xa2, 0xd6, 0x72, 0x97, 0xd0, 0xd2, 0x83, 0x11, 0x85,
+	0x53, 0x11, 0x9e, 0x7d, 0x05, 0xaf, 0x14, 0x09, 0x07, 0x94, 0x8c, 0x42, 0x05, 0xf6, 0x3b, 0x84,
+	0x57, 0x8b, 0x5c, 0x2f, 0x06, 0xae, 0xc1, 0x81, 0x57, 0x09, 0x28, 0x4d, 0xf6, 0x71, 0xe9, 0x9c,
+	0x11, 0x5f, 0xee, 0x3e, 0xa2, 0x63, 0x8b, 0x68, 0x69, 0x91, 0x59, 0xec, 0xbb, 0x1e, 0x4d, 0xbb,
+	0x54, 0x1e, 0xfa, 0x34, 0xb3, 0x88, 0xfe, 0x66, 0x11, 0x2d, 0x2d, 0x2a, 0x49, 0x9c, 0x72, 0xd7,
+	0xac, 0xb9, 0x44, 0x2a, 0x88, 0xb5, 0x69, 0xe3, 0x7f, 0xa7, 0x88, 0xec, 0xcf, 0x63, 0xa2, 0xe7,
+	0xd2, 0xfb, 0x97, 0x44, 0x37, 0xf1, 0xc5, 0xc4, 0x28, 0x7a, 0x8f, 0x05, 0x04, 0x9e, 0xb2, 0x2a,
+	0xcd, 0x85, 0x56, 0xcd, 0x99, 0x4c, 0x9e, 0xc7, 0xe8, 0xee, 0xd7, 0x25, 0x7c, 0xa9, 0xc8, 0x3c,
+	0x83, 0x38, 0x15, 0x2e, 0x90, 0x13, 0x84, 0x17, 0x77, 0x85, 0xd2, 0xe4, 0xea, 0x74, 0x8d, 0x39,
+	0xeb, 0x7a, 0x7f, 0x2e, 0xcd, 0x64, 0x0a, 0xb6, 0x75, 0xf2, 0xfd, 0xe7, 0x87, 0x0a, 0x21, 0x97,
+	0xcd, 0xac, 0xa7, 0x9d, 0xf2, 0x46, 0x28, 0xf2, 0x1e, 0xe1, 0x6a, 0x7e, 0xcc, 0x64, 0x63, 0x1a,
+	0x63, 0xe2, 0xf8, 0xeb, 0xf3, 0xf1, 0xd6, 0xbe, 0x6e, 0x50, 0xd6, 0xec, 0x53, 0x28, 0x0f, 0x46,
+	0xae, 0xbf, 0x45, 0x78, 0xe1, 0x09, 0x9c, 0xe9, 0xcb, 0x9c, 0x40, 0x6e, 0x18, 0x90, 0x0d, 0xb2,
+	0x36, 0x0d, 0xc2, 0x5e, 0x0b, 0x8f, 0x9a, 0xeb, 0xf7, 0x86, 0x7c, 0x44, 0xb8, 0x9a, 0xcf, 0xdc,
+	0x69, 0x7b, 0x26, 0x66, 0x71, 0x5e, 0x54, 0x9b, 0x86, 0xea, 0x56, 0x7d, 0x16, 0xd5, 0xd8, 0xa9,
+	0x3d, 0x5c, 0xdd, 0x81, 0x00, 0x34, 0x9c, 0xe5, 0x95, 0x35, 0x9d, 0x1e, 0x5d, 0xf3, 0xa2, 0xfd,
+	0xbb, 0x33, 0xdb, 0x0f, 0x31, 0x76, 0xb2, 0xcf, 0x22, 0x3c, 0x4c, 0xf4, 0xe0, 0xcf, 0x35, 0x98,
+	0xd1, 0xb8, 0x63, 0xdf, 0x9e, 0xa1, 0xc1, 0x62, 0x23, 0xd0, 0xe6, 0x99, 0xc2, 0x27, 0x84, 0x57,
+	0xfa, 0x61, 0xca, 0x03, 0x91, 0x59, 0xdb, 0xe3, 0xee, 0x00, 0xfe, 0xf2, 0x14, 0x6c, 0x19, 0x44,
+	0x6a, 0x6f, 0xce, 0x42, 0x14, 0x23, 0xa4, 0xb6, 0x9b, 0x31, 0x6d, 0x6f, 0x7f, 0x19, 0x36, 0xd0,
+	0xb7, 0x61, 0x03, 0xfd, 0x18, 0x36, 0xd0, 0x8b, 0xad, 0xf3, 0xbd, 0x14, 0x6e, 0x20, 0x20, 0xd4,
+	0xa5, 0xc0, 0x41, 0xd5, 0x3c, 0x0c, 0xf7, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x1c, 0x77, 0xdb,
+	0xd9, 0xad, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/apiclient/gpgkey/gpgkey.pb.go b/pkg/apiclient/gpgkey/gpgkey.pb.go
index 0b75ebd14..4e461a464 100644
--- a/pkg/apiclient/gpgkey/gpgkey.pb.go
+++ b/pkg/apiclient/gpgkey/gpgkey.pb.go
@@ -11,7 +11,6 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
@@ -248,38 +247,38 @@ func init() {
 func init() { proto.RegisterFile("server/gpgkey/gpgkey.proto", fileDescriptor_8ba55a5eb76dc6fd) }
 
 var fileDescriptor_8ba55a5eb76dc6fd = []byte{
-	// 494 bytes of a gzipped FileDescriptorProto
+	// 487 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x99, 0xee, 0x9a, 0xb5, 0x23, 0x22, 0x8e, 0xcb, 0x6e, 0xcc, 0x96, 0x5a, 0xa2, 0x87,
-	0xa2, 0x38, 0x43, 0xbb, 0x37, 0x6f, 0xea, 0x42, 0x90, 0xed, 0xa1, 0xc6, 0x9b, 0x07, 0x25, 0x4d,
-	0x1e, 0xb3, 0x69, 0x62, 0x66, 0xcc, 0x4c, 0x22, 0x41, 0xbc, 0x78, 0x57, 0x10, 0x3f, 0x81, 0xe0,
-	0x87, 0xf1, 0x28, 0xf8, 0x05, 0xa4, 0xf8, 0x41, 0xa4, 0x93, 0xd4, 0xdd, 0x96, 0x52, 0xf7, 0xd0,
-	0x53, 0xde, 0xcb, 0x9b, 0xf7, 0xde, 0x6f, 0xde, 0xfb, 0x0f, 0x76, 0x14, 0xe4, 0x25, 0xe4, 0x8c,
-	0x4b, 0x9e, 0x40, 0xd5, 0x7c, 0xa8, 0xcc, 0x85, 0x16, 0xc4, 0xaa, 0x3d, 0x67, 0x9f, 0x0b, 0x2e,
-	0xcc, 0x2f, 0x36, 0xb7, 0xea, 0xa8, 0xd3, 0xe1, 0x42, 0xf0, 0x14, 0x58, 0x20, 0x63, 0x16, 0x64,
-	0x99, 0xd0, 0x81, 0x8e, 0x45, 0xa6, 0x9a, 0xe8, 0x88, 0xc7, 0xfa, 0xac, 0x98, 0xd0, 0x50, 0xbc,
-	0x61, 0x41, 0x6e, 0xd2, 0xa7, 0xc6, 0x78, 0x18, 0x46, 0xac, 0x1c, 0x32, 0x99, 0xf0, 0x79, 0xa6,
-	0x62, 0x81, 0x94, 0x69, 0x1c, 0x9a, 0x5c, 0x56, 0x0e, 0x82, 0x54, 0x9e, 0x05, 0x03, 0xc6, 0x21,
-	0x83, 0x3c, 0xd0, 0x10, 0xd5, 0xd5, 0xdc, 0x07, 0xf8, 0x96, 0x97, 0x15, 0x63, 0x6f, 0x5c, 0x4c,
-	0xd2, 0x38, 0x3c, 0x85, 0xea, 0x79, 0x01, 0x79, 0x45, 0xf6, 0xf1, 0x95, 0x04, 0xaa, 0x67, 0x27,
-	0x36, 0xea, 0xa1, 0x7e, 0xdb, 0xaf, 0x1d, 0xf7, 0x1b, 0xc2, 0x47, 0xcb, 0xa7, 0x9f, 0xe6, 0x10,
-	0x68, 0xf0, 0xe1, 0x6d, 0x01, 0x4a, 0x93, 0x29, 0x6e, 0x4b, 0x13, 0x49, 0xa0, 0x32, 0x99, 0xd7,
-	0x86, 0x23, 0x7a, 0x8e, 0x4b, 0x17, 0xb8, 0xc6, 0x78, 0x1d, 0x46, 0xb4, 0x1c, 0x52, 0x99, 0x70,
-	0x3a, 0xc7, 0xa5, 0x17, 0x70, 0xe9, 0x02, 0x97, 0x2e, 0x77, 0xf3, 0xcf, 0xcb, 0x93, 0x03, 0x6c,
-	0x15, 0x52, 0x41, 0xae, 0xed, 0x56, 0x0f, 0xf5, 0xaf, 0xfa, 0x8d, 0xe7, 0x7e, 0x47, 0xb8, 0xb3,
-	0x9e, 0x51, 0x49, 0x91, 0x29, 0x20, 0x53, 0xbc, 0x17, 0x9a, 0x3f, 0x51, 0x83, 0x38, 0xde, 0x26,
-	0xe2, 0x28, 0x56, 0xda, 0x5f, 0x34, 0x20, 0x36, 0xde, 0x53, 0x49, 0x2c, 0x25, 0x44, 0x76, 0xab,
-	0xb7, 0xd3, 0x6f, 0xfb, 0x0b, 0xd7, 0xb5, 0xf1, 0xc1, 0xca, 0xdd, 0x1a, 0xbe, 0xe1, 0xa7, 0x5d,
-	0x7c, 0xdd, 0x1b, 0x7b, 0xa7, 0x50, 0xbd, 0x80, 0xbc, 0x8c, 0x43, 0x20, 0x9f, 0x11, 0xde, 0x9d,
-	0xd7, 0x25, 0x47, 0xb4, 0x51, 0xd1, 0x9a, 0x95, 0x39, 0x5b, 0xbf, 0x86, 0x7b, 0xf8, 0xf1, 0xd7,
-	0x9f, 0xaf, 0xad, 0x9b, 0xe4, 0x86, 0x51, 0x62, 0x39, 0x68, 0x34, 0xac, 0xc8, 0x17, 0x84, 0x77,
-	0x3c, 0xf8, 0x0f, 0xcf, 0x56, 0x37, 0xef, 0xde, 0x31, 0x2c, 0xb7, 0xc9, 0xe1, 0x0a, 0x0b, 0x7b,
-	0x6f, 0xa4, 0xf9, 0x81, 0xbc, 0xc3, 0x56, 0xbd, 0x68, 0x72, 0x77, 0x3d, 0xd5, 0x92, 0x54, 0x9d,
-	0x7b, 0x9b, 0x0f, 0xd5, 0xbb, 0x70, 0x5d, 0xd3, 0xb5, 0xe3, 0xae, 0x4e, 0xe0, 0xd1, 0x05, 0x21,
-	0xbe, 0xc2, 0xd6, 0x09, 0xa4, 0xa0, 0x61, 0xf3, 0x38, 0xba, 0xeb, 0x83, 0xff, 0x5a, 0x35, 0xc3,
-	0xbe, 0xbf, 0xda, 0xea, 0xc9, 0xe3, 0x1f, 0xb3, 0x2e, 0xfa, 0x39, 0xeb, 0xa2, 0xdf, 0xb3, 0x2e,
-	0x7a, 0x79, 0x7c, 0xb9, 0xd7, 0x1f, 0xa6, 0x31, 0x64, 0xba, 0xa9, 0x31, 0xb1, 0xcc, 0x5b, 0x3f,
-	0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x22, 0x5b, 0x6e, 0xbf, 0x93, 0x04, 0x00, 0x00,
+	0x14, 0xc7, 0x99, 0xee, 0xda, 0xb5, 0x23, 0x22, 0x8e, 0xb2, 0x1b, 0xb3, 0xa5, 0x96, 0xe8, 0xa1,
+	0x28, 0xce, 0xd0, 0xee, 0xcd, 0x9b, 0xba, 0x10, 0x64, 0x7b, 0xa8, 0xf1, 0xe6, 0x41, 0x49, 0x93,
+	0x47, 0x76, 0x9a, 0x98, 0x19, 0x67, 0x26, 0x91, 0x20, 0x5e, 0xbc, 0x2b, 0x88, 0x9f, 0x40, 0xf0,
+	0xc3, 0x78, 0x14, 0xfc, 0x02, 0x52, 0xfc, 0x20, 0xd2, 0x49, 0xea, 0x6e, 0x4b, 0x59, 0x3d, 0xf4,
+	0x94, 0x79, 0x99, 0x79, 0xef, 0xff, 0x9b, 0xf7, 0xfe, 0x83, 0x5d, 0x0d, 0xaa, 0x04, 0xc5, 0x12,
+	0x99, 0xa4, 0x50, 0x35, 0x1f, 0x2a, 0x95, 0x30, 0x82, 0xb4, 0xeb, 0xc8, 0xed, 0x26, 0x42, 0x24,
+	0x19, 0xb0, 0x50, 0x72, 0x16, 0xe6, 0xb9, 0x30, 0xa1, 0xe1, 0x22, 0xd7, 0xf5, 0x29, 0x77, 0x9c,
+	0x70, 0x73, 0x5a, 0x4c, 0x69, 0x24, 0x5e, 0xb3, 0x50, 0x25, 0x42, 0x2a, 0x31, 0xb3, 0x8b, 0x07,
+	0x51, 0xcc, 0xca, 0x11, 0x93, 0x69, 0xb2, 0xc8, 0xd4, 0x2c, 0x94, 0x32, 0xe3, 0x91, 0xcd, 0x65,
+	0xe5, 0x30, 0xcc, 0xe4, 0x69, 0x38, 0x64, 0x09, 0xe4, 0xa0, 0x42, 0x03, 0x71, 0x5d, 0xcd, 0xbb,
+	0x8f, 0x6f, 0xf8, 0x79, 0x31, 0xf1, 0x27, 0xc5, 0x34, 0xe3, 0xd1, 0x09, 0x54, 0xcf, 0x0a, 0x50,
+	0x15, 0xb9, 0x89, 0x2f, 0xa5, 0x50, 0x3d, 0x3d, 0x76, 0x50, 0x1f, 0x0d, 0x3a, 0x41, 0x1d, 0x78,
+	0x5f, 0x11, 0x3e, 0x5c, 0x3d, 0xfd, 0x44, 0x41, 0x68, 0x20, 0x80, 0x37, 0x05, 0x68, 0x43, 0x66,
+	0xb8, 0x23, 0xed, 0x4e, 0x0a, 0x95, 0xcd, 0xbc, 0x32, 0x1a, 0xd3, 0x33, 0x5c, 0xba, 0xc4, 0xb5,
+	0x8b, 0x57, 0x51, 0x4c, 0xcb, 0x11, 0x95, 0x69, 0x42, 0x17, 0xb8, 0xf4, 0x1c, 0x2e, 0x5d, 0xe2,
+	0xd2, 0x55, 0xb5, 0xe0, 0xac, 0x3c, 0xd9, 0xc7, 0xed, 0x42, 0x6a, 0x50, 0xc6, 0x69, 0xf5, 0xd1,
+	0xe0, 0x72, 0xd0, 0x44, 0xde, 0x37, 0x84, 0xbb, 0x9b, 0x19, 0xb5, 0x14, 0xb9, 0x06, 0x32, 0xc3,
+	0x7b, 0x91, 0xfd, 0x13, 0x37, 0x88, 0x93, 0x6d, 0x22, 0x8e, 0xb9, 0x36, 0xc1, 0x52, 0x80, 0x38,
+	0x78, 0x4f, 0xa7, 0x5c, 0x4a, 0x88, 0x9d, 0x56, 0x7f, 0x67, 0xd0, 0x09, 0x96, 0xa1, 0xe7, 0xe0,
+	0xfd, 0xb5, 0xbb, 0x35, 0x7c, 0xa3, 0x8f, 0xbb, 0xf8, 0xaa, 0x3f, 0xf1, 0x4f, 0xa0, 0x7a, 0x0e,
+	0xaa, 0xe4, 0x11, 0x90, 0x4f, 0x08, 0xef, 0x2e, 0xea, 0x92, 0x43, 0xda, 0xf8, 0x65, 0xc3, 0xc8,
+	0xdc, 0xad, 0x5f, 0xc3, 0x3b, 0xf8, 0xf0, 0xf3, 0xf7, 0x97, 0xd6, 0x75, 0x72, 0xcd, 0x3a, 0xb1,
+	0x1c, 0x36, 0x6e, 0xd5, 0xe4, 0x33, 0xc2, 0x3b, 0x3e, 0xfc, 0x83, 0x67, 0xab, 0x93, 0xf7, 0x6e,
+	0x5b, 0x96, 0x5b, 0xe4, 0x60, 0x8d, 0x85, 0xbd, 0xb3, 0xd6, 0x7c, 0x4f, 0xde, 0xe2, 0x76, 0x3d,
+	0x68, 0x72, 0x67, 0x33, 0xd5, 0x8a, 0x55, 0xdd, 0xbb, 0x17, 0x1f, 0xaa, 0x67, 0xe1, 0x79, 0x56,
+	0xb5, 0xeb, 0xad, 0x77, 0xe0, 0xe1, 0x39, 0x23, 0xbe, 0xc4, 0xed, 0x63, 0xc8, 0xc0, 0xc0, 0xc5,
+	0xed, 0xe8, 0x6d, 0xde, 0xfc, 0x2b, 0xd5, 0x34, 0xfb, 0xde, 0xba, 0xd4, 0xe3, 0x47, 0xdf, 0xe7,
+	0x3d, 0xf4, 0x63, 0xde, 0x43, 0xbf, 0xe6, 0x3d, 0xf4, 0xe2, 0xe8, 0xff, 0x5e, 0x7f, 0x94, 0x71,
+	0xc8, 0x4d, 0x53, 0x63, 0xda, 0xb6, 0x6f, 0xfd, 0xe8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x18,
+	0x72, 0x6b, 0xb1, 0x7d, 0x04, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go
index c04db7a39..2c7b88846 100644
--- a/reposerver/apiclient/repository.pb.go
+++ b/reposerver/apiclient/repository.pb.go
@@ -7,14 +7,11 @@ import (
 	context "context"
 	fmt "fmt"
 	v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	_ "github.com/gogo/protobuf/gogoproto"
 	proto "github.com/gogo/protobuf/proto"
-	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	io "io"
-	_ "k8s.io/api/core/v1"
 	math "math"
 	math_bits "math/bits"
 )
@@ -1349,98 +1346,96 @@ func init() {
 }
 
 var fileDescriptor_dd8723cfcc820480 = []byte{
-	// 1454 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdd, 0x6e, 0x1b, 0x45,
-	0x14, 0xce, 0x3a, 0x8e, 0x63, 0x1f, 0xb7, 0x89, 0x33, 0xfd, 0x5b, 0x4c, 0x1a, 0xa5, 0x8b, 0xa8,
-	0x22, 0x4a, 0xd7, 0x6a, 0x2a, 0x41, 0xd5, 0x0a, 0x24, 0x93, 0xb6, 0x29, 0x6a, 0xd3, 0x84, 0x4d,
-	0x85, 0x04, 0x54, 0xa0, 0xf1, 0xfa, 0x64, 0x3d, 0x78, 0xbd, 0x3b, 0xdd, 0x1f, 0x23, 0x57, 0xe2,
-	0x82, 0x57, 0xe0, 0x82, 0x57, 0xe1, 0x92, 0x2b, 0x10, 0x97, 0xf0, 0x06, 0xa8, 0x5c, 0xf0, 0x1a,
-	0x68, 0x66, 0x7f, 0xbd, 0xde, 0xb4, 0x45, 0x6e, 0x53, 0x71, 0x93, 0xcc, 0x9c, 0x99, 0x39, 0x7f,
-	0xf3, 0xcd, 0x39, 0xdf, 0x1a, 0x2e, 0x7b, 0xc8, 0x5d, 0x1f, 0xbd, 0x31, 0x7a, 0x1d, 0x39, 0x64,
-	0x81, 0xeb, 0x4d, 0x72, 0x43, 0x9d, 0x7b, 0x6e, 0xe0, 0x12, 0xc8, 0x24, 0xed, 0xb3, 0x96, 0x6b,
-	0xb9, 0x52, 0xdc, 0x11, 0xa3, 0x68, 0x47, 0x7b, 0xdd, 0x72, 0x5d, 0xcb, 0xc6, 0x0e, 0xe5, 0xac,
-	0x43, 0x1d, 0xc7, 0x0d, 0x68, 0xc0, 0x5c, 0xc7, 0x8f, 0x57, 0xb5, 0xe1, 0x0d, 0x5f, 0x67, 0xae,
-	0x5c, 0x35, 0x5d, 0x0f, 0x3b, 0xe3, 0x6b, 0x1d, 0x0b, 0x1d, 0xf4, 0x68, 0x80, 0xfd, 0x78, 0xcf,
-	0x03, 0x8b, 0x05, 0x83, 0xb0, 0xa7, 0x9b, 0xee, 0xa8, 0x43, 0x3d, 0x69, 0xe2, 0x5b, 0x39, 0xb8,
-	0x6a, 0xf6, 0x3b, 0xe3, 0xed, 0x0e, 0x1f, 0x5a, 0xe2, 0xbc, 0xdf, 0xa1, 0x9c, 0xdb, 0xcc, 0x94,
-	0xfa, 0x3b, 0xe3, 0x6b, 0xd4, 0xe6, 0x03, 0x3a, 0xa3, 0x4d, 0xfb, 0x11, 0x60, 0x75, 0x8f, 0x3a,
-	0xec, 0x08, 0xfd, 0xc0, 0xc0, 0x27, 0x21, 0xfa, 0x01, 0x79, 0x0c, 0x55, 0x11, 0x87, 0xaa, 0x6c,
-	0x2a, 0x5b, 0xcd, 0xed, 0x7b, 0x7a, 0x66, 0x50, 0x4f, 0x0c, 0xca, 0xc1, 0x37, 0x66, 0x5f, 0x1f,
-	0x6f, 0xeb, 0x7c, 0x68, 0xe9, 0xc2, 0xa0, 0x9e, 0x33, 0xa8, 0x27, 0x06, 0x75, 0x23, 0xcd, 0x88,
-	0x21, 0xb5, 0x92, 0x36, 0xd4, 0x3d, 0x1c, 0x33, 0x9f, 0xb9, 0x8e, 0x5a, 0xd9, 0x54, 0xb6, 0x1a,
-	0x46, 0x3a, 0x27, 0x2a, 0x2c, 0x3b, 0xee, 0x0e, 0x35, 0x07, 0xa8, 0x2e, 0x6e, 0x2a, 0x5b, 0x75,
-	0x23, 0x99, 0x92, 0x4d, 0x68, 0x52, 0xce, 0x1f, 0xd0, 0x1e, 0xda, 0xf7, 0x71, 0xa2, 0x56, 0xe5,
-	0xc1, 0xbc, 0x48, 0x9c, 0xa5, 0x9c, 0x3f, 0xa4, 0x23, 0x54, 0x97, 0xe4, 0x6a, 0x32, 0x25, 0xeb,
-	0xd0, 0x70, 0xe8, 0x08, 0x7d, 0x4e, 0x4d, 0x54, 0xeb, 0x72, 0x2d, 0x13, 0x90, 0xef, 0x61, 0x2d,
-	0xe7, 0xf8, 0xa1, 0x1b, 0x7a, 0x26, 0xaa, 0x20, 0x43, 0xdf, 0x9f, 0x2f, 0xf4, 0x6e, 0x51, 0xad,
-	0x31, 0x6b, 0x89, 0x7c, 0x0d, 0x4b, 0x12, 0x34, 0x6a, 0x73, 0x73, 0xf1, 0x95, 0x66, 0x3b, 0x52,
-	0x4b, 0x1c, 0x58, 0xe6, 0x76, 0x68, 0x31, 0xc7, 0x57, 0x4f, 0x49, 0x0b, 0x8f, 0xe6, 0xb3, 0xb0,
-	0xe3, 0x3a, 0x47, 0xcc, 0xda, 0xa3, 0x0e, 0xb5, 0x70, 0x84, 0x4e, 0x70, 0x20, 0x95, 0x1b, 0x89,
-	0x11, 0xf2, 0x14, 0x5a, 0xc3, 0xd0, 0x0f, 0xdc, 0x11, 0x7b, 0x8a, 0xfb, 0x5c, 0x82, 0x5b, 0x3d,
-	0x2d, 0xb3, 0xf9, 0x70, 0x3e, 0xc3, 0xf7, 0x0b, 0x5a, 0x8d, 0x19, 0x3b, 0x02, 0x24, 0xc3, 0xb0,
-	0x87, 0x9f, 0xa3, 0x27, 0xd1, 0xb5, 0x12, 0x81, 0x24, 0x27, 0x8a, 0x60, 0xc4, 0xe2, 0x99, 0xaf,
-	0xae, 0x6e, 0x2e, 0x46, 0x30, 0x4a, 0x45, 0x64, 0x0b, 0x56, 0xc7, 0xe8, 0xb1, 0xa3, 0xc9, 0x21,
-	0xb3, 0x1c, 0x1a, 0x84, 0x1e, 0xaa, 0x2d, 0x09, 0xc5, 0xa2, 0x98, 0x8c, 0xe0, 0xf4, 0x00, 0xed,
-	0x91, 0x48, 0xf9, 0x8e, 0x87, 0x7d, 0x5f, 0x5d, 0x93, 0xf9, 0xdd, 0x9d, 0xff, 0x06, 0xa5, 0x3a,
-	0x63, 0x5a, 0xbb, 0x70, 0xcc, 0x71, 0x8d, 0xf8, 0xa5, 0x44, 0x6f, 0x84, 0x44, 0x8e, 0x15, 0xc4,
-	0xe4, 0x32, 0xac, 0x04, 0x1e, 0x35, 0x87, 0xcc, 0xb1, 0xf6, 0x30, 0x18, 0xb8, 0x7d, 0xf5, 0x8c,
-	0xcc, 0x44, 0x41, 0x4a, 0x4c, 0x20, 0xe8, 0xd0, 0x9e, 0x8d, 0xfd, 0x08, 0x8b, 0x8f, 0x26, 0x1c,
-	0x7d, 0xf5, 0xac, 0x8c, 0xe2, 0xba, 0x9e, 0x2b, 0x6e, 0x85, 0x02, 0xa1, 0xdf, 0x99, 0x39, 0x75,
-	0xc7, 0x09, 0xbc, 0x89, 0x51, 0xa2, 0x8e, 0x0c, 0xa1, 0x29, 0xe2, 0x48, 0xa0, 0x70, 0x4e, 0x42,
-	0xe1, 0xd3, 0xf9, 0x72, 0x74, 0x2f, 0x53, 0x68, 0xe4, 0xb5, 0xb7, 0xef, 0xc0, 0x85, 0x63, 0x7c,
-	0x23, 0x2d, 0x58, 0x1c, 0xe2, 0x44, 0xd6, 0xb4, 0x86, 0x21, 0x86, 0xe4, 0x2c, 0x2c, 0x8d, 0xa9,
-	0x1d, 0xa2, 0xac, 0x42, 0x75, 0x23, 0x9a, 0xdc, 0xac, 0xdc, 0x50, 0xb4, 0x10, 0xce, 0x3d, 0x92,
-	0xe1, 0xa6, 0x8f, 0xe9, 0x24, 0x2a, 0xa3, 0x76, 0x0f, 0xce, 0x17, 0xcd, 0xfa, 0xdc, 0x75, 0x7c,
-	0x24, 0x3a, 0x10, 0x89, 0x3e, 0x86, 0xfd, 0x6c, 0x55, 0x7a, 0x51, 0x37, 0x4a, 0x56, 0xb4, 0x1f,
-	0x2a, 0x70, 0xde, 0x40, 0xdf, 0xb5, 0xc7, 0x98, 0x40, 0xe3, 0x64, 0x8a, 0xfb, 0x57, 0xb0, 0x48,
-	0x39, 0x97, 0x19, 0x9d, 0xfb, 0x96, 0x73, 0xe5, 0xd3, 0x10, 0x5a, 0xc9, 0xfb, 0xb0, 0x46, 0x47,
-	0x3d, 0x66, 0x85, 0x6e, 0xe8, 0x27, 0x61, 0xc9, 0x3e, 0xd1, 0x30, 0x66, 0x17, 0x34, 0x13, 0x2e,
-	0xcc, 0xa4, 0x20, 0x4e, 0x67, 0xbe, 0x05, 0x29, 0x85, 0x16, 0x54, 0x6a, 0xa4, 0x72, 0x9c, 0x91,
-	0xdf, 0x14, 0x68, 0x65, 0xaf, 0x23, 0x56, 0xbf, 0x0e, 0x8d, 0x51, 0x2c, 0xf3, 0x55, 0x45, 0x96,
-	0x98, 0x4c, 0x30, 0xdd, 0x8d, 0x2a, 0xc5, 0x6e, 0x74, 0x1e, 0x6a, 0x11, 0xcf, 0x88, 0x03, 0x8b,
-	0x67, 0x53, 0x2e, 0x57, 0x0b, 0x2e, 0x6f, 0x00, 0xf8, 0x29, 0xdc, 0xd5, 0x9a, 0x5c, 0xcd, 0x49,
-	0x88, 0x06, 0xa7, 0xa2, 0xda, 0x65, 0xa0, 0x1f, 0xda, 0x81, 0xba, 0x2c, 0x77, 0x4c, 0xc9, 0x34,
-	0x17, 0x56, 0x1f, 0x30, 0x11, 0xc3, 0x91, 0x7f, 0x32, 0x60, 0xff, 0x00, 0xaa, 0xc2, 0x98, 0x08,
-	0xac, 0xe7, 0x51, 0xc7, 0x1c, 0x60, 0x92, 0xab, 0x74, 0x4e, 0x08, 0x54, 0x03, 0x6a, 0xf9, 0x6a,
-	0x45, 0xca, 0xe5, 0x58, 0xfb, 0xb9, 0x12, 0x79, 0xda, 0xe5, 0xdc, 0x7f, 0xf3, 0x84, 0xa5, 0xbc,
-	0x84, 0x2e, 0xce, 0x96, 0xd0, 0x82, 0xcb, 0xff, 0xa5, 0x84, 0xbe, 0xba, 0xaa, 0xb6, 0xdc, 0xe5,
-	0x5c, 0x38, 0x42, 0xae, 0x41, 0x95, 0x72, 0x1e, 0x25, 0xbc, 0xb9, 0x7d, 0x31, 0xef, 0x68, 0xbc,
-	0x45, 0xfc, 0x8f, 0x5d, 0x92, 0x5b, 0xdb, 0x1f, 0x42, 0x23, 0x15, 0xbd, 0xc8, 0x6c, 0x23, 0x6f,
-	0xf6, 0x9f, 0x1a, 0xbc, 0x25, 0x72, 0x7a, 0x28, 0x81, 0xdc, 0xe5, 0xfc, 0x36, 0x06, 0x94, 0xd9,
-	0xfe, 0x67, 0x21, 0x7a, 0x93, 0xd7, 0x7c, 0x75, 0x16, 0xd4, 0xa2, 0x77, 0x10, 0x57, 0xa4, 0x57,
-	0x4e, 0xe8, 0x62, 0xf5, 0x19, 0x8b, 0x5b, 0x7c, 0x3d, 0x2c, 0xae, 0x8c, 0x55, 0x55, 0x4f, 0x88,
-	0x55, 0x1d, 0x4f, 0xac, 0x73, 0x74, 0xbd, 0x36, 0x4d, 0xd7, 0x4b, 0xc8, 0xca, 0xf2, 0xcb, 0x92,
-	0x95, 0x7a, 0x29, 0x59, 0x19, 0x95, 0xbe, 0xb4, 0x86, 0x4c, 0xf7, 0x47, 0x79, 0x00, 0x1f, 0x8b,
-	0xb5, 0x79, 0x68, 0x0b, 0xfc, 0x1f, 0x68, 0xcb, 0x9f, 0x8a, 0xe8, 0xfa, 0xdc, 0xcd, 0xe2, 0x4e,
-	0x5b, 0x92, 0xa8, 0xa4, 0xa2, 0x39, 0x44, 0x7a, 0xe4, 0x98, 0x5c, 0x81, 0xaa, 0x70, 0x42, 0x36,
-	0x9a, 0xe6, 0xf6, 0x85, 0x7c, 0x0e, 0x85, 0xa7, 0x5d, 0xce, 0x0f, 0x39, 0x9a, 0x86, 0xdc, 0x44,
-	0x6e, 0x42, 0x23, 0x05, 0x46, 0x8c, 0xbc, 0xf5, 0xfc, 0x89, 0x14, 0x47, 0xc9, 0xb1, 0x6c, 0xbb,
-	0x38, 0xdb, 0x67, 0x1e, 0x9a, 0x92, 0xb4, 0x2c, 0xcd, 0x9e, 0xbd, 0x9d, 0x2c, 0xa6, 0x67, 0xd3,
-	0xed, 0xda, 0xaf, 0x0a, 0x5c, 0xca, 0x6e, 0x34, 0x81, 0xce, 0x1e, 0x06, 0xb4, 0x4f, 0x03, 0xfa,
-	0xe6, 0x1b, 0xc0, 0x65, 0x58, 0x31, 0x07, 0x68, 0x0e, 0xb3, 0xaf, 0x85, 0xe8, 0xc3, 0xb5, 0x20,
-	0xd5, 0x7e, 0xa9, 0x40, 0x33, 0x97, 0x55, 0x71, 0x21, 0xa2, 0xe9, 0x27, 0x17, 0x22, 0xc6, 0xa2,
-	0x8f, 0xcb, 0xcb, 0xbc, 0xcb, 0xec, 0xb8, 0x89, 0x34, 0x8c, 0x9c, 0x84, 0x0c, 0x01, 0x38, 0xf5,
-	0xe8, 0x08, 0x03, 0xf4, 0xc4, 0xf3, 0x17, 0xd0, 0xbf, 0x3f, 0x3f, 0x24, 0x0f, 0x12, 0x9d, 0x46,
-	0x4e, 0xbd, 0x20, 0x22, 0xd2, 0xb4, 0x1f, 0x3f, 0xfa, 0x78, 0x46, 0xbe, 0x83, 0x95, 0x23, 0x66,
-	0xe3, 0x41, 0xe6, 0x48, 0x4d, 0x3a, 0xb2, 0x3f, 0xbf, 0x23, 0x77, 0xf3, 0x7a, 0x8d, 0x82, 0x19,
-	0xed, 0x3d, 0x68, 0x15, 0x41, 0x26, 0x9c, 0x64, 0x23, 0x6a, 0xa5, 0xd9, 0x8a, 0x67, 0x1a, 0x81,
-	0x56, 0x11, 0x54, 0xda, 0x13, 0x58, 0x13, 0x46, 0x76, 0x06, 0xd4, 0x0b, 0x4e, 0x88, 0xe3, 0xdc,
-	0x82, 0x46, 0x6a, 0xb2, 0xf4, 0xc6, 0xdb, 0x50, 0x1f, 0x27, 0xdf, 0xa2, 0x11, 0xc9, 0x49, 0xe7,
-	0x5a, 0x17, 0x48, 0xde, 0xdf, 0xf8, 0x21, 0x5f, 0x81, 0x25, 0x16, 0xe0, 0x28, 0x69, 0xdd, 0xe7,
-	0x8a, 0xaf, 0x56, 0x6e, 0x37, 0xa2, 0x3d, 0xdb, 0x7f, 0x2f, 0xc1, 0x5a, 0xf6, 0x78, 0xc4, 0x5f,
-	0x66, 0x22, 0xd9, 0x87, 0xd6, 0x6e, 0xfc, 0x2b, 0x50, 0x42, 0x5d, 0xc9, 0xdb, 0xcf, 0xf9, 0xdc,
-	0x6b, 0xaf, 0x97, 0x2f, 0x46, 0x1e, 0x69, 0x0b, 0xe4, 0x0b, 0x58, 0x99, 0xfe, 0x6e, 0x21, 0x97,
-	0xf2, 0x27, 0x4a, 0x3f, 0xa5, 0xda, 0xda, 0xf3, 0xb6, 0xa4, 0xaa, 0x1f, 0xc3, 0x6a, 0x81, 0xc4,
-	0x13, 0x6d, 0xba, 0xd8, 0x97, 0x7d, 0xe4, 0xb4, 0xdf, 0x79, 0xee, 0x9e, 0x54, 0xfb, 0x2d, 0xa8,
-	0x27, 0xa4, 0x77, 0x3a, 0x03, 0x05, 0x2a, 0xdc, 0x6e, 0x4d, 0xeb, 0x3b, 0xf2, 0xb5, 0x05, 0xf2,
-	0x71, 0x74, 0x58, 0x90, 0xa2, 0xd9, 0xc3, 0x39, 0xaa, 0xd7, 0x3e, 0x53, 0x42, 0xaf, 0x64, 0x68,
-	0xa7, 0x77, 0x31, 0xc8, 0x6a, 0x35, 0x79, 0xf7, 0xa5, 0xba, 0x58, 0x5b, 0x2b, 0x6e, 0x9b, 0x2d,
-	0xf7, 0xda, 0x02, 0xf9, 0x49, 0x81, 0x33, 0xbb, 0x18, 0x14, 0x0b, 0x26, 0xb9, 0x5a, 0x6e, 0xe4,
-	0x98, 0xc2, 0xda, 0x7e, 0x38, 0xef, 0x8b, 0x98, 0x56, 0xab, 0x2d, 0x90, 0x03, 0x19, 0x76, 0x86,
-	0x6c, 0x72, 0xb1, 0x14, 0xc2, 0x69, 0xf6, 0x36, 0x8e, 0x5b, 0x4e, 0x42, 0xfd, 0xa4, 0xfb, 0xfb,
-	0xb3, 0x0d, 0xe5, 0x8f, 0x67, 0x1b, 0xca, 0x5f, 0xcf, 0x36, 0x94, 0x2f, 0xaf, 0xbf, 0xe0, 0xe7,
-	0xd1, 0xdc, 0x2f, 0xb9, 0x94, 0x33, 0xd3, 0x66, 0xe8, 0x04, 0xbd, 0x9a, 0xfc, 0x31, 0xf4, 0xfa,
-	0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x28, 0x0e, 0x46, 0x8e, 0xe8, 0x15, 0x00, 0x00,
+	// 1419 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdd, 0x6f, 0x1b, 0xc5,
+	0x16, 0xcf, 0xda, 0x8e, 0x63, 0x1f, 0xb7, 0x89, 0x33, 0xfd, 0xda, 0xeb, 0x9b, 0x46, 0xe9, 0x5e,
+	0xdd, 0x2a, 0xba, 0xbd, 0xb5, 0xd5, 0x54, 0x02, 0xd4, 0x0a, 0x24, 0x93, 0xb6, 0x29, 0x6a, 0xd3,
+	0x84, 0x4d, 0x85, 0x04, 0x54, 0xa0, 0xf1, 0xfa, 0x64, 0x3d, 0x78, 0x3f, 0xa6, 0xfb, 0x61, 0xe4,
+	0x4a, 0x3c, 0xf0, 0x2f, 0xf0, 0xc0, 0xbf, 0xc2, 0x23, 0x4f, 0x20, 0x1e, 0xe1, 0x3f, 0x40, 0xe5,
+	0x81, 0x7f, 0x03, 0xcd, 0xec, 0xa7, 0xd7, 0x9b, 0xb6, 0xc8, 0x6d, 0x2a, 0x5e, 0x92, 0x99, 0x33,
+	0x33, 0xe7, 0x6b, 0x7e, 0x73, 0xce, 0x6f, 0x0d, 0x57, 0x3d, 0xe4, 0xae, 0x8f, 0xde, 0x04, 0xbd,
+	0x9e, 0x1c, 0xb2, 0xc0, 0xf5, 0xa6, 0xb9, 0x61, 0x97, 0x7b, 0x6e, 0xe0, 0x12, 0xc8, 0x24, 0x9d,
+	0x87, 0x26, 0x0b, 0x46, 0xe1, 0xa0, 0x6b, 0xb8, 0x76, 0x8f, 0x7a, 0xa6, 0xcb, 0x3d, 0xf7, 0x2b,
+	0x39, 0xb8, 0x6e, 0x0c, 0x7b, 0x93, 0x9d, 0x1e, 0x1f, 0x9b, 0x3d, 0xca, 0x99, 0xdf, 0xa3, 0x9c,
+	0x5b, 0xcc, 0xa0, 0x01, 0x73, 0x9d, 0xde, 0xe4, 0x06, 0xb5, 0xf8, 0x88, 0xde, 0xe8, 0x99, 0xe8,
+	0xa0, 0x47, 0x03, 0x1c, 0x46, 0x9a, 0xb5, 0xef, 0x00, 0xd6, 0xf6, 0xa9, 0xc3, 0x8e, 0xd1, 0x0f,
+	0x74, 0x7c, 0x1a, 0xa2, 0x1f, 0x90, 0x27, 0x50, 0x13, 0xf6, 0x54, 0x65, 0x4b, 0xd9, 0x6e, 0xed,
+	0xdc, 0xef, 0x66, 0x06, 0xbb, 0x89, 0x41, 0x39, 0xf8, 0xd2, 0x18, 0x76, 0x27, 0x3b, 0x5d, 0x3e,
+	0x36, 0xbb, 0xc2, 0x60, 0x37, 0x67, 0xb0, 0x9b, 0x18, 0xec, 0xea, 0xa9, 0xe7, 0xba, 0xd4, 0x4a,
+	0x3a, 0xd0, 0xf0, 0x70, 0xc2, 0x7c, 0xe6, 0x3a, 0x6a, 0x65, 0x4b, 0xd9, 0x6e, 0xea, 0xe9, 0x9c,
+	0xa8, 0xb0, 0xe2, 0xb8, 0xbb, 0xd4, 0x18, 0xa1, 0x5a, 0xdd, 0x52, 0xb6, 0x1b, 0x7a, 0x32, 0x25,
+	0x5b, 0xd0, 0xa2, 0x9c, 0x3f, 0xa4, 0x03, 0xb4, 0x1e, 0xe0, 0x54, 0xad, 0xc9, 0x83, 0x79, 0x91,
+	0x38, 0x4b, 0x39, 0x7f, 0x44, 0x6d, 0x54, 0x97, 0xe5, 0x6a, 0x32, 0x25, 0x1b, 0xd0, 0x74, 0xa8,
+	0x8d, 0x3e, 0xa7, 0x06, 0xaa, 0x0d, 0xb9, 0x96, 0x09, 0xc8, 0x37, 0xb0, 0x9e, 0x73, 0xfc, 0xc8,
+	0x0d, 0x3d, 0x03, 0x55, 0x90, 0xa1, 0x1f, 0x2c, 0x16, 0x7a, 0xbf, 0xa8, 0x56, 0x9f, 0xb7, 0x44,
+	0xbe, 0x80, 0x65, 0x79, 0xb9, 0x6a, 0x6b, 0xab, 0xfa, 0x5a, 0xb3, 0x1d, 0xa9, 0x25, 0x0e, 0xac,
+	0x70, 0x2b, 0x34, 0x99, 0xe3, 0xab, 0x67, 0xa4, 0x85, 0xc7, 0x8b, 0x59, 0xd8, 0x75, 0x9d, 0x63,
+	0x66, 0xee, 0x53, 0x87, 0x9a, 0x68, 0xa3, 0x13, 0x1c, 0x4a, 0xe5, 0x7a, 0x62, 0x84, 0x3c, 0x83,
+	0xf6, 0x38, 0xf4, 0x03, 0xd7, 0x66, 0xcf, 0xf0, 0x80, 0x8b, 0xb3, 0xbe, 0x7a, 0x56, 0x66, 0xf3,
+	0xd1, 0x62, 0x86, 0x1f, 0x14, 0xb4, 0xea, 0x73, 0x76, 0x04, 0x48, 0xc6, 0xe1, 0x00, 0x3f, 0x41,
+	0x4f, 0xa2, 0x6b, 0x35, 0x02, 0x49, 0x4e, 0x14, 0xc1, 0x88, 0xc5, 0x33, 0x5f, 0x5d, 0xdb, 0xaa,
+	0x46, 0x30, 0x4a, 0x45, 0x64, 0x1b, 0xd6, 0x26, 0xe8, 0xb1, 0xe3, 0xe9, 0x11, 0x33, 0x1d, 0x1a,
+	0x84, 0x1e, 0xaa, 0x6d, 0x09, 0xc5, 0xa2, 0x98, 0xd8, 0x70, 0x76, 0x84, 0x96, 0x2d, 0x52, 0xbe,
+	0xeb, 0xe1, 0xd0, 0x57, 0xd7, 0x65, 0x7e, 0xf7, 0x16, 0xbf, 0x41, 0xa9, 0x4e, 0x9f, 0xd5, 0x2e,
+	0x1c, 0x73, 0x5c, 0x3d, 0x7e, 0x29, 0xd1, 0x1b, 0x21, 0x91, 0x63, 0x05, 0x31, 0xb9, 0x0a, 0xab,
+	0x81, 0x47, 0x8d, 0x31, 0x73, 0xcc, 0x7d, 0x0c, 0x46, 0xee, 0x50, 0x3d, 0x27, 0x33, 0x51, 0x90,
+	0x12, 0x03, 0x08, 0x3a, 0x74, 0x60, 0xe1, 0x30, 0xc2, 0xe2, 0xe3, 0x29, 0x47, 0x5f, 0x3d, 0x2f,
+	0xa3, 0xb8, 0xd9, 0xcd, 0x15, 0xa1, 0x42, 0x81, 0xe8, 0xde, 0x9d, 0x3b, 0x75, 0xd7, 0x09, 0xbc,
+	0xa9, 0x5e, 0xa2, 0x8e, 0x8c, 0xa1, 0x25, 0xe2, 0x48, 0xa0, 0x70, 0x41, 0x42, 0xe1, 0xa3, 0xc5,
+	0x72, 0x74, 0x3f, 0x53, 0xa8, 0xe7, 0xb5, 0x77, 0xee, 0xc2, 0xa5, 0x13, 0x7c, 0x23, 0x6d, 0xa8,
+	0x8e, 0x71, 0x2a, 0x6b, 0x5a, 0x53, 0x17, 0x43, 0x72, 0x1e, 0x96, 0x27, 0xd4, 0x0a, 0x51, 0x56,
+	0xa1, 0x86, 0x1e, 0x4d, 0x6e, 0x55, 0xde, 0x53, 0xb4, 0x10, 0x2e, 0x3c, 0x96, 0xe1, 0xa6, 0x8f,
+	0xe9, 0x34, 0x2a, 0xa3, 0x76, 0x1f, 0x2e, 0x16, 0xcd, 0xfa, 0xdc, 0x75, 0x7c, 0x24, 0x5d, 0x20,
+	0x12, 0x7d, 0x0c, 0x87, 0xd9, 0xaa, 0xf4, 0xa2, 0xa1, 0x97, 0xac, 0x68, 0xdf, 0x56, 0xe0, 0xa2,
+	0x8e, 0xbe, 0x6b, 0x4d, 0x30, 0x81, 0xc6, 0xe9, 0x14, 0xf7, 0xcf, 0xa1, 0x4a, 0x39, 0x97, 0x19,
+	0x5d, 0xf8, 0x96, 0x73, 0xe5, 0x53, 0x17, 0x5a, 0xc9, 0xff, 0x61, 0x9d, 0xda, 0x03, 0x66, 0x86,
+	0x6e, 0xe8, 0x27, 0x61, 0xc9, 0x3e, 0xd1, 0xd4, 0xe7, 0x17, 0x34, 0x03, 0x2e, 0xcd, 0xa5, 0x20,
+	0x4e, 0x67, 0xbe, 0x05, 0x29, 0x85, 0x16, 0x54, 0x6a, 0xa4, 0x72, 0x92, 0x91, 0x9f, 0x15, 0x68,
+	0x67, 0xaf, 0x23, 0x56, 0xbf, 0x01, 0x4d, 0x3b, 0x96, 0xf9, 0xaa, 0x22, 0x4b, 0x4c, 0x26, 0x98,
+	0xed, 0x46, 0x95, 0x62, 0x37, 0xba, 0x08, 0xf5, 0x88, 0x0f, 0xc4, 0x81, 0xc5, 0xb3, 0x19, 0x97,
+	0x6b, 0x05, 0x97, 0x37, 0x01, 0xfc, 0x14, 0xee, 0x6a, 0x5d, 0xae, 0xe6, 0x24, 0x44, 0x83, 0x33,
+	0x51, 0xed, 0xd2, 0xd1, 0x0f, 0xad, 0x40, 0x5d, 0x91, 0x3b, 0x66, 0x64, 0x9a, 0x0b, 0x6b, 0x0f,
+	0x99, 0x88, 0xe1, 0xd8, 0x3f, 0x1d, 0xb0, 0xbf, 0x03, 0x35, 0x61, 0x4c, 0x04, 0x36, 0xf0, 0xa8,
+	0x63, 0x8c, 0x30, 0xc9, 0x55, 0x3a, 0x27, 0x04, 0x6a, 0x01, 0x35, 0x7d, 0xb5, 0x22, 0xe5, 0x72,
+	0xac, 0xfd, 0x50, 0x89, 0x3c, 0xed, 0x73, 0xee, 0xbf, 0x7d, 0xc2, 0x52, 0x5e, 0x42, 0xab, 0xf3,
+	0x25, 0xb4, 0xe0, 0xf2, 0xdf, 0x29, 0xa1, 0xaf, 0xaf, 0xaa, 0xad, 0xf4, 0x39, 0x17, 0x8e, 0x90,
+	0x1b, 0x50, 0xa3, 0x9c, 0x47, 0x09, 0x6f, 0xed, 0x5c, 0xce, 0x3b, 0x1a, 0x6f, 0x11, 0xff, 0x63,
+	0x97, 0xe4, 0xd6, 0xce, 0xbb, 0xd0, 0x4c, 0x45, 0x2f, 0x33, 0xdb, 0xcc, 0x9b, 0xfd, 0xb3, 0x0e,
+	0xff, 0x12, 0x39, 0x3d, 0x92, 0x40, 0xee, 0x73, 0x7e, 0x07, 0x03, 0xca, 0x2c, 0xff, 0xe3, 0x10,
+	0xbd, 0xe9, 0x1b, 0xbe, 0x3a, 0x13, 0xea, 0xd1, 0x3b, 0x88, 0x2b, 0xd2, 0x6b, 0x27, 0x74, 0xb1,
+	0xfa, 0x8c, 0xc5, 0x55, 0xdf, 0x0c, 0x8b, 0x2b, 0x63, 0x55, 0xb5, 0x53, 0x62, 0x55, 0x27, 0x13,
+	0xeb, 0x1c, 0x5d, 0xaf, 0xcf, 0xd2, 0xf5, 0x12, 0xb2, 0xb2, 0xf2, 0xaa, 0x64, 0xa5, 0x51, 0x4a,
+	0x56, 0xec, 0xd2, 0x97, 0xd6, 0x94, 0xe9, 0x7e, 0x3f, 0x0f, 0xe0, 0x13, 0xb1, 0xb6, 0x08, 0x6d,
+	0x81, 0x7f, 0x02, 0x6d, 0xf9, 0x4d, 0x11, 0x5d, 0x9f, 0xbb, 0x59, 0xdc, 0x69, 0x4b, 0x12, 0x95,
+	0x54, 0x34, 0x87, 0x48, 0x8f, 0x1c, 0x93, 0x6b, 0x50, 0x13, 0x4e, 0xc8, 0x46, 0xd3, 0xda, 0xb9,
+	0x94, 0xcf, 0xa1, 0xf0, 0xb4, 0xcf, 0xf9, 0x11, 0x47, 0x43, 0x97, 0x9b, 0xc8, 0x2d, 0x68, 0xa6,
+	0xc0, 0x88, 0x91, 0xb7, 0x91, 0x3f, 0x91, 0xe2, 0x28, 0x39, 0x96, 0x6d, 0x17, 0x67, 0x87, 0xcc,
+	0x43, 0x43, 0x92, 0x96, 0xe5, 0xf9, 0xb3, 0x77, 0x92, 0xc5, 0xf4, 0x6c, 0xba, 0x5d, 0xfb, 0x49,
+	0x81, 0x2b, 0xd9, 0x8d, 0x26, 0xd0, 0xd9, 0xc7, 0x80, 0x0e, 0x69, 0x40, 0xdf, 0x7e, 0x03, 0xb8,
+	0x0a, 0xab, 0xc6, 0x08, 0x8d, 0x71, 0xf6, 0xb5, 0x10, 0x7d, 0xb8, 0x16, 0xa4, 0xda, 0x8f, 0x15,
+	0x68, 0xe5, 0xb2, 0x2a, 0x2e, 0x44, 0x34, 0xfd, 0xe4, 0x42, 0xc4, 0x58, 0xf4, 0x71, 0x79, 0x99,
+	0xf7, 0x98, 0x15, 0x37, 0x91, 0xa6, 0x9e, 0x93, 0x90, 0x31, 0x00, 0xa7, 0x1e, 0xb5, 0x31, 0x40,
+	0x4f, 0x3c, 0x7f, 0x01, 0xfd, 0x07, 0x8b, 0x43, 0xf2, 0x30, 0xd1, 0xa9, 0xe7, 0xd4, 0x0b, 0x22,
+	0x22, 0x4d, 0xfb, 0xf1, 0xa3, 0x8f, 0x67, 0xe4, 0x6b, 0x58, 0x3d, 0x66, 0x16, 0x1e, 0x66, 0x8e,
+	0xd4, 0xa5, 0x23, 0x07, 0x8b, 0x3b, 0x72, 0x2f, 0xaf, 0x57, 0x2f, 0x98, 0xd1, 0xfe, 0x07, 0xed,
+	0x22, 0xc8, 0x84, 0x93, 0xcc, 0xa6, 0x66, 0x9a, 0xad, 0x78, 0xa6, 0x11, 0x68, 0x17, 0x41, 0xa5,
+	0x3d, 0x85, 0x75, 0x61, 0x64, 0x77, 0x44, 0xbd, 0xe0, 0x94, 0x38, 0xce, 0x6d, 0x68, 0xa6, 0x26,
+	0x4b, 0x6f, 0xbc, 0x03, 0x8d, 0x49, 0xf2, 0x2d, 0x1a, 0x91, 0x9c, 0x74, 0xae, 0xf5, 0x81, 0xe4,
+	0xfd, 0x8d, 0x1f, 0xf2, 0x35, 0x58, 0x66, 0x01, 0xda, 0x49, 0xeb, 0xbe, 0x50, 0x7c, 0xb5, 0x72,
+	0xbb, 0x1e, 0xed, 0xd9, 0xf9, 0x63, 0x19, 0xd6, 0xb3, 0xc7, 0x23, 0xfe, 0x32, 0x03, 0xc9, 0x01,
+	0xb4, 0xf7, 0xe2, 0x5f, 0x81, 0x12, 0xea, 0x4a, 0xfe, 0xfd, 0x82, 0xcf, 0xbd, 0xce, 0x46, 0xf9,
+	0x62, 0xe4, 0x91, 0xb6, 0x44, 0x3e, 0x85, 0xd5, 0xd9, 0xef, 0x16, 0x72, 0x25, 0x7f, 0xa2, 0xf4,
+	0x53, 0xaa, 0xa3, 0xbd, 0x68, 0x4b, 0xaa, 0xfa, 0x09, 0xac, 0x15, 0x48, 0x3c, 0xd1, 0x66, 0x8b,
+	0x7d, 0xd9, 0x47, 0x4e, 0xe7, 0x3f, 0x2f, 0xdc, 0x93, 0x6a, 0xbf, 0x0d, 0x8d, 0x84, 0xf4, 0xce,
+	0x66, 0xa0, 0x40, 0x85, 0x3b, 0xed, 0x59, 0x7d, 0xc7, 0xbe, 0xb6, 0x44, 0x3e, 0x88, 0x0e, 0x0b,
+	0x52, 0x34, 0x7f, 0x38, 0x47, 0xf5, 0x3a, 0xe7, 0x4a, 0xe8, 0x95, 0x0c, 0xed, 0xec, 0x1e, 0x06,
+	0x59, 0xad, 0x26, 0xff, 0x7d, 0xa5, 0x2e, 0xd6, 0xd1, 0x8a, 0xdb, 0xe6, 0xcb, 0xbd, 0xb6, 0x44,
+	0xbe, 0x57, 0xe0, 0xdc, 0x1e, 0x06, 0xc5, 0x82, 0x49, 0xae, 0x97, 0x1b, 0x39, 0xa1, 0xb0, 0x76,
+	0x1e, 0x2d, 0xfa, 0x22, 0x66, 0xd5, 0x6a, 0x4b, 0xe4, 0x50, 0x86, 0x9d, 0x21, 0x9b, 0x5c, 0x2e,
+	0x85, 0x70, 0x9a, 0xbd, 0xcd, 0x93, 0x96, 0x93, 0x50, 0x3f, 0xec, 0xff, 0xf2, 0x7c, 0x53, 0xf9,
+	0xf5, 0xf9, 0xa6, 0xf2, 0xfb, 0xf3, 0x4d, 0xe5, 0xb3, 0x9b, 0x2f, 0xf9, 0x79, 0x34, 0xf7, 0x8b,
+	0x2b, 0xe5, 0xcc, 0xb0, 0x18, 0x3a, 0xc1, 0xa0, 0x2e, 0x7f, 0x0c, 0xbd, 0xf9, 0x57, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x65, 0x04, 0x2b, 0x5c, 0x90, 0x15, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto
index a88af1c63..9714226e3 100644
--- a/reposerver/repository/repository.proto
+++ b/reposerver/repository/repository.proto
@@ -3,9 +3,6 @@ option go_package = "github.com/argoproj/argo-cd/v2/reposerver/apiclient";
 
 package repository;
 
-import "gogoproto/gogo.proto";
-import "google/api/annotations.proto";
-import "k8s.io/api/core/v1/generated.proto";
 import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto";
 
 // ManifestRequest is a query for manifest generation.
diff --git a/server/account/account.proto b/server/account/account.proto
index bbb858979..1bd6543d5 100644
--- a/server/account/account.proto
+++ b/server/account/account.proto
@@ -7,7 +7,6 @@ option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/account";
 
 package account;
 
-import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 
 message UpdatePasswordRequest {
diff --git a/server/certificate/certificate.proto b/server/certificate/certificate.proto
index c97e770ab..7ffad3ef4 100644
--- a/server/certificate/certificate.proto
+++ b/server/certificate/certificate.proto
@@ -7,7 +7,6 @@ option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate";
 // resources.
 package certificate;
 
-import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto";
 
diff --git a/server/cluster/cluster.proto b/server/cluster/cluster.proto
index 5c05bc4c5..741d9618f 100644
--- a/server/cluster/cluster.proto
+++ b/server/cluster/cluster.proto
@@ -6,9 +6,7 @@ option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster";
 // Cluster Service API performs CRUD actions against cluster resources 
 package cluster;
 
-import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "k8s.io/api/core/v1/generated.proto";
 import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto";
 
 // ClusterID holds a cluster server URL or cluster name
diff --git a/server/gpgkey/gpgkey.proto b/server/gpgkey/gpgkey.proto
index b743c4431..6309f7dc4 100644
--- a/server/gpgkey/gpgkey.proto
+++ b/server/gpgkey/gpgkey.proto
@@ -6,7 +6,6 @@ option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey";
 // GPG public key API performs CRUD actions against GnuPGPublicKey resources
 package gpgkey;
 
-import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto";
 
diff --git a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss
index 8e48879d1..8792f7194 100644
--- a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss
+++ b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.scss
@@ -1,3 +1,5 @@
+@import 'node_modules/argo-ui/src/styles/config';
+
 .pod-logs-viewer {
     height: 90%;
     font-size: 14px;
@@ -156,14 +158,19 @@
 
 .copySuccess {
     // ARGO_SUCCESS_COLOR
-    background-color: #18BE94 !important;
+    background-color: #18be94 !important;
 }
 .copyFailure {
     // ARGO_FAILED_COLOR
-    background-color: #E96D76 !important;
+    background-color: #e96d76 !important;
 }
 .copyStandard {
-    background-color: #6D7F8B !important;
+    background-color: #6d7f8b !important;
+}
+
+.container-item {
+    font-size: 0.9em;
+    color: $argo-color-teal-5;
 }
 
 code {
@@ -173,4 +180,4 @@ code {
     font-family: inherit;
     font-weight: inherit;
     color: inherit;
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx
index 8b05bf147..ccbe89593 100644
--- a/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx
+++ b/ui/src/app/applications/components/pod-logs-viewer/pod-logs-viewer.tsx
@@ -24,6 +24,8 @@ export interface PodLogsProps {
     page: {number: number; untilTimes: string[]};
     timestamp?: string;
     setPage: (pageData: {number: number; untilTimes: string[]}) => void;
+    containerGroups?: any[];
+    onClickContainer?: (group: any, i: number) => any;
 }
 
 export const PodsLogsViewer = (props: PodLogsProps & {fullscreen?: boolean}) => {
@@ -42,6 +44,30 @@ export const PodsLogsViewer = (props: PodLogsProps & {fullscreen?: boolean}) =>
     const [viewTimestamps, setViewTimestamps] = useState(false);
     const [showPreviousLogs, setPreviousLogs] = useState(false);
 
+    const containerItems: {title: any; action: () => any}[] = [];
+    if (props.containerGroups?.length > 0) {
+        props.containerGroups.forEach(group => {
+            containerItems.push({
+                title: group.offset === 0 ? 'CONTAINER' : 'INIT CONTAINER',
+                action: null
+            });
+
+            group.containers.forEach((container: any, index: number) => {
+                const title = (
+                    <div className='d-inline-block'>
+                        <i className={`fa fa-angle-right ${container.name === props.containerName ? '' : 'invisible'}`} />
+                        <span title={container.name} className='container-item'>
+                            {container.name.toUpperCase()}
+                        </span>
+                    </div>
+                );
+                containerItems.push({
+                    title,
+                    action: () => (container.name === props.containerName ? {} : props.onClickContainer(group, index))
+                });
+            });
+        });
+    }
     interface FilterData {
         literal: string;
         inverse: boolean;
@@ -148,6 +174,18 @@ export const PodsLogsViewer = (props: PodLogsProps & {fullscreen?: boolean}) =>
                                 <i className='fa fa-download' />
                             </button>
                         </Tooltip>
+                        {props.containerGroups?.length > 0 && (
+                            <DropDownMenu
+                                anchor={() => (
+                                    <Tooltip content='Containers'>
+                                        <button className='argo-button argo-button--base'>
+                                            <i className='fa fa-stream' />
+                                        </button>
+                                    </Tooltip>
+                                )}
+                                items={containerItems}
+                            />
+                        )}
                         <Tooltip content='Follow'>
                             <button
                                 className={classNames(`argo-button argo-button--base${prefs.appDetails.followLogs && page.number === 0 ? '' : '-o'}`, {
diff --git a/ui/src/app/applications/components/resource-details/resource-details.tsx b/ui/src/app/applications/components/resource-details/resource-details.tsx
index 839151e01..838523d42 100644
--- a/ui/src/app/applications/components/resource-details/resource-details.tsx
+++ b/ui/src/app/applications/components/resource-details/resource-details.tsx
@@ -66,13 +66,18 @@ export const ResourceDetails = (props: ResourceDetailsProps) => {
                     offset: 0,
                     title: 'CONTAINERS',
                     containers: podState.spec.containers || []
-                },
-                {
+                }
+            ];
+            if (podState.spec.initContainers?.length > 0) {
+                containerGroups.push({
                     offset: (podState.spec.containers || []).length,
                     title: 'INIT CONTAINERS',
                     containers: podState.spec.initContainers || []
-                }
-            ];
+                });
+            }
+
+            const onClickContainer = (group: any, i: number) => SelectNode(selectedNodeKey, group.offset + i, 'logs', appContext);
+
             tabs = tabs.concat([
                 {
                     key: 'logs',
@@ -80,37 +85,19 @@ export const ResourceDetails = (props: ResourceDetailsProps) => {
                     title: 'LOGS',
                     content: (
                         <div className='application-details__tab-content-full-height'>
-                            <div className='row'>
-                                <div className='columns small-3 medium-2'>
-                                    {containerGroups.map(group => (
-                                        <div key={group.title} style={{marginBottom: '1em'}}>
-                                            {group.containers.length > 0 && <p>{group.title}</p>}
-                                            {group.containers.map((container: any, i: number) => (
-                                                <div
-                                                    className='application-details__container'
-                                                    key={container.name}
-                                                    onClick={() => SelectNode(selectedNodeKey, group.offset + i, 'logs', appContext)}>
-                                                    {group.offset + i === selectedNodeInfo.container && <i className='fa fa-angle-right' />}
-                                                    <span title={container.name}>{container.name}</span>
-                                                </div>
-                                            ))}
-                                        </div>
-                                    ))}
-                                </div>
-                                <div className='columns small-9 medium-10'>
-                                    <PodsLogsViewer
-                                        podName={(state.kind === 'Pod' && state.metadata.name) || ''}
-                                        group={node.group}
-                                        kind={node.kind}
-                                        name={node.name}
-                                        namespace={podState.metadata.namespace}
-                                        applicationName={application.metadata.name}
-                                        containerName={AppUtils.getContainerName(podState, selectedNodeInfo.container)}
-                                        page={{number: page, untilTimes}}
-                                        setPage={pageData => appContext.navigation.goto('.', {page: pageData.number, untilTimes: pageData.untilTimes.join(',')})}
-                                    />
-                                </div>
-                            </div>
+                            <PodsLogsViewer
+                                podName={(state.kind === 'Pod' && state.metadata.name) || ''}
+                                group={node.group}
+                                kind={node.kind}
+                                name={node.name}
+                                namespace={podState.metadata.namespace}
+                                applicationName={application.metadata.name}
+                                containerName={AppUtils.getContainerName(podState, selectedNodeInfo.container)}
+                                page={{number: page, untilTimes}}
+                                setPage={pageData => appContext.navigation.goto('.', {page: pageData.number, untilTimes: pageData.untilTimes.join(',')})}
+                                containerGroups={containerGroups}
+                                onClickContainer={onClickContainer}
+                            />
                         </div>
                     )
                 }
diff --git a/util/helm/client.go b/util/helm/client.go
index 6f7ccf28e..5bb8721d0 100644
--- a/util/helm/client.go
+++ b/util/helm/client.go
@@ -278,13 +278,12 @@ func (c *nativeHelmChart) TestHelmOCI() (bool, error) {
 }
 
 func (c *nativeHelmChart) loadRepoIndex() ([]byte, error) {
-	repoURL, err := url.Parse(c.repoURL)
+	indexURL, err := getIndexURL(c.repoURL)
 	if err != nil {
 		return nil, err
 	}
-	repoURL.Path = path.Join(repoURL.Path, "index.yaml")
 
-	req, err := http.NewRequest("GET", repoURL.String(), nil)
+	req, err := http.NewRequest("GET", indexURL, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -371,3 +370,14 @@ func IsHelmOciRepo(repoURL string) bool {
 	// the URL parser treat hostname as either path or opaque if scheme is not specified, so hostname must be empty
 	return err == nil && parsed.Host == ""
 }
+
+func getIndexURL(rawURL string) (string, error) {
+	indexFile := "index.yaml"
+	repoURL, err := url.Parse(rawURL)
+	if err != nil {
+		return "", err
+	}
+	repoURL.Path = path.Join(repoURL.Path, indexFile)
+	repoURL.RawPath = path.Join(repoURL.RawPath, indexFile)
+	return repoURL.String(), nil
+}


Test patch:
diff --git a/util/helm/client_test.go b/util/helm/client_test.go
index 8e64e9c93..04bcd4a90 100644
--- a/util/helm/client_test.go
+++ b/util/helm/client_test.go
@@ -2,6 +2,7 @@ package helm
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"testing"
 
@@ -120,3 +121,27 @@ func TestIsHelmOciRepo(t *testing.T) {
 	assert.False(t, IsHelmOciRepo("https://demo.goharbor.io"))
 	assert.False(t, IsHelmOciRepo("https://demo.goharbor.io:8080"))
 }
+
+func TestGetIndexURL(t *testing.T) {
+	urlTemplate := `https://gitlab.com/projects/%s/packages/helm/stable`
+	t.Run("URL without escaped characters", func(t *testing.T) {
+		rawURL := fmt.Sprintf(urlTemplate, "232323982")
+		want := rawURL + "/index.yaml"
+		got, err := getIndexURL(rawURL)
+		assert.Equal(t, want, got)
+		assert.NoError(t, err)
+	})
+	t.Run("URL with escaped characters", func(t *testing.T) {
+		rawURL := fmt.Sprintf(urlTemplate, "mygroup%2Fmyproject")
+		want := rawURL + "/index.yaml"
+		got, err := getIndexURL(rawURL)
+		assert.Equal(t, want, got)
+		assert.NoError(t, err)
+	})
+	t.Run("URL with invalid escaped characters", func(t *testing.T) {
+		rawURL := fmt.Sprintf(urlTemplate, "mygroup%**myproject")
+		got, err := getIndexURL(rawURL)
+		assert.Equal(t, "", got)
+		assert.Error(t, err)
+	})
+}