Repository: argoproj/argo-cd
Pull request #8039 (2021-12-27 20:55:57)

[Snyk] Security upgrade node-sass from 6.0.1 to 7.0.1
<h3>Snyk has created this PR to fix one or more vulnerable packages in the `yarn` dependencies of this project.</h3>

![merge advice](https://app.snyk.io/badges/merge-advice/?package_manager=yarn&package_name=node-sass&from_version=6.0.1&to_version=7.0.1&pr_id=3f85c165-d08c-4821-80fc-91acf669d9cf&visibility=true&has_feature_flag=false)


#### Changes included in this PR

- Changes to the following files to upgrade the vulnerable dependencies to a fixed version:
    - ui/package.json
    - ui/yarn.lock



#### Vulnerabilities that will be fixed
##### With an upgrade:
Severity                   | Priority Score (*)                   | Issue                   | Breaking Change                   | Exploit Maturity
:-------------------------:|-------------------------|:-------------------------|:-------------------------|:-------------------------
![high severity](https://res.cloudinary.com/snyk/image/upload/w_20,h_20/v1561977819/icon/h.png "high severity")  |  **696/1000**  <br/> **Why?** Proof of Concept exploit, Has a fix available, CVSS 7.5  | Regular Expression Denial of Service (ReDoS) <br/>[SNYK-JS-ANSIREGEX-1583908](https://snyk.io/vuln/SNYK-JS-ANSIREGEX-1583908) |  Yes  | Proof of Concept 

(*) Note that the real score may have changed since the PR was raised.











Check the changes in this PR to ensure they won't cause issues with your project.



------------



**Note:** *You are seeing this because you or someone else with access to this repository has authorized Snyk to open fix PRs.*

For more information:  <img src="https://api.segment.io/v1/pixel/track?data=eyJ3cml0ZUtleSI6InJyWmxZcEdHY2RyTHZsb0lYd0dUcVg4WkFRTnNCOUEwIiwiYW5vbnltb3VzSWQiOiIzZjg1YzE2NS1kMDhjLTQ4MjEtODBmYy05MWFjZjY2OWQ5Y2YiLCJldmVudCI6IlBSIHZpZXdlZCIsInByb3BlcnRpZXMiOnsicHJJZCI6IjNmODVjMTY1LWQwOGMtNDgyMS04MGZjLTkxYWNmNjY5ZDljZiJ9fQ==" width="0" height="0"/>
🧐 [View latest project report](https://app.snyk.io/org/argoproj/project/e257be49-1bf5-455e-a11b-cdab3dbef067?utm_source&#x3D;github&amp;utm_medium&#x3D;referral&amp;page&#x3D;fix-pr)

🛠 [Adjust project settings](https://app.snyk.io/org/argoproj/project/e257be49-1bf5-455e-a11b-cdab3dbef067?utm_source&#x3D;github&amp;utm_medium&#x3D;referral&amp;page&#x3D;fix-pr/settings)

📚 [Read more about Snyk's upgrade and patch logic](https://support.snyk.io/hc/en-us/articles/360003891078-Snyk-patches-to-fix-vulnerabilities)

[//]: # (snyk:metadata:{"prId":"3f85c165-d08c-4821-80fc-91acf669d9cf","prPublicId":"3f85c165-d08c-4821-80fc-91acf669d9cf","dependencies":[{"name":"node-sass","from":"6.0.1","to":"7.0.1"}],"packageManager":"yarn","projectPublicId":"e257be49-1bf5-455e-a11b-cdab3dbef067","projectUrl":"https://app.snyk.io/org/argoproj/project/e257be49-1bf5-455e-a11b-cdab3dbef067?utm_source=github&utm_medium=referral&page=fix-pr","type":"auto","patch":[],"vulns":["SNYK-JS-ANSIREGEX-1583908"],"upgrade":["SNYK-JS-ANSIREGEX-1583908"],"isBreakingChange":true,"env":"prod","prType":"fix","templateVariants":["updated-fix-title","priorityScore","merge-advice-badge-shown"],"priorityScoreList":[696]})


codecov[bot]: # [Codecov](https://codecov.io/gh/argoproj/argo-cd/pull/8039?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) Report
> Merging [#8039](https://codecov.io/gh/argoproj/argo-cd/pull/8039?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) (956284a) into [master](https://codecov.io/gh/argoproj/argo-cd/commit/32838b1f71718f7f7f4e134d68b25c34014085ea?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj) (32838b1) will **not change** coverage.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/argoproj/argo-cd/pull/8039/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/8039?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj)

```diff
@@           Coverage Diff           @@
##           master    #8039   +/-   ##
=======================================
  Coverage   41.54%   41.54%           
=======================================
  Files         174      174           
  Lines       22681    22681           
=======================================
  Hits         9422     9422           
  Misses      11918    11918           
  Partials     1341     1341           
```



------

[Continue to review full report at Codecov](https://codecov.io/gh/argoproj/argo-cd/pull/8039?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/8039?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=argoproj). Last update [32838b1...956284a](https://codecov.io/gh/argoproj/argo-cd/pull/8039?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).


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/package.json b/ui/package.json
index ec5c1fd88..89af780fb 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -88,7 +88,7 @@
     "jest-junit": "^6.4.0",
     "jest-transform-css": "^2.0.0",
     "monaco-editor-webpack-plugin": "^6.0.0",
-    "node-sass": "^6.0.1",
+    "node-sass": "^7.0.1",
     "postcss": "^8.2.13",
     "prettier": "1.19",
     "raw-loader": "^0.5.1",
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/ui/yarn.lock b/ui/yarn.lock
index b40d7b09f..4806689cd 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -824,6 +824,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
   integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
 
+"@gar/promisify@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
+  integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+
 "@jest/console@^24.7.1", "@jest/console@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.9.0.tgz#79b1bc06fb74a8cfb01cbdedf945584b1b9707f0"
@@ -1004,6 +1009,14 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@npmcli/fs@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951"
+  integrity sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA==
+  dependencies:
+    "@gar/promisify" "^1.0.1"
+    semver "^7.3.5"
+
 "@npmcli/move-file@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
@@ -1555,13 +1568,22 @@ agent-base@5:
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
   integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
+agentkeepalive@^4.1.3:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b"
+  integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==
+  dependencies:
+    debug "^4.1.0"
+    depd "^1.1.2"
+    humanize-ms "^1.2.1"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -1590,11 +1612,6 @@ ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-amdefine@>=0.0.4:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 anser@^1.4.1:
   version "1.4.10"
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.10.tgz#befa3eddf282684bd03b63dcda3927aef8c2e35b"
@@ -1635,6 +1652,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -1732,18 +1754,23 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    readable-stream "^3.6.0"
 
 "argo-ui@git+https://github.com/argoproj/argo-ui.git":
   version "1.0.0"
@@ -2330,6 +2357,30 @@ cacache@^15.0.5:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
+cacache@^15.2.0:
+  version "15.3.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
+  dependencies:
+    "@npmcli/fs" "^1.0.0"
+    "@npmcli/move-file" "^1.0.1"
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    infer-owner "^1.0.4"
+    lru-cache "^6.0.0"
+    minipass "^3.1.1"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^1.0.3"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^8.0.1"
+    tar "^6.0.2"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -2407,7 +2458,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2435,6 +2486,14 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2572,11 +2631,6 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 codecov@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.7.2.tgz#998e68c8c1ef4b55cfcf11cd456866d35e13d693"
@@ -2628,6 +2682,11 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
@@ -2733,7 +2792,7 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -3051,6 +3110,13 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.1:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -3161,7 +3227,7 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
 
-depd@~1.1.2:
+depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -3398,7 +3464,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding@^0.1.11:
+encoding@^0.1.11, encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -3431,6 +3497,11 @@ env-paths@^2.2.0:
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -4027,19 +4098,35 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+gauge@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
+  integrity sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==
   dependencies:
-    aproba "^1.0.3"
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.2"
     console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
+    has-unicode "^2.0.1"
+    object-assign "^4.1.1"
     signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.2"
+
+gauge@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8"
+  integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==
+  dependencies:
+    ansi-regex "^5.0.1"
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.2"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.2"
 
 gaze@^1.0.0:
   version "1.1.3"
@@ -4221,10 +4308,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
   integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
 
-graceful-fs@^4.2.3:
-  version "4.2.6"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
-  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+graceful-fs@^4.2.6:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a"
+  integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==
 
 graphlib@^2.1.7:
   version "2.1.8"
@@ -4248,7 +4335,7 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0, har-validator@~5.1.3:
+har-validator@~5.1.0:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"
   integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==
@@ -4298,7 +4385,7 @@ has-symbols@^1.0.1, has-symbols@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
@@ -4478,6 +4565,11 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
+http-cache-semantics@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -4504,7 +4596,7 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-proxy-agent@^4.0.0:
+http-proxy-agent@^4.0.0, http-proxy-agent@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
   integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
@@ -4559,6 +4651,21 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4852,13 +4959,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -4888,6 +4988,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -5466,7 +5571,7 @@ joycon@^3.0.1:
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf"
   integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA==
 
-js-base64@^2.1.8:
+js-base64@^2.4.3:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
   integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
@@ -5782,7 +5887,7 @@ lodash.tail@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
   integrity sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=
 
-lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.6.1, lodash@~4.17.10:
+lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.6.1, lodash@~4.17.10:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5843,6 +5948,28 @@ make-error@1.x, make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
   integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
 
+make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+  dependencies:
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^1.3.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.2"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
+
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -6062,6 +6189,17 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
+minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
+  dependencies:
+    minipass "^3.1.0"
+    minipass-sized "^1.0.3"
+    minizlib "^2.0.0"
+  optionalDependencies:
+    encoding "^0.1.12"
+
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
@@ -6069,13 +6207,20 @@ minipass-flush@^1.0.5:
   dependencies:
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd"
@@ -6083,7 +6228,14 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1:
+minipass@^3.1.0, minipass@^3.1.3:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
+  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -6193,11 +6345,16 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.1.1:
+ms@2.1.2, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 multicast-dns-service-types@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
@@ -6243,7 +6400,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-negotiator@0.6.2:
+negotiator@0.6.2, negotiator@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
@@ -6297,20 +6454,20 @@ node-forge@^0.10.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-gyp@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae"
-  integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==
+node-gyp@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.3"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^9.1.0"
     nopt "^5.0.0"
-    npmlog "^4.1.2"
-    request "^2.88.2"
+    npmlog "^6.0.0"
     rimraf "^3.0.2"
-    semver "^7.3.2"
-    tar "^6.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
     which "^2.0.2"
 
 node-int64@^0.4.0:
@@ -6375,13 +6532,13 @@ node-releases@^1.1.71:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
   integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
 
-node-sass@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-6.0.1.tgz#cad1ccd0ce63e35c7181f545d8b986f3a9a887fe"
-  integrity sha512-f+Rbqt92Ful9gX0cGtdYwjTrWAaGURgaK5rZCWOgCNyGWusFYHhbqCCBoFBeat+HKETOU02AyTxNhJV0YZf2jQ==
+node-sass@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-7.0.1.tgz#ad4f6bc663de8acc0a9360db39165a1e2620aa72"
+  integrity sha512-uMy+Xt29NlqKCFdFRZyXKOTqGt+QaKHexv9STj2WeLottnlqZEEWx6Bj0MXNthmFRRdM/YwyNo/8Tr46TOM0jQ==
   dependencies:
     async-foreach "^0.1.3"
-    chalk "^1.1.1"
+    chalk "^4.1.2"
     cross-spawn "^7.0.3"
     gaze "^1.0.0"
     get-stdin "^4.0.1"
@@ -6389,10 +6546,10 @@ node-sass@^6.0.1:
     lodash "^4.17.15"
     meow "^9.0.0"
     nan "^2.13.2"
-    node-gyp "^7.1.0"
-    npmlog "^4.0.0"
+    node-gyp "^8.4.1"
+    npmlog "^5.0.0"
     request "^2.88.0"
-    sass-graph "2.2.5"
+    sass-graph "4.0.0"
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
@@ -6447,15 +6604,25 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.0, npmlog@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+npmlog@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
+  integrity sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
+    are-we-there-yet "^2.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^3.0.0"
+    set-blocking "^2.0.0"
+
+npmlog@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c"
+  integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==
+  dependencies:
+    are-we-there-yet "^2.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.0"
+    set-blocking "^2.0.0"
 
 nth-check@^2.0.0:
   version "2.0.1"
@@ -6464,11 +6631,6 @@ nth-check@^2.0.0:
   dependencies:
     boolbase "^1.0.0"
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 nwsapi@^2.0.7:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -6525,7 +6687,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7148,6 +7310,14 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
 prompts@^2.0.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
@@ -7939,7 +8109,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -8200,32 +8370,6 @@ request@^2.87.0, request@^2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-request@^2.88.2:
-  version "2.88.2"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
-  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -8401,15 +8545,15 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+sass-graph@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-4.0.0.tgz#fff8359efc77b31213056dfd251d05dadc74c613"
+  integrity sha512-WSO/MfXqKH7/TS8RdkCX3lVkPFQzCgbqdGsmSKq6tlPU+GpGEsa/5aW18JqItnqh+lPtcjifqdZ/VmiILkKckQ==
   dependencies:
     glob "^7.0.0"
-    lodash "^4.0.0"
-    scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
+    lodash "^4.17.11"
+    scss-tokenizer "^0.3.0"
+    yargs "^17.2.1"
 
 sass-loader@^6.0.6:
   version "6.0.7"
@@ -8476,13 +8620,13 @@ scroll-into-view-if-needed@^2.2.25:
   dependencies:
     compute-scroll-into-view "^1.0.17"
 
-scss-tokenizer@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
-  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+scss-tokenizer@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.3.0.tgz#ef7edc3bc438b25cd6ffacf1aa5b9ad5813bf260"
+  integrity sha512-14Zl9GcbBvOT9057ZKjpz5yPOyUWG2ojd9D5io28wHRYsOrs7U95Q+KNL87+32p8rc+LvDpbu/i9ZYjM9Q+FsQ==
   dependencies:
-    js-base64 "^2.1.8"
-    source-map "^0.4.2"
+    js-base64 "^2.4.3"
+    source-map "^0.7.1"
 
 select-hose@^2.0.0:
   version "2.0.0"
@@ -8511,7 +8655,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.4:
+semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -8574,7 +8718,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8740,6 +8884,11 @@ slugify@~1.4.7:
   resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.4.7.tgz#e42359d505afd84a44513280868e31202a79a628"
   integrity sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==
 
+smart-buffer@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -8791,6 +8940,23 @@ sockjs@0.3.20:
     uuid "^3.4.0"
     websocket-driver "0.6.5"
 
+socks-proxy-agent@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
+  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.1"
+    socks "^2.6.1"
+
+socks@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.1.0"
+
 source-list-map@^2.0.0, source-list-map@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
@@ -8833,13 +8999,6 @@ source-map@0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
   integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
 
-source-map@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
-  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -8850,6 +9009,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+source-map@^0.7.1:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 sourcemapped-stacktrace@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.11.tgz#e2dede7fc148599c52a4f883276e527f8452657d"
@@ -8945,7 +9109,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -9056,22 +9220,14 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
-
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
@@ -9142,6 +9298,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -9278,7 +9441,7 @@ tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.0.2:
+tar@^6.0.2, tar@^6.1.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -9444,7 +9607,7 @@ toposort@^1.0.0:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
   integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
-tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0:
+tough-cookie@^2.3.3, tough-cookie@^2.3.4:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -10146,12 +10309,12 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+wide-align@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
-    string-width "^1.0.2 || 2"
+    string-width "^1.0.2 || 2 || 3 || 4"
 
 word-wrap@~1.2.3:
   version "1.2.3"
@@ -10281,6 +10444,11 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-parser@^21.0.0:
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
+  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+
 yargs@^13.3.0, yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -10310,6 +10478,19 @@ yargs@^17.0.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.2.1:
+  version "17.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"
+  integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"
+
 yarn@^1.22.10:
   version "1.22.10"
   resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.10.tgz#c99daa06257c80f8fa2c3f1490724e394c26b18c"
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)
+	})
+}