mirror of
https://github.com/argoproj/argo-cd
synced 2026-04-21 17:07:16 +00:00
feat(ui): hide sync option 'replace' if sync with replace is disabled in the server (issue no. #22625) (#22647)
Signed-off-by: jan-mrm <67435696+jan-mrm@users.noreply.github.com>
This commit is contained in:
jan-mrm
GitHub
parent
30abebda3d
commit
afaf16b808
7 changed files with 153 additions and 89 deletions
3
assets/swagger.json
generated
3
assets/swagger.json
generated
|
|
@ -5619,6 +5619,9 @@
|
|||
"statusBadgeRootUrl": {
|
||||
"type": "string"
|
||||
},
|
||||
"syncWithReplaceAllowed": {
|
||||
"type": "boolean"
|
||||
},
|
||||
"trackingMethod": {
|
||||
"type": "string"
|
||||
},
|
||||
|
|
|
|||
209
pkg/apiclient/settings/settings.pb.go
generated
209
pkg/apiclient/settings/settings.pb.go
generated
|
|
@ -105,6 +105,7 @@ type Settings struct {
|
|||
InstallationID string `protobuf:"bytes,26,opt,name=installationID,proto3" json:"installationID,omitempty"`
|
||||
AdditionalURLs []string `protobuf:"bytes,27,rep,name=additionalUrls,proto3" json:"additionalUrls,omitempty"`
|
||||
HydratorEnabled bool `protobuf:"varint,28,opt,name=hydratorEnabled,proto3" json:"hydratorEnabled,omitempty"`
|
||||
SyncWithReplaceAllowed bool `protobuf:"varint,29,opt,name=syncWithReplaceAllowed,proto3" json:"syncWithReplaceAllowed,omitempty"`
|
||||
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||
XXX_unrecognized []byte `json:"-"`
|
||||
XXX_sizecache int32 `json:"-"`
|
||||
|
|
@ -339,6 +340,13 @@ func (m *Settings) GetHydratorEnabled() bool {
|
|||
return false
|
||||
}
|
||||
|
||||
func (m *Settings) GetSyncWithReplaceAllowed() bool {
|
||||
if m != nil {
|
||||
return m.SyncWithReplaceAllowed
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
type GoogleAnalyticsConfig struct {
|
||||
TrackingID string `protobuf:"bytes,1,opt,name=trackingID,proto3" json:"trackingID,omitempty"`
|
||||
AnonymizeUsers bool `protobuf:"varint,2,opt,name=anonymizeUsers,proto3" json:"anonymizeUsers,omitempty"`
|
||||
|
|
@ -772,88 +780,90 @@ func init() {
|
|||
func init() { proto.RegisterFile("server/settings/settings.proto", fileDescriptor_a480d494da040caa) }
|
||||
|
||||
var fileDescriptor_a480d494da040caa = []byte{
|
||||
// 1291 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcf, 0x6f, 0x1b, 0xc5,
|
||||
0x17, 0xd7, 0xd6, 0x69, 0x62, 0xbf, 0x34, 0x71, 0x32, 0x4d, 0xd3, 0xad, 0xbf, 0xfd, 0x26, 0xc6,
|
||||
0x87, 0xca, 0x20, 0x58, 0x37, 0x89, 0x10, 0xa8, 0xa2, 0x82, 0xd8, 0xae, 0x5a, 0x53, 0xb7, 0x0d,
|
||||
0xd3, 0xa6, 0x07, 0x2e, 0xd5, 0x64, 0x77, 0x58, 0x2f, 0x59, 0xcf, 0xac, 0x66, 0x66, 0x4d, 0xdd,
|
||||
0x23, 0x7f, 0x00, 0x17, 0xf8, 0x6b, 0xb8, 0x23, 0x38, 0x22, 0x71, 0x8f, 0x90, 0xc5, 0x1f, 0xc1,
|
||||
0x11, 0xcd, 0xec, 0x8f, 0x6c, 0xd6, 0x4e, 0x41, 0xea, 0x6d, 0xe6, 0xf3, 0x79, 0xbf, 0xe6, 0xcd,
|
||||
0x7b, 0x33, 0x0f, 0x76, 0x24, 0x15, 0x13, 0x2a, 0x3a, 0x92, 0x2a, 0x15, 0x30, 0x5f, 0xe6, 0x0b,
|
||||
0x27, 0x12, 0x5c, 0x71, 0xb4, 0xe2, 0x86, 0xb1, 0x54, 0x54, 0x34, 0xb6, 0x7c, 0xee, 0x73, 0x83,
|
||||
0x75, 0xf4, 0x2a, 0xa1, 0x1b, 0xb7, 0x7d, 0xce, 0xfd, 0x90, 0x76, 0x48, 0x14, 0x74, 0x08, 0x63,
|
||||
0x5c, 0x11, 0x15, 0x70, 0x96, 0x2a, 0x37, 0x86, 0x7e, 0xa0, 0x46, 0xf1, 0x89, 0xe3, 0xf2, 0x71,
|
||||
0x87, 0x08, 0xa3, 0xfe, 0xad, 0x59, 0x7c, 0xe4, 0x7a, 0x9d, 0xc9, 0x41, 0x27, 0x3a, 0xf5, 0xb5,
|
||||
0xa6, 0xec, 0x90, 0x28, 0x0a, 0x03, 0xd7, 0xe8, 0x76, 0x26, 0x7b, 0x24, 0x8c, 0x46, 0x64, 0xaf,
|
||||
0xe3, 0x53, 0x46, 0x05, 0x51, 0xd4, 0x4b, 0xad, 0x7d, 0xf1, 0x2f, 0xd6, 0xca, 0x27, 0xe1, 0x81,
|
||||
0xe7, 0x76, 0xdc, 0x90, 0x04, 0xe3, 0x34, 0x9e, 0x56, 0x1d, 0xd6, 0x9e, 0xa7, 0xec, 0x57, 0x31,
|
||||
0x15, 0xd3, 0xd6, 0xdf, 0xd7, 0xa0, 0x9a, 0x21, 0xe8, 0x16, 0x54, 0x62, 0x11, 0xda, 0x56, 0xd3,
|
||||
0x6a, 0xd7, 0xba, 0x2b, 0xb3, 0xb3, 0xdd, 0xca, 0x31, 0x1e, 0x62, 0x8d, 0xa1, 0xbb, 0x50, 0xf3,
|
||||
0xe8, 0xeb, 0x1e, 0x67, 0xdf, 0x04, 0xbe, 0x7d, 0xa5, 0x69, 0xb5, 0x57, 0xf7, 0x91, 0x93, 0x66,
|
||||
0xc6, 0xe9, 0x67, 0x0c, 0x3e, 0x17, 0x42, 0x3d, 0x00, 0xed, 0x3f, 0x55, 0xa9, 0x18, 0x95, 0xeb,
|
||||
0xb9, 0xca, 0xb3, 0x41, 0xbf, 0x97, 0x50, 0xdd, 0xf5, 0xd9, 0xd9, 0x2e, 0x9c, 0xef, 0x71, 0x41,
|
||||
0x0d, 0x35, 0x61, 0x95, 0x44, 0xd1, 0x90, 0x9c, 0xd0, 0xf0, 0x31, 0x9d, 0xda, 0x4b, 0x3a, 0x32,
|
||||
0x5c, 0x84, 0xd0, 0x4b, 0xd8, 0x14, 0x54, 0xf2, 0x58, 0xb8, 0xf4, 0xd9, 0x84, 0x0a, 0x11, 0x78,
|
||||
0x54, 0xda, 0x57, 0x9b, 0x95, 0xf6, 0xea, 0x7e, 0x3b, 0xf7, 0x96, 0x9d, 0xd0, 0xc1, 0x65, 0xd1,
|
||||
0x07, 0x4c, 0x89, 0x29, 0x9e, 0x37, 0x81, 0x1c, 0x40, 0x52, 0x11, 0x15, 0xcb, 0x2e, 0xf1, 0x7c,
|
||||
0xfa, 0x80, 0x91, 0x93, 0x90, 0x7a, 0xf6, 0x72, 0xd3, 0x6a, 0x57, 0xf1, 0x02, 0x06, 0x3d, 0x82,
|
||||
0x7a, 0x52, 0x09, 0x87, 0x8c, 0x84, 0x53, 0x15, 0xb8, 0xd2, 0x5e, 0x31, 0x67, 0xde, 0xc9, 0xa3,
|
||||
0x78, 0x78, 0x91, 0x4f, 0x8f, 0x5b, 0x56, 0x43, 0x6f, 0x60, 0xe3, 0x34, 0x96, 0x8a, 0x8f, 0x83,
|
||||
0x37, 0xf4, 0x59, 0x64, 0xaa, 0xc9, 0xae, 0x1a, 0x53, 0x4f, 0x9d, 0xf3, 0x02, 0x70, 0xb2, 0x02,
|
||||
0x30, 0x8b, 0x57, 0xae, 0xe7, 0x4c, 0x0e, 0x9c, 0xe8, 0xd4, 0x77, 0x74, 0x39, 0x39, 0x85, 0x72,
|
||||
0x72, 0xb2, 0x72, 0x72, 0x1e, 0x97, 0xac, 0xe2, 0x39, 0x3f, 0xe8, 0x3d, 0x58, 0x1a, 0xd1, 0x30,
|
||||
0xb2, 0x6b, 0xc6, 0xdf, 0x5a, 0x1e, 0xfa, 0x23, 0x1a, 0x46, 0xd8, 0x50, 0xe8, 0x7d, 0x58, 0x89,
|
||||
0xc2, 0xd8, 0x0f, 0x98, 0xb4, 0xc1, 0xa4, 0xb9, 0x9e, 0x4b, 0x1d, 0x19, 0x1c, 0x67, 0xbc, 0xce,
|
||||
0x61, 0x2c, 0xa9, 0x18, 0x72, 0xbd, 0xeb, 0x07, 0x32, 0xc9, 0xe1, 0x6a, 0x92, 0xc3, 0x79, 0x06,
|
||||
0xfd, 0x60, 0xc1, 0x4d, 0xd7, 0x64, 0xe5, 0x09, 0x61, 0xc4, 0xa7, 0x63, 0xca, 0xd4, 0x51, 0xea,
|
||||
0xeb, 0x9a, 0xf1, 0xf5, 0xe2, 0xdd, 0x32, 0xd0, 0x5b, 0x68, 0x1c, 0x5f, 0xe6, 0x14, 0x7d, 0x08,
|
||||
0x9b, 0x79, 0x8a, 0x5e, 0x52, 0x21, 0xcd, 0x5d, 0xac, 0x35, 0x2b, 0xed, 0x1a, 0x9e, 0x27, 0x50,
|
||||
0x03, 0xaa, 0x71, 0xd0, 0x93, 0xf2, 0x18, 0x0f, 0xed, 0x75, 0x53, 0xa9, 0xf9, 0x1e, 0xb5, 0xa1,
|
||||
0x1e, 0x07, 0x5d, 0xc2, 0x18, 0x15, 0x3d, 0xce, 0x14, 0x65, 0xca, 0xae, 0x1b, 0x91, 0x32, 0xac,
|
||||
0x4b, 0x3e, 0x83, 0xb4, 0xa1, 0x8d, 0xa4, 0xe4, 0x0b, 0x90, 0xb6, 0x15, 0x11, 0x29, 0xbf, 0xe3,
|
||||
0xc2, 0x3b, 0x22, 0x4a, 0x51, 0xc1, 0xec, 0xcd, 0xc4, 0x56, 0x09, 0x46, 0x77, 0x60, 0x5d, 0x09,
|
||||
0xe2, 0x9e, 0x06, 0xcc, 0x7f, 0x42, 0xd5, 0x88, 0x7b, 0x36, 0x32, 0x82, 0x25, 0x54, 0x9f, 0x33,
|
||||
0x73, 0x70, 0x44, 0xc5, 0x98, 0x30, 0x1d, 0xdf, 0x75, 0x73, 0x4f, 0xf3, 0x04, 0xfa, 0x00, 0x36,
|
||||
0x72, 0x90, 0xcb, 0x40, 0xa7, 0xd8, 0xde, 0x32, 0x76, 0xe7, 0xf0, 0x52, 0x1b, 0x61, 0xce, 0xd5,
|
||||
0xb1, 0x08, 0xed, 0x1b, 0x46, 0x7a, 0x01, 0xa3, 0x4f, 0x4f, 0x5f, 0x53, 0x37, 0xeb, 0xb7, 0x6d,
|
||||
0x13, 0x43, 0x11, 0x42, 0x77, 0xe1, 0xba, 0xcb, 0x99, 0x12, 0x3c, 0x0c, 0xa9, 0x78, 0x4a, 0xc6,
|
||||
0x54, 0x46, 0xc4, 0xa5, 0xf6, 0x4d, 0x63, 0x72, 0x11, 0x85, 0x3e, 0x83, 0x5b, 0x24, 0x8a, 0xe4,
|
||||
0x80, 0x1d, 0xb2, 0x69, 0x8e, 0x66, 0x1e, 0x6c, 0xe3, 0xe1, 0x72, 0x01, 0xb4, 0x0f, 0x5b, 0xc1,
|
||||
0x38, 0xa2, 0x42, 0x72, 0x66, 0xaa, 0x29, 0x53, 0xbc, 0x65, 0x14, 0x17, 0x72, 0x3a, 0xef, 0x01,
|
||||
0x93, 0x8a, 0x84, 0xa1, 0x81, 0x07, 0x7d, 0xbb, 0x91, 0xe4, 0xfd, 0x22, 0x8a, 0xee, 0xc1, 0x3a,
|
||||
0xf1, 0x3c, 0x93, 0x29, 0x12, 0x1e, 0x8b, 0x50, 0xda, 0xff, 0xd3, 0xc5, 0xd5, 0x45, 0xb3, 0xb3,
|
||||
0xdd, 0xf5, 0xc3, 0x73, 0x06, 0x0f, 0x25, 0x2e, 0x49, 0xea, 0x2a, 0x18, 0x4d, 0x3d, 0x41, 0x14,
|
||||
0x17, 0x59, 0x48, 0xb7, 0x4d, 0x48, 0x65, 0xb8, 0xf1, 0x93, 0x05, 0xdb, 0x8b, 0x1f, 0x3e, 0xb4,
|
||||
0x01, 0x95, 0x53, 0x3a, 0x4d, 0x5e, 0x7c, 0xac, 0x97, 0xc8, 0x83, 0xab, 0x13, 0x12, 0xc6, 0x34,
|
||||
0x7d, 0xe4, 0xdf, 0xf1, 0xc9, 0x29, 0xbb, 0xc5, 0x89, 0xf1, 0x7b, 0x57, 0x3e, 0xb5, 0x5a, 0xaf,
|
||||
0xe0, 0xc6, 0xc2, 0x17, 0x11, 0xed, 0x00, 0x64, 0xf5, 0x39, 0xe8, 0xa7, 0xb1, 0x15, 0x10, 0x9d,
|
||||
0x5d, 0xc2, 0x38, 0x9b, 0xea, 0xe6, 0x3b, 0x96, 0x54, 0x48, 0x13, 0x6b, 0x15, 0x97, 0xd0, 0x56,
|
||||
0x1f, 0x6e, 0x66, 0x0f, 0x7f, 0xda, 0xd0, 0x98, 0xca, 0x88, 0x33, 0x49, 0x8b, 0x8f, 0x98, 0xf5,
|
||||
0xf6, 0x47, 0xac, 0xf5, 0xb3, 0x05, 0x4b, 0xfa, 0xf9, 0x43, 0x36, 0xac, 0xb8, 0x23, 0x62, 0xea,
|
||||
0x37, 0x89, 0x29, 0xdb, 0xea, 0xc6, 0xd7, 0xcb, 0x17, 0xf4, 0xb5, 0x32, 0xa1, 0xd4, 0x70, 0xbe,
|
||||
0x47, 0xf7, 0x01, 0x4e, 0x02, 0x46, 0xc4, 0xd4, 0x5c, 0x6f, 0xc5, 0x38, 0xfb, 0xff, 0x85, 0x77,
|
||||
0xd5, 0xe9, 0xe6, 0x7c, 0xf2, 0x1b, 0x15, 0x14, 0x1a, 0xf7, 0xa1, 0x5e, 0xa2, 0x17, 0xdc, 0xd9,
|
||||
0x56, 0xf1, 0xce, 0x6a, 0xc5, 0x1c, 0xdf, 0x86, 0xe5, 0xe4, 0x3c, 0x08, 0xc1, 0x12, 0x23, 0x63,
|
||||
0x9a, 0xaa, 0x99, 0x75, 0xeb, 0x73, 0xa8, 0xe5, 0x5f, 0x37, 0xda, 0x07, 0x70, 0x39, 0x63, 0xd4,
|
||||
0x55, 0x5c, 0x64, 0x59, 0x39, 0xff, 0xe2, 0x7b, 0x19, 0x85, 0x0b, 0x52, 0xad, 0x03, 0xa8, 0xe5,
|
||||
0xc4, 0x22, 0x0f, 0x1a, 0x53, 0xd3, 0x28, 0x0b, 0xcc, 0xac, 0x5b, 0xbf, 0x54, 0xa0, 0xf0, 0xdd,
|
||||
0x2f, 0x54, 0xdb, 0x86, 0xe5, 0x40, 0xca, 0x98, 0x8a, 0x54, 0x31, 0xdd, 0xa1, 0x36, 0x54, 0xdd,
|
||||
0x30, 0xa0, 0x4c, 0x0d, 0xfa, 0x66, 0xa2, 0xa8, 0x75, 0xaf, 0xcd, 0xce, 0x76, 0xab, 0xbd, 0x14,
|
||||
0xc3, 0x39, 0x8b, 0xf6, 0x60, 0xd5, 0x0d, 0x83, 0x8c, 0x48, 0x06, 0x87, 0x6e, 0x7d, 0x76, 0xb6,
|
||||
0xbb, 0xda, 0x1b, 0x0e, 0x72, 0xf9, 0xa2, 0x8c, 0x76, 0x2a, 0x5d, 0x1e, 0xa5, 0xe3, 0x43, 0x0d,
|
||||
0xa7, 0x3b, 0xf4, 0x0a, 0xd6, 0x02, 0xef, 0x05, 0x3f, 0xa5, 0xac, 0x67, 0x46, 0x29, 0x7b, 0xd9,
|
||||
0xe4, 0xe6, 0xce, 0x82, 0x59, 0xc6, 0x19, 0x14, 0x05, 0xcd, 0x75, 0x75, 0x37, 0x67, 0x67, 0xbb,
|
||||
0x6b, 0x83, 0x7e, 0x01, 0xc7, 0x17, 0xed, 0xa1, 0x7b, 0x60, 0x53, 0xd3, 0xaa, 0x47, 0x8f, 0x7b,
|
||||
0x0f, 0x0e, 0x63, 0x35, 0xa2, 0x4c, 0xa5, 0x9d, 0x64, 0x66, 0x88, 0x2a, 0xbe, 0x94, 0x6f, 0x4c,
|
||||
0x01, 0xcd, 0xfb, 0x5c, 0x50, 0x22, 0x4f, 0x2e, 0xb6, 0xf5, 0x27, 0x6f, 0x6d, 0xeb, 0x64, 0x8e,
|
||||
0x74, 0xf2, 0x41, 0x58, 0x0f, 0x64, 0x8e, 0xb1, 0x5f, 0xa8, 0xad, 0xfd, 0x5f, 0x2d, 0xa8, 0x67,
|
||||
0xfd, 0xf5, 0x9c, 0x8a, 0x49, 0xe0, 0x52, 0xf4, 0x25, 0x54, 0x1e, 0x52, 0x85, 0xb6, 0xe7, 0x26,
|
||||
0x2f, 0x33, 0x6d, 0x36, 0x36, 0xe7, 0xf0, 0x96, 0xfd, 0xfd, 0x1f, 0x7f, 0xfd, 0x78, 0x05, 0xa1,
|
||||
0x0d, 0x33, 0x41, 0x4f, 0xf6, 0xf2, 0xe9, 0x15, 0x8d, 0x00, 0x1e, 0xd2, 0xfc, 0x2b, 0xbe, 0xcc,
|
||||
0x64, 0x73, 0x0e, 0x2f, 0xf5, 0x7a, 0xab, 0x69, 0x3c, 0x34, 0x90, 0x5d, 0xf6, 0xd0, 0x49, 0x5b,
|
||||
0xbc, 0xdb, 0xfb, 0x6d, 0xb6, 0x63, 0xfd, 0x3e, 0xdb, 0xb1, 0xfe, 0x9c, 0xed, 0x58, 0x5f, 0x7f,
|
||||
0xfc, 0xdf, 0x66, 0xf6, 0xa4, 0xd4, 0x72, 0x63, 0x27, 0xcb, 0x66, 0xc2, 0x3e, 0xf8, 0x27, 0x00,
|
||||
0x00, 0xff, 0xff, 0xb3, 0xaf, 0x63, 0xe2, 0x50, 0x0c, 0x00, 0x00,
|
||||
// 1318 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0x1b, 0x37,
|
||||
0x13, 0x86, 0x22, 0xc7, 0x96, 0xc6, 0xb1, 0x65, 0x33, 0x8e, 0xb3, 0xd1, 0x9b, 0xd8, 0x7a, 0x75,
|
||||
0x08, 0xd4, 0xa2, 0x5d, 0xc5, 0x36, 0xfa, 0x81, 0xa0, 0x41, 0x6b, 0x49, 0x41, 0xa2, 0xc6, 0x49,
|
||||
0x5c, 0x26, 0x4e, 0x81, 0x5e, 0x02, 0x7a, 0x77, 0x2a, 0x6d, 0xbd, 0x22, 0x17, 0x24, 0x57, 0x89,
|
||||
0x72, 0xec, 0x0f, 0xe8, 0xa5, 0xfd, 0x21, 0x3d, 0xf7, 0x5e, 0xb4, 0xc7, 0x02, 0xbd, 0x1b, 0x85,
|
||||
0xd0, 0x1f, 0x52, 0x2c, 0xf7, 0xc3, 0xeb, 0x95, 0x9c, 0x16, 0xc8, 0x8d, 0x7c, 0x9e, 0xf9, 0xe2,
|
||||
0x70, 0x86, 0x1c, 0xd8, 0x52, 0x28, 0xc7, 0x28, 0xdb, 0x0a, 0xb5, 0xf6, 0xf8, 0x40, 0x65, 0x0b,
|
||||
0x3b, 0x90, 0x42, 0x0b, 0xb2, 0xe4, 0xf8, 0xa1, 0xd2, 0x28, 0xeb, 0x1b, 0x03, 0x31, 0x10, 0x06,
|
||||
0x6b, 0x47, 0xab, 0x98, 0xae, 0xdf, 0x1c, 0x08, 0x31, 0xf0, 0xb1, 0xcd, 0x02, 0xaf, 0xcd, 0x38,
|
||||
0x17, 0x9a, 0x69, 0x4f, 0xf0, 0x44, 0xb9, 0x7e, 0x30, 0xf0, 0xf4, 0x30, 0x3c, 0xb6, 0x1d, 0x31,
|
||||
0x6a, 0x33, 0x69, 0xd4, 0xbf, 0x33, 0x8b, 0x0f, 0x1d, 0xb7, 0x3d, 0xde, 0x6b, 0x07, 0x27, 0x83,
|
||||
0x48, 0x53, 0xb5, 0x59, 0x10, 0xf8, 0x9e, 0x63, 0x74, 0xdb, 0xe3, 0x1d, 0xe6, 0x07, 0x43, 0xb6,
|
||||
0xd3, 0x1e, 0x20, 0x47, 0xc9, 0x34, 0xba, 0x89, 0xb5, 0x2f, 0xfe, 0xc5, 0x5a, 0xf1, 0x24, 0xc2,
|
||||
0x73, 0x9d, 0xb6, 0xe3, 0x33, 0x6f, 0x94, 0xc4, 0xd3, 0xac, 0xc1, 0xca, 0xb3, 0x84, 0xfd, 0x2a,
|
||||
0x44, 0x39, 0x69, 0xfe, 0xbc, 0x02, 0x95, 0x14, 0x21, 0x37, 0xa0, 0x1c, 0x4a, 0xdf, 0x2a, 0x35,
|
||||
0x4a, 0xad, 0x6a, 0x67, 0x69, 0x7a, 0xba, 0x5d, 0x3e, 0xa2, 0x07, 0x34, 0xc2, 0xc8, 0x1d, 0xa8,
|
||||
0xba, 0xf8, 0xba, 0x2b, 0xf8, 0xb7, 0xde, 0xc0, 0xba, 0xd4, 0x28, 0xb5, 0x96, 0x77, 0x89, 0x9d,
|
||||
0x64, 0xc6, 0xee, 0xa5, 0x0c, 0x3d, 0x13, 0x22, 0x5d, 0x80, 0xc8, 0x7f, 0xa2, 0x52, 0x36, 0x2a,
|
||||
0x57, 0x33, 0x95, 0xa7, 0xfd, 0x5e, 0x37, 0xa6, 0x3a, 0xab, 0xd3, 0xd3, 0x6d, 0x38, 0xdb, 0xd3,
|
||||
0x9c, 0x1a, 0x69, 0xc0, 0x32, 0x0b, 0x82, 0x03, 0x76, 0x8c, 0xfe, 0x23, 0x9c, 0x58, 0x0b, 0x51,
|
||||
0x64, 0x34, 0x0f, 0x91, 0x17, 0xb0, 0x2e, 0x51, 0x89, 0x50, 0x3a, 0xf8, 0x74, 0x8c, 0x52, 0x7a,
|
||||
0x2e, 0x2a, 0xeb, 0x72, 0xa3, 0xdc, 0x5a, 0xde, 0x6d, 0x65, 0xde, 0xd2, 0x13, 0xda, 0xb4, 0x28,
|
||||
0x7a, 0x9f, 0x6b, 0x39, 0xa1, 0xb3, 0x26, 0x88, 0x0d, 0x44, 0x69, 0xa6, 0x43, 0xd5, 0x61, 0xee,
|
||||
0x00, 0xef, 0x73, 0x76, 0xec, 0xa3, 0x6b, 0x2d, 0x36, 0x4a, 0xad, 0x0a, 0x9d, 0xc3, 0x90, 0x87,
|
||||
0x50, 0x8b, 0x2b, 0x61, 0x9f, 0x33, 0x7f, 0xa2, 0x3d, 0x47, 0x59, 0x4b, 0xe6, 0xcc, 0x5b, 0x59,
|
||||
0x14, 0x0f, 0xce, 0xf3, 0xc9, 0x71, 0x8b, 0x6a, 0xe4, 0x0d, 0xac, 0x9d, 0x84, 0x4a, 0x8b, 0x91,
|
||||
0xf7, 0x06, 0x9f, 0x06, 0xa6, 0x9a, 0xac, 0x8a, 0x31, 0xf5, 0xc4, 0x3e, 0x2b, 0x00, 0x3b, 0x2d,
|
||||
0x00, 0xb3, 0x78, 0xe9, 0xb8, 0xf6, 0x78, 0xcf, 0x0e, 0x4e, 0x06, 0x76, 0x54, 0x4e, 0x76, 0xae,
|
||||
0x9c, 0xec, 0xb4, 0x9c, 0xec, 0x47, 0x05, 0xab, 0x74, 0xc6, 0x0f, 0xf9, 0x3f, 0x2c, 0x0c, 0xd1,
|
||||
0x0f, 0xac, 0xaa, 0xf1, 0xb7, 0x92, 0x85, 0xfe, 0x10, 0xfd, 0x80, 0x1a, 0x8a, 0xbc, 0x07, 0x4b,
|
||||
0x81, 0x1f, 0x0e, 0x3c, 0xae, 0x2c, 0x30, 0x69, 0xae, 0x65, 0x52, 0x87, 0x06, 0xa7, 0x29, 0x1f,
|
||||
0xe5, 0x30, 0x54, 0x28, 0x0f, 0x44, 0xb4, 0xeb, 0x79, 0x2a, 0xce, 0xe1, 0x72, 0x9c, 0xc3, 0x59,
|
||||
0x86, 0xfc, 0x50, 0x82, 0xeb, 0x8e, 0xc9, 0xca, 0x63, 0xc6, 0xd9, 0x00, 0x47, 0xc8, 0xf5, 0x61,
|
||||
0xe2, 0xeb, 0x8a, 0xf1, 0xf5, 0xfc, 0xdd, 0x32, 0xd0, 0x9d, 0x6b, 0x9c, 0x5e, 0xe4, 0x94, 0x7c,
|
||||
0x00, 0xeb, 0x59, 0x8a, 0x5e, 0xa0, 0x54, 0xe6, 0x2e, 0x56, 0x1a, 0xe5, 0x56, 0x95, 0xce, 0x12,
|
||||
0xa4, 0x0e, 0x95, 0xd0, 0xeb, 0x2a, 0x75, 0x44, 0x0f, 0xac, 0x55, 0x53, 0xa9, 0xd9, 0x9e, 0xb4,
|
||||
0xa0, 0x16, 0x7a, 0x1d, 0xc6, 0x39, 0xca, 0xae, 0xe0, 0x1a, 0xb9, 0xb6, 0x6a, 0x46, 0xa4, 0x08,
|
||||
0x47, 0x25, 0x9f, 0x42, 0x91, 0xa1, 0xb5, 0xb8, 0xe4, 0x73, 0x50, 0x64, 0x2b, 0x60, 0x4a, 0xbd,
|
||||
0x12, 0xd2, 0x3d, 0x64, 0x5a, 0xa3, 0xe4, 0xd6, 0x7a, 0x6c, 0xab, 0x00, 0x93, 0xdb, 0xb0, 0xaa,
|
||||
0x25, 0x73, 0x4e, 0x3c, 0x3e, 0x78, 0x8c, 0x7a, 0x28, 0x5c, 0x8b, 0x18, 0xc1, 0x02, 0x1a, 0x9d,
|
||||
0x33, 0x75, 0x70, 0x88, 0x72, 0xc4, 0x78, 0x14, 0xdf, 0x55, 0x73, 0x4f, 0xb3, 0x04, 0x79, 0x1f,
|
||||
0xd6, 0x32, 0x50, 0x28, 0x2f, 0x4a, 0xb1, 0xb5, 0x61, 0xec, 0xce, 0xe0, 0x85, 0x36, 0xa2, 0x42,
|
||||
0xe8, 0x23, 0xe9, 0x5b, 0xd7, 0x8c, 0xf4, 0x1c, 0x26, 0x3a, 0x3d, 0xbe, 0x46, 0x27, 0xed, 0xb7,
|
||||
0x4d, 0x13, 0x43, 0x1e, 0x22, 0x77, 0xe0, 0xaa, 0x23, 0xb8, 0x96, 0xc2, 0xf7, 0x51, 0x3e, 0x61,
|
||||
0x23, 0x54, 0x01, 0x73, 0xd0, 0xba, 0x6e, 0x4c, 0xce, 0xa3, 0xc8, 0x67, 0x70, 0x83, 0x05, 0x81,
|
||||
0xea, 0xf3, 0x7d, 0x3e, 0xc9, 0xd0, 0xd4, 0x83, 0x65, 0x3c, 0x5c, 0x2c, 0x40, 0x76, 0x61, 0xc3,
|
||||
0x1b, 0x05, 0x28, 0x95, 0xe0, 0xa6, 0x9a, 0x52, 0xc5, 0x1b, 0x46, 0x71, 0x2e, 0x17, 0xe5, 0xdd,
|
||||
0xe3, 0x4a, 0x33, 0xdf, 0x37, 0x70, 0xbf, 0x67, 0xd5, 0xe3, 0xbc, 0x9f, 0x47, 0xc9, 0x5d, 0x58,
|
||||
0x65, 0xae, 0x6b, 0x32, 0xc5, 0xfc, 0x23, 0xe9, 0x2b, 0xeb, 0x7f, 0x51, 0x71, 0x75, 0xc8, 0xf4,
|
||||
0x74, 0x7b, 0x75, 0xff, 0x8c, 0xa1, 0x07, 0x8a, 0x16, 0x24, 0xa3, 0x2a, 0x18, 0x4e, 0x5c, 0xc9,
|
||||
0xb4, 0x90, 0x69, 0x48, 0x37, 0x4d, 0x48, 0x45, 0x98, 0x7c, 0x0c, 0x9b, 0x6a, 0xc2, 0x9d, 0xaf,
|
||||
0x3d, 0x3d, 0xa4, 0x18, 0xf8, 0xcc, 0xc1, 0x7d, 0xdf, 0x17, 0xaf, 0xd0, 0xb5, 0x6e, 0x19, 0x85,
|
||||
0x0b, 0xd8, 0xfa, 0x4f, 0x25, 0xd8, 0x9c, 0xff, 0x60, 0x92, 0x35, 0x28, 0x9f, 0xe0, 0x24, 0xfe,
|
||||
0x29, 0x68, 0xb4, 0x24, 0x2e, 0x5c, 0x1e, 0x33, 0x3f, 0xc4, 0xe4, 0x73, 0x78, 0xc7, 0xa7, 0xaa,
|
||||
0xe8, 0x96, 0xc6, 0xc6, 0xef, 0x5e, 0xfa, 0xb4, 0xd4, 0x7c, 0x09, 0xd7, 0xe6, 0xbe, 0xa4, 0x64,
|
||||
0x0b, 0x20, 0xad, 0xeb, 0x7e, 0x2f, 0x89, 0x2d, 0x87, 0x44, 0xb7, 0xc2, 0xb8, 0xe0, 0x93, 0xa8,
|
||||
0x69, 0x8f, 0x14, 0x4a, 0x65, 0x62, 0xad, 0xd0, 0x02, 0xda, 0xec, 0xc1, 0xf5, 0xf4, 0xc3, 0x48,
|
||||
0x1e, 0x02, 0x8a, 0x2a, 0x10, 0x5c, 0x61, 0xfe, 0xf1, 0x2b, 0xbd, 0xfd, 0xf1, 0x6b, 0xfe, 0x52,
|
||||
0x82, 0x85, 0xe8, 0xd9, 0x24, 0x16, 0x2c, 0x39, 0x43, 0x66, 0xea, 0x3e, 0x8e, 0x29, 0xdd, 0x46,
|
||||
0x0f, 0x46, 0xb4, 0x7c, 0x8e, 0xaf, 0xb5, 0x09, 0xa5, 0x4a, 0xb3, 0x3d, 0xb9, 0x07, 0x70, 0xec,
|
||||
0x71, 0x26, 0x27, 0xa6, 0x2c, 0xca, 0xc6, 0xd9, 0xad, 0x73, 0xef, 0xb1, 0xdd, 0xc9, 0xf8, 0xf8,
|
||||
0x17, 0xcb, 0x29, 0xd4, 0xef, 0x41, 0xad, 0x40, 0xcf, 0xb9, 0xb3, 0x8d, 0xfc, 0x9d, 0x55, 0xf3,
|
||||
0x39, 0xbe, 0x09, 0x8b, 0xf1, 0x79, 0x08, 0x81, 0x05, 0xce, 0x46, 0x98, 0xa8, 0x99, 0x75, 0xf3,
|
||||
0x73, 0xa8, 0x66, 0x5f, 0x3e, 0xd9, 0x05, 0x70, 0x04, 0xe7, 0xe8, 0x68, 0x21, 0xd3, 0xac, 0x9c,
|
||||
0x8d, 0x06, 0xdd, 0x94, 0xa2, 0x39, 0xa9, 0xe6, 0x1e, 0x54, 0x33, 0x62, 0x9e, 0x87, 0x08, 0xd3,
|
||||
0x93, 0x20, 0x0d, 0xcc, 0xac, 0x9b, 0xbf, 0x96, 0x21, 0x37, 0x26, 0xcc, 0x55, 0xdb, 0x84, 0x45,
|
||||
0x4f, 0xa9, 0x10, 0x65, 0xa2, 0x98, 0xec, 0x48, 0x0b, 0x2a, 0x8e, 0xef, 0x21, 0xd7, 0xfd, 0x9e,
|
||||
0x99, 0x44, 0xaa, 0x9d, 0x2b, 0xd3, 0xd3, 0xed, 0x4a, 0x37, 0xc1, 0x68, 0xc6, 0x92, 0x1d, 0x58,
|
||||
0x76, 0x7c, 0x2f, 0x25, 0xe2, 0x81, 0xa3, 0x53, 0x9b, 0x9e, 0x6e, 0x2f, 0x77, 0x0f, 0xfa, 0x99,
|
||||
0x7c, 0x5e, 0x26, 0x72, 0xaa, 0x1c, 0x11, 0x24, 0x63, 0x47, 0x95, 0x26, 0x3b, 0xf2, 0x12, 0x56,
|
||||
0x3c, 0xf7, 0xb9, 0x38, 0x41, 0xde, 0x35, 0x23, 0x98, 0xb5, 0x68, 0x72, 0x73, 0x7b, 0xce, 0x0c,
|
||||
0x64, 0xf7, 0xf3, 0x82, 0xe6, 0xba, 0x3a, 0xeb, 0xd3, 0xd3, 0xed, 0x95, 0x7e, 0x2f, 0x87, 0xd3,
|
||||
0xf3, 0xf6, 0xc8, 0x5d, 0xb0, 0xd0, 0xb4, 0xf8, 0xe1, 0xa3, 0xee, 0xfd, 0xfd, 0x50, 0x0f, 0x91,
|
||||
0xeb, 0xa4, 0x93, 0xcc, 0xec, 0x51, 0xa1, 0x17, 0xf2, 0xf5, 0x09, 0x90, 0x59, 0x9f, 0x73, 0x4a,
|
||||
0xe4, 0xf1, 0xf9, 0xb6, 0xfe, 0xe4, 0xad, 0x6d, 0x1d, 0xcf, 0x9f, 0x76, 0x36, 0x40, 0x47, 0x83,
|
||||
0x9c, 0x6d, 0xec, 0xe7, 0x6a, 0x6b, 0xf7, 0xb7, 0x12, 0xd4, 0xd2, 0xfe, 0x7a, 0x86, 0x72, 0xec,
|
||||
0x39, 0x48, 0xbe, 0x84, 0xf2, 0x03, 0xd4, 0x64, 0x73, 0x66, 0x62, 0x33, 0x53, 0x6a, 0x7d, 0x7d,
|
||||
0x06, 0x6f, 0x5a, 0xdf, 0xff, 0xf9, 0xf7, 0x8f, 0x97, 0x08, 0x59, 0x33, 0x93, 0xf7, 0x78, 0x27,
|
||||
0x9b, 0x7a, 0xc9, 0x10, 0xe0, 0x01, 0x66, 0x5f, 0xf8, 0x45, 0x26, 0x1b, 0x33, 0x78, 0xa1, 0xd7,
|
||||
0x9b, 0x0d, 0xe3, 0xa1, 0x4e, 0xac, 0xa2, 0x87, 0x76, 0xd2, 0xe2, 0x9d, 0xee, 0xef, 0xd3, 0xad,
|
||||
0xd2, 0x1f, 0xd3, 0xad, 0xd2, 0x5f, 0xd3, 0xad, 0xd2, 0x37, 0x1f, 0xfd, 0xb7, 0x59, 0x3f, 0x2e,
|
||||
0xb5, 0xcc, 0xd8, 0xf1, 0xa2, 0x99, 0xcc, 0xf7, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x1a,
|
||||
0xe6, 0x75, 0x88, 0x0c, 0x00, 0x00,
|
||||
}
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
|
|
@ -1027,6 +1037,18 @@ func (m *Settings) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
|||
i -= len(m.XXX_unrecognized)
|
||||
copy(dAtA[i:], m.XXX_unrecognized)
|
||||
}
|
||||
if m.SyncWithReplaceAllowed {
|
||||
i--
|
||||
if m.SyncWithReplaceAllowed {
|
||||
dAtA[i] = 1
|
||||
} else {
|
||||
dAtA[i] = 0
|
||||
}
|
||||
i--
|
||||
dAtA[i] = 0x1
|
||||
i--
|
||||
dAtA[i] = 0xe8
|
||||
}
|
||||
if m.HydratorEnabled {
|
||||
i--
|
||||
if m.HydratorEnabled {
|
||||
|
|
@ -1847,6 +1869,9 @@ func (m *Settings) Size() (n int) {
|
|||
if m.HydratorEnabled {
|
||||
n += 3
|
||||
}
|
||||
if m.SyncWithReplaceAllowed {
|
||||
n += 3
|
||||
}
|
||||
if m.XXX_unrecognized != nil {
|
||||
n += len(m.XXX_unrecognized)
|
||||
}
|
||||
|
|
@ -3041,6 +3066,26 @@ func (m *Settings) Unmarshal(dAtA []byte) error {
|
|||
}
|
||||
}
|
||||
m.HydratorEnabled = bool(v != 0)
|
||||
case 29:
|
||||
if wireType != 0 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field SyncWithReplaceAllowed", wireType)
|
||||
}
|
||||
var v int
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowSettings
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
v |= int(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
m.SyncWithReplaceAllowed = bool(v != 0)
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipSettings(dAtA[iNdEx:])
|
||||
|
|
|
|||
|
|
@ -1071,7 +1071,7 @@ func newArgoCDServiceSet(a *ArgoCDServer) *ArgoCDServiceSet {
|
|||
|
||||
projectService := project.NewServer(a.Namespace, a.KubeClientset, a.AppClientset, a.enf, projectLock, a.sessionMgr, a.policyEnforcer, a.projInformer, a.settingsMgr, a.db, a.EnableK8sEvent)
|
||||
appsInAnyNamespaceEnabled := len(a.ApplicationNamespaces) > 0
|
||||
settingsService := settings.NewServer(a.settingsMgr, a.RepoClientset, a, a.DisableAuth, appsInAnyNamespaceEnabled, a.HydratorEnabled)
|
||||
settingsService := settings.NewServer(a.settingsMgr, a.RepoClientset, a, a.DisableAuth, appsInAnyNamespaceEnabled, a.HydratorEnabled, a.SyncWithReplaceAllowed)
|
||||
accountService := account.NewServer(a.sessionMgr, a.settingsMgr, a.enf)
|
||||
|
||||
notificationService := notification.NewServer(a.apiFactory)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ type Server struct {
|
|||
disableAuth bool
|
||||
appsInAnyNamespaceEnabled bool
|
||||
hydratorEnabled bool
|
||||
syncWithReplaceAllowed bool
|
||||
}
|
||||
|
||||
type Authenticator interface {
|
||||
|
|
@ -32,8 +33,8 @@ type Authenticator interface {
|
|||
}
|
||||
|
||||
// NewServer returns a new instance of the Settings service
|
||||
func NewServer(mgr *settings.SettingsManager, repoClient apiclient.Clientset, authenticator Authenticator, disableAuth, appsInAnyNamespaceEnabled bool, hydratorEnabled bool) *Server {
|
||||
return &Server{mgr: mgr, repoClient: repoClient, authenticator: authenticator, disableAuth: disableAuth, appsInAnyNamespaceEnabled: appsInAnyNamespaceEnabled, hydratorEnabled: hydratorEnabled}
|
||||
func NewServer(mgr *settings.SettingsManager, repoClient apiclient.Clientset, authenticator Authenticator, disableAuth, appsInAnyNamespaceEnabled bool, hydratorEnabled bool, syncWithReplaceAllowed bool) *Server {
|
||||
return &Server{mgr: mgr, repoClient: repoClient, authenticator: authenticator, disableAuth: disableAuth, appsInAnyNamespaceEnabled: appsInAnyNamespaceEnabled, hydratorEnabled: hydratorEnabled, syncWithReplaceAllowed: syncWithReplaceAllowed}
|
||||
}
|
||||
|
||||
// Get returns Argo CD settings
|
||||
|
|
@ -122,6 +123,7 @@ func (s *Server) Get(ctx context.Context, _ *settingspkg.SettingsQuery) (*settin
|
|||
AppsInAnyNamespaceEnabled: s.appsInAnyNamespaceEnabled,
|
||||
ImpersonationEnabled: argoCDSettings.ImpersonationEnabled,
|
||||
HydratorEnabled: s.hydratorEnabled,
|
||||
SyncWithReplaceAllowed: s.syncWithReplaceAllowed,
|
||||
}
|
||||
|
||||
if sessionmgr.LoggedIn(ctx) || s.disableAuth {
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ message Settings {
|
|||
string installationID = 26;
|
||||
repeated string additionalUrls = 27 [(gogoproto.customname) = "AdditionalURLs"];
|
||||
bool hydratorEnabled = 28;
|
||||
bool syncWithReplaceAllowed = 29;
|
||||
}
|
||||
|
||||
message GoogleAnalyticsConfig {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
import {Checkbox, Select, Tooltip} from 'argo-ui';
|
||||
import {Checkbox, DataLoader, Select, Tooltip} from 'argo-ui';
|
||||
import * as classNames from 'classnames';
|
||||
import * as React from 'react';
|
||||
import * as ReactForm from 'react-form';
|
||||
|
||||
import './application-sync-options.scss';
|
||||
import {services} from '../../../shared/services';
|
||||
|
||||
export const REPLACE_WARNING = `The resources will be synced using 'kubectl replace/create' command that is a potentially destructive action and might cause resources recreation. For example, it might cause a number of pods to be reset to the minimum number of replicas and cause them to become overloaded.`;
|
||||
export const FORCE_WARNING = `The resources will be synced using '--force' that is a potentially destructive action and will immediately remove resources from the API and bypasses graceful deletion. Immediate deletion of some resources may result in inconsistency or data loss.`;
|
||||
|
|
@ -111,9 +112,20 @@ export const ApplicationSyncOptions = (props: ApplicationSyncOptionProps) => (
|
|||
{render(props)}
|
||||
</div>
|
||||
))}
|
||||
<div className='small-12' style={optionStyle}>
|
||||
{booleanOption('Replace', 'Replace', false, props, false, REPLACE_WARNING)}
|
||||
</div>
|
||||
<DataLoader
|
||||
load={async () => {
|
||||
const settings = await services.authService.settings();
|
||||
return settings.syncWithReplaceAllowed;
|
||||
}}>
|
||||
{syncWithReplaceAllowed =>
|
||||
(syncWithReplaceAllowed && (
|
||||
<div className='small-12' style={optionStyle}>
|
||||
{booleanOption('Replace', 'Replace', false, props, false, REPLACE_WARNING)}
|
||||
</div>
|
||||
)) ||
|
||||
null
|
||||
}
|
||||
</DataLoader>
|
||||
</div>
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -584,6 +584,7 @@ export interface AuthSettings {
|
|||
execEnabled: boolean;
|
||||
appsInAnyNamespaceEnabled: boolean;
|
||||
hydratorEnabled: boolean;
|
||||
syncWithReplaceAllowed: boolean;
|
||||
}
|
||||
|
||||
export interface UserInfo {
|
||||
|
|
|
|||
Loading…
Reference in a new issue