diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index 52972f2cf8a75..d460c32afec63 100644 --- a/cmd/argocd/commands/app.go +++ b/cmd/argocd/commands/app.go @@ -115,6 +115,9 @@ func NewApplicationCreateCommand(clientOpts *argocdclient.ClientOptions) *cobra. if appOpts.destNamespace != "" { app.Spec.Destination.Namespace = appOpts.destNamespace } + if appOpts.namePrefix != "" { + app.Spec.Source.NamePrefix = appOpts.namePrefix + } setParameterOverrides(&app, appOpts.parameters) if len(appOpts.valuesFiles) > 0 { app.Spec.Source.ValuesFiles = appOpts.valuesFiles @@ -194,6 +197,9 @@ func NewApplicationGetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com if len(app.Spec.Source.ValuesFiles) > 0 { fmt.Printf(printOpFmtStr, "Helm Values:", strings.Join(app.Spec.Source.ValuesFiles, ",")) } + if len(app.Spec.Source.NamePrefix) > 0 { + fmt.Printf(printOpFmtStr, "Name Prefix:", app.Spec.Source.NamePrefix) + } var syncPolicy string if app.Spec.SyncPolicy != nil && app.Spec.SyncPolicy.Automated != nil { syncPolicy = "Automated" @@ -335,6 +341,8 @@ func NewApplicationSetCommand(clientOpts *argocdclient.ClientOptions) *cobra.Com app.Spec.Destination.Namespace = appOpts.destNamespace case "project": app.Spec.Project = appOpts.project + case "name-prefix": + app.Spec.Source.NamePrefix = appOpts.namePrefix case "sync-policy": switch appOpts.syncPolicy { case "automated": @@ -400,6 +408,7 @@ type appOptions struct { project string syncPolicy string autoPrune bool + namePrefix string } func addAppFlags(command *cobra.Command, opts *appOptions) { @@ -414,6 +423,7 @@ func addAppFlags(command *cobra.Command, opts *appOptions) { command.Flags().StringVar(&opts.project, "project", "", "Application project name") command.Flags().StringVar(&opts.syncPolicy, "sync-policy", "", "Set the sync policy (one of: automated, none)") command.Flags().BoolVar(&opts.autoPrune, "auto-prune", false, "Set automatic pruning when sync is automated") + command.Flags().StringVar(&opts.namePrefix, "name-prefix", "", "Set a prefix to add to resource names for kustomize and helm app") } // NewApplicationUnsetCommand returns a new instance of an `argocd app unset` command @@ -421,12 +431,13 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C var ( parameters []string valuesFiles []string + namePrefix bool ) var command = &cobra.Command{ Use: "unset APPNAME -p COMPONENT=PARAM", Short: "Unset application parameters", Run: func(c *cobra.Command, args []string) { - if len(args) != 1 || (len(parameters) == 0 && len(valuesFiles) == 0) { + if len(args) != 1 || (len(parameters) == 0 && len(valuesFiles) == 0 && !namePrefix) { c.HelpFunc()(c, args) os.Exit(1) } @@ -472,6 +483,10 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C } } } + if namePrefix { + app.Spec.Source.NamePrefix = "" + updated = true + } if !updated { return @@ -485,6 +500,8 @@ func NewApplicationUnsetCommand(clientOpts *argocdclient.ClientOptions) *cobra.C } command.Flags().StringArrayVarP(¶meters, "parameter", "p", []string{}, "unset a parameter override (e.g. -p guestbook=image)") command.Flags().StringArrayVar(&valuesFiles, "values", []string{}, "unset one or more helm values files") + command.Flags().BoolVar(&namePrefix, "name-prefix", false, "Unset the name prefix") + return command } diff --git a/controller/state.go b/controller/state.go index 472461fab0b90..601e43d042019 100644 --- a/controller/state.go +++ b/controller/state.go @@ -124,6 +124,7 @@ func (s *appStateManager) getTargetObjs(app *v1alpha1.Application, revision stri AppLabel: app.Name, ValueFiles: app.Spec.Source.ValuesFiles, Namespace: app.Spec.Destination.Namespace, + NamePrefix: app.Spec.Source.NamePrefix, }) if err != nil { return nil, nil, err diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index 080b4c3996596..6157b7b73fc67 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -30,7 +30,7 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package func (m *AWSAuthConfig) Reset() { *m = AWSAuthConfig{} } func (*AWSAuthConfig) ProtoMessage() {} func (*AWSAuthConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{0} + return fileDescriptor_generated_db1db77292b2c83a, []int{0} } func (m *AWSAuthConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -58,7 +58,7 @@ var xxx_messageInfo_AWSAuthConfig proto.InternalMessageInfo func (m *AppProject) Reset() { *m = AppProject{} } func (*AppProject) ProtoMessage() {} func (*AppProject) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{1} + return fileDescriptor_generated_db1db77292b2c83a, []int{1} } func (m *AppProject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -86,7 +86,7 @@ var xxx_messageInfo_AppProject proto.InternalMessageInfo func (m *AppProjectList) Reset() { *m = AppProjectList{} } func (*AppProjectList) ProtoMessage() {} func (*AppProjectList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{2} + return fileDescriptor_generated_db1db77292b2c83a, []int{2} } func (m *AppProjectList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,7 +114,7 @@ var xxx_messageInfo_AppProjectList proto.InternalMessageInfo func (m *AppProjectSpec) Reset() { *m = AppProjectSpec{} } func (*AppProjectSpec) ProtoMessage() {} func (*AppProjectSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{3} + return fileDescriptor_generated_db1db77292b2c83a, []int{3} } func (m *AppProjectSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -142,7 +142,7 @@ var xxx_messageInfo_AppProjectSpec proto.InternalMessageInfo func (m *Application) Reset() { *m = Application{} } func (*Application) ProtoMessage() {} func (*Application) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{4} + return fileDescriptor_generated_db1db77292b2c83a, []int{4} } func (m *Application) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -170,7 +170,7 @@ var xxx_messageInfo_Application proto.InternalMessageInfo func (m *ApplicationCondition) Reset() { *m = ApplicationCondition{} } func (*ApplicationCondition) ProtoMessage() {} func (*ApplicationCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{5} + return fileDescriptor_generated_db1db77292b2c83a, []int{5} } func (m *ApplicationCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -198,7 +198,7 @@ var xxx_messageInfo_ApplicationCondition proto.InternalMessageInfo func (m *ApplicationDestination) Reset() { *m = ApplicationDestination{} } func (*ApplicationDestination) ProtoMessage() {} func (*ApplicationDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{6} + return fileDescriptor_generated_db1db77292b2c83a, []int{6} } func (m *ApplicationDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -226,7 +226,7 @@ var xxx_messageInfo_ApplicationDestination proto.InternalMessageInfo func (m *ApplicationList) Reset() { *m = ApplicationList{} } func (*ApplicationList) ProtoMessage() {} func (*ApplicationList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{7} + return fileDescriptor_generated_db1db77292b2c83a, []int{7} } func (m *ApplicationList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -254,7 +254,7 @@ var xxx_messageInfo_ApplicationList proto.InternalMessageInfo func (m *ApplicationSource) Reset() { *m = ApplicationSource{} } func (*ApplicationSource) ProtoMessage() {} func (*ApplicationSource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{8} + return fileDescriptor_generated_db1db77292b2c83a, []int{8} } func (m *ApplicationSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -282,7 +282,7 @@ var xxx_messageInfo_ApplicationSource proto.InternalMessageInfo func (m *ApplicationSpec) Reset() { *m = ApplicationSpec{} } func (*ApplicationSpec) ProtoMessage() {} func (*ApplicationSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{9} + return fileDescriptor_generated_db1db77292b2c83a, []int{9} } func (m *ApplicationSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -310,7 +310,7 @@ var xxx_messageInfo_ApplicationSpec proto.InternalMessageInfo func (m *ApplicationStatus) Reset() { *m = ApplicationStatus{} } func (*ApplicationStatus) ProtoMessage() {} func (*ApplicationStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{10} + return fileDescriptor_generated_db1db77292b2c83a, []int{10} } func (m *ApplicationStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -338,7 +338,7 @@ var xxx_messageInfo_ApplicationStatus proto.InternalMessageInfo func (m *ApplicationWatchEvent) Reset() { *m = ApplicationWatchEvent{} } func (*ApplicationWatchEvent) ProtoMessage() {} func (*ApplicationWatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{11} + return fileDescriptor_generated_db1db77292b2c83a, []int{11} } func (m *ApplicationWatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -366,7 +366,7 @@ var xxx_messageInfo_ApplicationWatchEvent proto.InternalMessageInfo func (m *Cluster) Reset() { *m = Cluster{} } func (*Cluster) ProtoMessage() {} func (*Cluster) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{12} + return fileDescriptor_generated_db1db77292b2c83a, []int{12} } func (m *Cluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -394,7 +394,7 @@ var xxx_messageInfo_Cluster proto.InternalMessageInfo func (m *ClusterConfig) Reset() { *m = ClusterConfig{} } func (*ClusterConfig) ProtoMessage() {} func (*ClusterConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{13} + return fileDescriptor_generated_db1db77292b2c83a, []int{13} } func (m *ClusterConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -422,7 +422,7 @@ var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo func (m *ClusterList) Reset() { *m = ClusterList{} } func (*ClusterList) ProtoMessage() {} func (*ClusterList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{14} + return fileDescriptor_generated_db1db77292b2c83a, []int{14} } func (m *ClusterList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -450,7 +450,7 @@ var xxx_messageInfo_ClusterList proto.InternalMessageInfo func (m *ComparisonResult) Reset() { *m = ComparisonResult{} } func (*ComparisonResult) ProtoMessage() {} func (*ComparisonResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{15} + return fileDescriptor_generated_db1db77292b2c83a, []int{15} } func (m *ComparisonResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -478,7 +478,7 @@ var xxx_messageInfo_ComparisonResult proto.InternalMessageInfo func (m *ComponentParameter) Reset() { *m = ComponentParameter{} } func (*ComponentParameter) ProtoMessage() {} func (*ComponentParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{16} + return fileDescriptor_generated_db1db77292b2c83a, []int{16} } func (m *ComponentParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -506,7 +506,7 @@ var xxx_messageInfo_ComponentParameter proto.InternalMessageInfo func (m *ConnectionState) Reset() { *m = ConnectionState{} } func (*ConnectionState) ProtoMessage() {} func (*ConnectionState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{17} + return fileDescriptor_generated_db1db77292b2c83a, []int{17} } func (m *ConnectionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -534,7 +534,7 @@ var xxx_messageInfo_ConnectionState proto.InternalMessageInfo func (m *DeploymentInfo) Reset() { *m = DeploymentInfo{} } func (*DeploymentInfo) ProtoMessage() {} func (*DeploymentInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{18} + return fileDescriptor_generated_db1db77292b2c83a, []int{18} } func (m *DeploymentInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -562,7 +562,7 @@ var xxx_messageInfo_DeploymentInfo proto.InternalMessageInfo func (m *HealthStatus) Reset() { *m = HealthStatus{} } func (*HealthStatus) ProtoMessage() {} func (*HealthStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{19} + return fileDescriptor_generated_db1db77292b2c83a, []int{19} } func (m *HealthStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -590,7 +590,7 @@ var xxx_messageInfo_HealthStatus proto.InternalMessageInfo func (m *HookStatus) Reset() { *m = HookStatus{} } func (*HookStatus) ProtoMessage() {} func (*HookStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{20} + return fileDescriptor_generated_db1db77292b2c83a, []int{20} } func (m *HookStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -618,7 +618,7 @@ var xxx_messageInfo_HookStatus proto.InternalMessageInfo func (m *JWTToken) Reset() { *m = JWTToken{} } func (*JWTToken) ProtoMessage() {} func (*JWTToken) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{21} + return fileDescriptor_generated_db1db77292b2c83a, []int{21} } func (m *JWTToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -646,7 +646,7 @@ var xxx_messageInfo_JWTToken proto.InternalMessageInfo func (m *Operation) Reset() { *m = Operation{} } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{22} + return fileDescriptor_generated_db1db77292b2c83a, []int{22} } func (m *Operation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -674,7 +674,7 @@ var xxx_messageInfo_Operation proto.InternalMessageInfo func (m *OperationState) Reset() { *m = OperationState{} } func (*OperationState) ProtoMessage() {} func (*OperationState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{23} + return fileDescriptor_generated_db1db77292b2c83a, []int{23} } func (m *OperationState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -702,7 +702,7 @@ var xxx_messageInfo_OperationState proto.InternalMessageInfo func (m *ParameterOverrides) Reset() { *m = ParameterOverrides{} } func (*ParameterOverrides) ProtoMessage() {} func (*ParameterOverrides) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{24} + return fileDescriptor_generated_db1db77292b2c83a, []int{24} } func (m *ParameterOverrides) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -730,7 +730,7 @@ var xxx_messageInfo_ParameterOverrides proto.InternalMessageInfo func (m *ProjectRole) Reset() { *m = ProjectRole{} } func (*ProjectRole) ProtoMessage() {} func (*ProjectRole) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{25} + return fileDescriptor_generated_db1db77292b2c83a, []int{25} } func (m *ProjectRole) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -758,7 +758,7 @@ var xxx_messageInfo_ProjectRole proto.InternalMessageInfo func (m *Repository) Reset() { *m = Repository{} } func (*Repository) ProtoMessage() {} func (*Repository) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{26} + return fileDescriptor_generated_db1db77292b2c83a, []int{26} } func (m *Repository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -786,7 +786,7 @@ var xxx_messageInfo_Repository proto.InternalMessageInfo func (m *RepositoryList) Reset() { *m = RepositoryList{} } func (*RepositoryList) ProtoMessage() {} func (*RepositoryList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{27} + return fileDescriptor_generated_db1db77292b2c83a, []int{27} } func (m *RepositoryList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -814,7 +814,7 @@ var xxx_messageInfo_RepositoryList proto.InternalMessageInfo func (m *ResourceDetails) Reset() { *m = ResourceDetails{} } func (*ResourceDetails) ProtoMessage() {} func (*ResourceDetails) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{28} + return fileDescriptor_generated_db1db77292b2c83a, []int{28} } func (m *ResourceDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -842,7 +842,7 @@ var xxx_messageInfo_ResourceDetails proto.InternalMessageInfo func (m *ResourceNode) Reset() { *m = ResourceNode{} } func (*ResourceNode) ProtoMessage() {} func (*ResourceNode) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{29} + return fileDescriptor_generated_db1db77292b2c83a, []int{29} } func (m *ResourceNode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -870,7 +870,7 @@ var xxx_messageInfo_ResourceNode proto.InternalMessageInfo func (m *ResourceState) Reset() { *m = ResourceState{} } func (*ResourceState) ProtoMessage() {} func (*ResourceState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{30} + return fileDescriptor_generated_db1db77292b2c83a, []int{30} } func (m *ResourceState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -898,7 +898,7 @@ var xxx_messageInfo_ResourceState proto.InternalMessageInfo func (m *SyncOperation) Reset() { *m = SyncOperation{} } func (*SyncOperation) ProtoMessage() {} func (*SyncOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{31} + return fileDescriptor_generated_db1db77292b2c83a, []int{31} } func (m *SyncOperation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -926,7 +926,7 @@ var xxx_messageInfo_SyncOperation proto.InternalMessageInfo func (m *SyncOperationResource) Reset() { *m = SyncOperationResource{} } func (*SyncOperationResource) ProtoMessage() {} func (*SyncOperationResource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{32} + return fileDescriptor_generated_db1db77292b2c83a, []int{32} } func (m *SyncOperationResource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,7 +954,7 @@ var xxx_messageInfo_SyncOperationResource proto.InternalMessageInfo func (m *SyncOperationResult) Reset() { *m = SyncOperationResult{} } func (*SyncOperationResult) ProtoMessage() {} func (*SyncOperationResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{33} + return fileDescriptor_generated_db1db77292b2c83a, []int{33} } func (m *SyncOperationResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -982,7 +982,7 @@ var xxx_messageInfo_SyncOperationResult proto.InternalMessageInfo func (m *SyncPolicy) Reset() { *m = SyncPolicy{} } func (*SyncPolicy) ProtoMessage() {} func (*SyncPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{34} + return fileDescriptor_generated_db1db77292b2c83a, []int{34} } func (m *SyncPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1010,7 +1010,7 @@ var xxx_messageInfo_SyncPolicy proto.InternalMessageInfo func (m *SyncPolicyAutomated) Reset() { *m = SyncPolicyAutomated{} } func (*SyncPolicyAutomated) ProtoMessage() {} func (*SyncPolicyAutomated) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{35} + return fileDescriptor_generated_db1db77292b2c83a, []int{35} } func (m *SyncPolicyAutomated) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1038,7 +1038,7 @@ var xxx_messageInfo_SyncPolicyAutomated proto.InternalMessageInfo func (m *SyncStrategy) Reset() { *m = SyncStrategy{} } func (*SyncStrategy) ProtoMessage() {} func (*SyncStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{36} + return fileDescriptor_generated_db1db77292b2c83a, []int{36} } func (m *SyncStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1066,7 +1066,7 @@ var xxx_messageInfo_SyncStrategy proto.InternalMessageInfo func (m *SyncStrategyApply) Reset() { *m = SyncStrategyApply{} } func (*SyncStrategyApply) ProtoMessage() {} func (*SyncStrategyApply) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{37} + return fileDescriptor_generated_db1db77292b2c83a, []int{37} } func (m *SyncStrategyApply) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1094,7 +1094,7 @@ var xxx_messageInfo_SyncStrategyApply proto.InternalMessageInfo func (m *SyncStrategyHook) Reset() { *m = SyncStrategyHook{} } func (*SyncStrategyHook) ProtoMessage() {} func (*SyncStrategyHook) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{38} + return fileDescriptor_generated_db1db77292b2c83a, []int{38} } func (m *SyncStrategyHook) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1122,7 +1122,7 @@ var xxx_messageInfo_SyncStrategyHook proto.InternalMessageInfo func (m *TLSClientConfig) Reset() { *m = TLSClientConfig{} } func (*TLSClientConfig) ProtoMessage() {} func (*TLSClientConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_eab4c1f625372278, []int{39} + return fileDescriptor_generated_db1db77292b2c83a, []int{39} } func (m *TLSClientConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1572,6 +1572,10 @@ func (m *ApplicationSource) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } + dAtA[i] = 0x3a + i++ + i = encodeVarintGenerated(dAtA, i, uint64(len(m.NamePrefix))) + i += copy(dAtA[i:], m.NamePrefix) return i, nil } @@ -2985,6 +2989,8 @@ func (m *ApplicationSource) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } + l = len(m.NamePrefix) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -3578,6 +3584,7 @@ func (this *ApplicationSource) String() string { `TargetRevision:` + fmt.Sprintf("%v", this.TargetRevision) + `,`, `ComponentParameterOverrides:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ComponentParameterOverrides), "ComponentParameter", "ComponentParameter", 1), `&`, ``, 1) + `,`, `ValuesFiles:` + fmt.Sprintf("%v", this.ValuesFiles) + `,`, + `NamePrefix:` + fmt.Sprintf("%v", this.NamePrefix) + `,`, `}`, }, "") return s @@ -5227,6 +5234,35 @@ func (m *ApplicationSource) Unmarshal(dAtA []byte) error { } m.ValuesFiles = append(m.ValuesFiles, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NamePrefix", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NamePrefix = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -9887,184 +9923,186 @@ var ( ) func init() { - proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_eab4c1f625372278) -} - -var fileDescriptor_generated_eab4c1f625372278 = []byte{ - // 2785 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0x24, 0x47, - 0x15, 0x76, 0xcf, 0x8f, 0x3d, 0xf3, 0xc6, 0xf6, 0xee, 0x56, 0x7e, 0x18, 0x1c, 0xc9, 0xb6, 0x7a, - 0xf9, 0x09, 0x28, 0x19, 0xb3, 0x16, 0x81, 0x10, 0x10, 0x92, 0x7b, 0xbc, 0x1b, 0x3b, 0xde, 0xf5, - 0x9a, 0x1a, 0x27, 0x2b, 0x85, 0x28, 0xd0, 0xdb, 0x53, 0x9e, 0xe9, 0x9d, 0x99, 0xee, 0x4e, 0x57, - 0x8f, 0x37, 0x23, 0x14, 0xb4, 0x11, 0x02, 0x81, 0x00, 0x09, 0x88, 0x10, 0x48, 0x5c, 0x22, 0x04, - 0x17, 0xce, 0x11, 0x07, 0x6e, 0x70, 0x40, 0x39, 0xe6, 0x00, 0x22, 0x5a, 0x22, 0x8b, 0x75, 0x2e, - 0xdc, 0x10, 0xd7, 0x9c, 0x50, 0xfd, 0x74, 0x57, 0x75, 0xcf, 0xcc, 0xda, 0xbb, 0x33, 0xbb, 0xc0, - 0x6d, 0xba, 0xde, 0xeb, 0xf7, 0xbd, 0x7e, 0xf5, 0xea, 0xfd, 0xd5, 0xc0, 0x76, 0xcb, 0x8d, 0xda, - 0xfd, 0xeb, 0x35, 0xc7, 0xef, 0xad, 0xd9, 0x61, 0xcb, 0x0f, 0x42, 0xff, 0x06, 0xff, 0xf1, 0xb4, - 0xd3, 0x5c, 0x0b, 0x3a, 0xad, 0x35, 0x3b, 0x70, 0xe9, 0x9a, 0x1d, 0x04, 0x5d, 0xd7, 0xb1, 0x23, - 0xd7, 0xf7, 0xd6, 0x0e, 0x2f, 0xd8, 0xdd, 0xa0, 0x6d, 0x5f, 0x58, 0x6b, 0x11, 0x8f, 0x84, 0x76, - 0x44, 0x9a, 0xb5, 0x20, 0xf4, 0x23, 0x1f, 0x7d, 0x49, 0x89, 0xaa, 0xc5, 0xa2, 0xf8, 0x8f, 0x6f, - 0x38, 0xcd, 0x5a, 0xd0, 0x69, 0xd5, 0x98, 0xa8, 0x9a, 0x26, 0xaa, 0x16, 0x8b, 0x5a, 0x7a, 0x5a, - 0xd3, 0xa2, 0xe5, 0xb7, 0xfc, 0x35, 0x2e, 0xf1, 0x7a, 0xff, 0x80, 0x3f, 0xf1, 0x07, 0xfe, 0x4b, - 0x20, 0x2d, 0x7d, 0xbe, 0xf3, 0x2c, 0xad, 0xb9, 0x3e, 0xd3, 0xad, 0x67, 0x3b, 0x6d, 0xd7, 0x23, - 0xe1, 0x40, 0x29, 0xdb, 0x23, 0x91, 0xbd, 0x76, 0x38, 0xa4, 0xdf, 0xd2, 0xda, 0xb8, 0xb7, 0xc2, - 0xbe, 0x17, 0xb9, 0x3d, 0x32, 0xf4, 0xc2, 0x17, 0x4e, 0x7a, 0x81, 0x3a, 0x6d, 0xd2, 0xb3, 0xb3, - 0xef, 0x99, 0xaf, 0xc1, 0xc2, 0xc6, 0xb5, 0xc6, 0x46, 0x3f, 0x6a, 0xd7, 0x7d, 0xef, 0xc0, 0x6d, - 0xa1, 0x67, 0xa0, 0xe2, 0x74, 0xfb, 0x34, 0x22, 0xe1, 0xae, 0xdd, 0x23, 0x55, 0x63, 0xd5, 0x78, - 0xb2, 0x6c, 0x3d, 0xf2, 0xee, 0xd1, 0xca, 0xcc, 0xf1, 0xd1, 0x4a, 0xa5, 0xae, 0x48, 0x58, 0xe7, - 0x43, 0x9f, 0x81, 0xb9, 0xd0, 0xef, 0x92, 0x0d, 0xbc, 0x5b, 0xcd, 0xf1, 0x57, 0xce, 0xc8, 0x57, - 0xe6, 0xb0, 0x58, 0xc6, 0x31, 0xdd, 0xfc, 0xbb, 0x01, 0xb0, 0x11, 0x04, 0x7b, 0xa1, 0x7f, 0x83, - 0x38, 0x11, 0xfa, 0x26, 0x94, 0x98, 0x15, 0x9a, 0x76, 0x64, 0x73, 0xb4, 0xca, 0xfa, 0xe7, 0x6a, - 0xe2, 0x63, 0x6a, 0xfa, 0xc7, 0xa8, 0x5d, 0x61, 0xdc, 0xb5, 0xc3, 0x0b, 0xb5, 0xab, 0xd7, 0xd9, - 0xfb, 0x57, 0x48, 0x64, 0x5b, 0x48, 0x82, 0x81, 0x5a, 0xc3, 0x89, 0x54, 0xd4, 0x81, 0x02, 0x0d, - 0x88, 0xc3, 0x15, 0xab, 0xac, 0x6f, 0xd7, 0xee, 0x7b, 0xef, 0x6b, 0x4a, 0xed, 0x46, 0x40, 0x1c, - 0x6b, 0x5e, 0xc2, 0x16, 0xd8, 0x13, 0xe6, 0x20, 0xe6, 0x6d, 0x03, 0x16, 0x15, 0xdb, 0x65, 0x97, - 0x46, 0xe8, 0x95, 0xa1, 0x2f, 0xac, 0x9d, 0xee, 0x0b, 0xd9, 0xdb, 0xfc, 0xfb, 0xce, 0x4a, 0xa0, - 0x52, 0xbc, 0xa2, 0x7d, 0xdd, 0x0d, 0x28, 0xba, 0x11, 0xe9, 0xd1, 0x6a, 0x6e, 0x35, 0xff, 0x64, - 0x65, 0xfd, 0xe2, 0x54, 0x3e, 0xcf, 0x5a, 0x90, 0x88, 0xc5, 0x6d, 0x26, 0x1b, 0x0b, 0x08, 0xf3, - 0x57, 0x45, 0xfd, 0xe3, 0xd8, 0x57, 0xa3, 0x0b, 0x50, 0xa1, 0x7e, 0x3f, 0x74, 0x08, 0x26, 0x81, - 0x4f, 0xab, 0xc6, 0x6a, 0x9e, 0x6d, 0x3e, 0xf3, 0x95, 0x86, 0x5a, 0xc6, 0x3a, 0x0f, 0xfa, 0xa1, - 0x01, 0xf3, 0x4d, 0x42, 0x23, 0xd7, 0xe3, 0xf8, 0xb1, 0xe6, 0x5f, 0x9b, 0x4c, 0xf3, 0x78, 0x71, - 0x53, 0x49, 0xb6, 0x1e, 0x95, 0x5f, 0x31, 0xaf, 0x2d, 0x52, 0x9c, 0x02, 0x67, 0x0e, 0xdf, 0x24, - 0xd4, 0x09, 0xdd, 0x80, 0x3d, 0x57, 0xf3, 0x69, 0x87, 0xdf, 0x54, 0x24, 0xac, 0xf3, 0xa1, 0x0e, - 0x14, 0x99, 0x43, 0xd3, 0x6a, 0x81, 0x2b, 0x7f, 0x69, 0x02, 0xe5, 0xa5, 0x39, 0xd9, 0x41, 0x51, - 0x76, 0x67, 0x4f, 0x14, 0x0b, 0x0c, 0xf4, 0x63, 0x03, 0xaa, 0xf2, 0xb4, 0x61, 0x22, 0x4c, 0x79, - 0xad, 0xed, 0x46, 0xa4, 0xeb, 0xd2, 0xa8, 0x5a, 0xe4, 0x0a, 0xac, 0x9d, 0xce, 0xa5, 0x9e, 0x0f, - 0xfd, 0x7e, 0xb0, 0xe3, 0x7a, 0x4d, 0x6b, 0x55, 0x22, 0x55, 0xeb, 0x63, 0x04, 0xe3, 0xb1, 0x90, - 0xe8, 0x2d, 0x03, 0x96, 0x3c, 0xbb, 0x47, 0x68, 0x60, 0xb3, 0x4d, 0x15, 0x64, 0xab, 0x6b, 0x3b, - 0x1d, 0xae, 0xd1, 0xec, 0xfd, 0x69, 0x64, 0x4a, 0x8d, 0x96, 0x76, 0xc7, 0x8a, 0xc6, 0x77, 0x81, - 0x35, 0xff, 0x9c, 0x87, 0x8a, 0xe6, 0x08, 0x0f, 0x21, 0xb2, 0x74, 0x53, 0x91, 0xe5, 0x85, 0xe9, - 0x38, 0xf0, 0xb8, 0xd0, 0x82, 0x22, 0x98, 0xa5, 0x91, 0x1d, 0xf5, 0x29, 0x77, 0xd2, 0xca, 0xfa, - 0xe5, 0x29, 0xe1, 0x71, 0x99, 0xd6, 0xa2, 0x44, 0x9c, 0x15, 0xcf, 0x58, 0x62, 0xa1, 0xd7, 0xa0, - 0xec, 0x07, 0x2c, 0x67, 0xb0, 0xd3, 0x51, 0xe0, 0xc0, 0x9b, 0x13, 0x00, 0x5f, 0x8d, 0x65, 0x59, - 0x0b, 0xc7, 0x47, 0x2b, 0xe5, 0xe4, 0x11, 0x2b, 0x14, 0xd3, 0x81, 0x47, 0x35, 0xfd, 0xea, 0xbe, - 0xd7, 0x74, 0xf9, 0x86, 0xae, 0x42, 0x21, 0x1a, 0x04, 0x71, 0x52, 0x4a, 0x4c, 0xb4, 0x3f, 0x08, - 0x08, 0xe6, 0x14, 0x96, 0x86, 0x7a, 0x84, 0x52, 0xbb, 0x45, 0xb2, 0x69, 0xe8, 0x8a, 0x58, 0xc6, - 0x31, 0xdd, 0x7c, 0x0d, 0x1e, 0x1f, 0x1d, 0x35, 0xd0, 0xa7, 0x60, 0x96, 0x92, 0xf0, 0x90, 0x84, - 0x12, 0x48, 0x59, 0x86, 0xaf, 0x62, 0x49, 0x45, 0x6b, 0x50, 0x4e, 0xbc, 0x51, 0xc2, 0x9d, 0x93, - 0xac, 0x65, 0xe5, 0xc2, 0x8a, 0xc7, 0xfc, 0xc0, 0x80, 0x33, 0x1a, 0xe6, 0x43, 0x48, 0x0e, 0x9d, - 0x74, 0x72, 0xb8, 0x34, 0x1d, 0x8f, 0x19, 0x93, 0x1d, 0xfe, 0x98, 0x87, 0x73, 0xba, 0x5f, 0xf1, - 0xe3, 0xc9, 0x2b, 0x03, 0x12, 0xf8, 0x2f, 0xe2, 0xcb, 0xd2, 0x9c, 0xaa, 0x32, 0x10, 0xcb, 0x38, - 0xa6, 0xb3, 0xfd, 0x0d, 0xec, 0xa8, 0x2d, 0x6d, 0x99, 0xec, 0xef, 0x9e, 0x1d, 0xb5, 0x31, 0xa7, - 0xb0, 0x60, 0x4d, 0xbc, 0x43, 0x37, 0xf4, 0xbd, 0x1e, 0xf1, 0xa2, 0x6c, 0xb0, 0xbe, 0xa8, 0x48, - 0x58, 0xe7, 0x43, 0x5f, 0x85, 0xc5, 0xc8, 0x0e, 0x5b, 0x24, 0xc2, 0xe4, 0xd0, 0xa5, 0xb1, 0x23, - 0x97, 0xad, 0xc7, 0xe5, 0x9b, 0x8b, 0xfb, 0x29, 0x2a, 0xce, 0x70, 0xa3, 0x77, 0x0c, 0x78, 0xc2, - 0xf1, 0x7b, 0x81, 0xef, 0x11, 0x2f, 0xda, 0xb3, 0x43, 0xbb, 0x47, 0x22, 0x12, 0x5e, 0x3d, 0x24, - 0x61, 0xe8, 0x36, 0x09, 0x95, 0x21, 0xf8, 0xca, 0x04, 0xd6, 0xad, 0x0f, 0x49, 0xb7, 0xce, 0x4b, - 0xe5, 0x9e, 0xa8, 0x8f, 0x47, 0xc6, 0x77, 0x53, 0x8b, 0xe5, 0xe6, 0x43, 0xbb, 0xdb, 0x27, 0xf4, - 0x92, 0xcb, 0x32, 0xd5, 0xac, 0xca, 0xcd, 0x2f, 0xa9, 0x65, 0xac, 0xf3, 0x98, 0xef, 0xe4, 0x53, - 0x2e, 0xda, 0x88, 0xe3, 0x0e, 0xdf, 0x4b, 0xe9, 0xa0, 0xd3, 0x8a, 0x3b, 0x22, 0x7c, 0xab, 0xd3, - 0x25, 0x4a, 0x04, 0x89, 0x85, 0xbe, 0x6f, 0xf0, 0xc4, 0x1c, 0x9f, 0x4a, 0x19, 0x63, 0x1f, 0x40, - 0x91, 0xa0, 0xe7, 0xfa, 0x78, 0x11, 0xeb, 0xd0, 0xcc, 0x85, 0x03, 0x91, 0xa3, 0xa5, 0xc7, 0x25, - 0x2e, 0x1c, 0xa7, 0xee, 0x98, 0x8e, 0xfa, 0x00, 0x74, 0xe0, 0x39, 0x7b, 0x7e, 0xd7, 0x75, 0x06, - 0x32, 0x5c, 0x4e, 0x52, 0x92, 0x35, 0x12, 0x61, 0xd6, 0x22, 0x4b, 0x43, 0xea, 0x19, 0x6b, 0x40, - 0xe6, 0xdb, 0xb3, 0xe9, 0xa3, 0x27, 0x42, 0xf7, 0x4f, 0x0d, 0x38, 0xcb, 0xfc, 0xc3, 0x0e, 0x5d, - 0xea, 0x7b, 0x98, 0xd0, 0x7e, 0x37, 0x92, 0x7b, 0xb8, 0x33, 0xa1, 0xaf, 0xea, 0x22, 0xad, 0xaa, - 0x34, 0xc7, 0xd9, 0x2c, 0x05, 0x0f, 0xc1, 0xa3, 0x08, 0xe6, 0xda, 0x2e, 0x8d, 0xfc, 0x70, 0x20, - 0x63, 0xd2, 0x24, 0xf5, 0xf8, 0x26, 0x09, 0xba, 0xfe, 0x80, 0x1d, 0xf1, 0x6d, 0xef, 0xc0, 0x57, - 0xdb, 0xb2, 0x25, 0x10, 0x70, 0x0c, 0x85, 0xde, 0x34, 0x00, 0x82, 0xf8, 0x80, 0xb0, 0xfc, 0xf9, - 0x00, 0xce, 0x6b, 0x52, 0x2a, 0x24, 0x4b, 0x14, 0x6b, 0xa0, 0xc8, 0x87, 0xd9, 0x36, 0xb1, 0xbb, - 0x51, 0x5b, 0xba, 0xc5, 0xf3, 0x13, 0xc0, 0x6f, 0x71, 0x41, 0xd9, 0xcc, 0x2d, 0x56, 0xb1, 0x84, - 0x41, 0xdf, 0x35, 0x60, 0x31, 0x49, 0xaa, 0x8c, 0x97, 0x54, 0x8b, 0x13, 0xb7, 0x40, 0x57, 0x53, - 0x02, 0x2d, 0xc4, 0xa2, 0x67, 0x7a, 0x0d, 0x67, 0x40, 0xd1, 0x77, 0x0c, 0x00, 0x27, 0x4e, 0xe2, - 0x54, 0x56, 0x87, 0x57, 0xa7, 0x73, 0x90, 0x93, 0xe2, 0x40, 0x99, 0x3f, 0x59, 0xa2, 0x58, 0x83, - 0x35, 0x3f, 0x34, 0xe0, 0x31, 0xed, 0xc5, 0x6b, 0x76, 0xe4, 0xb4, 0x2f, 0x1e, 0xb2, 0xec, 0xb0, - 0x93, 0x2a, 0x2b, 0xbe, 0xa8, 0x97, 0x15, 0x1f, 0x1d, 0xad, 0x7c, 0x7a, 0x5c, 0x67, 0x7d, 0x93, - 0x49, 0xa8, 0x71, 0x11, 0x5a, 0x05, 0xf2, 0x06, 0x54, 0x34, 0x9d, 0x65, 0xd4, 0x9a, 0x56, 0xde, - 0x4d, 0x42, 0x95, 0xb6, 0x88, 0x75, 0x3c, 0xf3, 0xaf, 0x39, 0x98, 0x93, 0x05, 0xfd, 0xa9, 0xeb, - 0x98, 0x55, 0x28, 0xb0, 0x1a, 0x25, 0x9b, 0x76, 0x79, 0x93, 0xcf, 0x29, 0x28, 0x80, 0x59, 0x87, - 0x8f, 0x07, 0x64, 0xe5, 0xb9, 0x35, 0xc9, 0xc9, 0x11, 0xda, 0x89, 0x71, 0x83, 0xd2, 0x49, 0x3c, - 0x63, 0x89, 0xc3, 0x3a, 0x9e, 0x33, 0x8e, 0xef, 0x79, 0xc4, 0x51, 0xce, 0x5b, 0x98, 0xb8, 0xca, - 0xae, 0xa7, 0x25, 0x5a, 0x1f, 0x93, 0xe8, 0x67, 0x32, 0x04, 0x9c, 0xc5, 0x36, 0x7f, 0x9f, 0x87, - 0x85, 0x94, 0xe6, 0xe8, 0x29, 0x28, 0xf5, 0x29, 0x09, 0x3d, 0x35, 0x25, 0x49, 0x0a, 0xb1, 0x17, - 0xe5, 0x3a, 0x4e, 0x38, 0x18, 0x77, 0x60, 0x53, 0x7a, 0xd3, 0x0f, 0x9b, 0xd2, 0xce, 0x09, 0xf7, - 0x9e, 0x5c, 0xc7, 0x09, 0x07, 0x2b, 0x73, 0xae, 0x13, 0x3b, 0x24, 0xe1, 0xbe, 0xdf, 0x21, 0x43, - 0x3d, 0xa9, 0xa5, 0x48, 0x58, 0xe7, 0xe3, 0x46, 0x8b, 0xba, 0xb4, 0xde, 0x75, 0x89, 0x17, 0x09, - 0x35, 0xa7, 0x60, 0xb4, 0xfd, 0xcb, 0x0d, 0x5d, 0xa2, 0x32, 0x5a, 0x86, 0x80, 0xb3, 0xd8, 0x2c, - 0xea, 0x2e, 0xd8, 0x37, 0xa9, 0x9a, 0x2e, 0xc9, 0xf8, 0x33, 0x89, 0xfb, 0xa4, 0xa6, 0x55, 0xd6, - 0xb9, 0xe3, 0xa3, 0x95, 0xf4, 0x00, 0x0b, 0xa7, 0x11, 0xcd, 0xbf, 0x18, 0x10, 0x4f, 0xad, 0x1e, - 0x42, 0xbd, 0xdd, 0x4a, 0xd7, 0xdb, 0xd6, 0xe4, 0xe7, 0x64, 0x4c, 0xad, 0x7d, 0x3b, 0x0f, 0x43, - 0xd9, 0x16, 0xbd, 0xca, 0xe2, 0x2c, 0x5b, 0x23, 0xcd, 0x8d, 0x38, 0xd1, 0x7f, 0xf6, 0x74, 0x5f, - 0xb7, 0xef, 0xf6, 0x88, 0x1e, 0x42, 0x63, 0x29, 0x58, 0x93, 0x88, 0x6e, 0x19, 0x0a, 0x60, 0xdf, - 0x97, 0xb1, 0x6d, 0xba, 0xd5, 0xe0, 0x90, 0x0a, 0xfb, 0x3e, 0xd6, 0x30, 0xd1, 0x73, 0x49, 0x0f, - 0x5c, 0xe4, 0x87, 0xc2, 0x4c, 0x77, 0xad, 0x1f, 0xa5, 0x8a, 0x90, 0x4c, 0x27, 0x3b, 0x80, 0x72, - 0x28, 0x87, 0x06, 0x71, 0x16, 0x9a, 0xc4, 0x13, 0xe3, 0x01, 0x84, 0x08, 0x25, 0x49, 0xe7, 0x17, - 0x2f, 0x53, 0xac, 0xd0, 0xd8, 0xf1, 0x0f, 0xe3, 0xd6, 0x63, 0x2e, 0x7d, 0xfc, 0x93, 0xa6, 0x23, - 0xe1, 0x30, 0x7f, 0x64, 0x00, 0x1a, 0x2e, 0x30, 0x58, 0xbf, 0x99, 0x54, 0xfb, 0x32, 0xe4, 0x24, - 0xa8, 0x09, 0x3b, 0x56, 0x3c, 0xa7, 0x08, 0xec, 0xe7, 0xa1, 0xc8, 0xab, 0x7f, 0x19, 0x62, 0x12, - 0x5f, 0xe3, 0xfd, 0x01, 0x16, 0x34, 0xf3, 0x4f, 0x06, 0x64, 0x03, 0x24, 0xcf, 0x2d, 0x62, 0x1f, - 0xb2, 0xb9, 0x25, 0x6d, 0xf3, 0xd3, 0x37, 0xe4, 0xe8, 0x15, 0xa8, 0xd8, 0x51, 0x44, 0x7a, 0x41, - 0xc4, 0xdd, 0x37, 0x7f, 0xcf, 0xee, 0xcb, 0x0b, 0xe4, 0x2b, 0x7e, 0xd3, 0x3d, 0x70, 0xb9, 0xeb, - 0xea, 0xe2, 0xcc, 0x7f, 0xe7, 0x60, 0x31, 0x5d, 0x2e, 0xa6, 0x36, 0x25, 0x77, 0xd2, 0xa6, 0x9c, - 0xd8, 0x03, 0xe6, 0xff, 0x37, 0x7b, 0xc0, 0x57, 0x01, 0x9a, 0xfc, 0xb3, 0xb9, 0x51, 0x0b, 0xf7, - 0x1f, 0x13, 0x36, 0x13, 0x29, 0x58, 0x93, 0x88, 0x96, 0x20, 0xe7, 0x36, 0xf9, 0x61, 0xcc, 0x5b, - 0x20, 0x79, 0x73, 0xdb, 0x9b, 0x38, 0xe7, 0x36, 0x4d, 0x0a, 0xf3, 0x7a, 0xa1, 0x7a, 0x6a, 0xa7, - 0xf9, 0x32, 0x2c, 0x88, 0x5f, 0x9b, 0x24, 0xb2, 0xdd, 0x2e, 0x95, 0xbb, 0xf3, 0x98, 0x64, 0x5f, - 0x68, 0xe8, 0x44, 0x9c, 0xe6, 0x35, 0x7f, 0x91, 0x03, 0xd8, 0xf2, 0xfd, 0x8e, 0xc4, 0x8c, 0xcf, - 0x80, 0x31, 0xf6, 0x0c, 0xac, 0x42, 0xa1, 0xe3, 0x7a, 0xcd, 0xec, 0x29, 0xd9, 0x71, 0xbd, 0x26, - 0xe6, 0x14, 0xb4, 0x0e, 0x60, 0x07, 0xee, 0x4b, 0x24, 0xa4, 0x6a, 0x42, 0x9c, 0xd8, 0x65, 0x63, - 0x6f, 0x5b, 0x52, 0xb0, 0xc6, 0x85, 0x9e, 0x92, 0x45, 0xa5, 0x18, 0x34, 0x54, 0x33, 0x45, 0x65, - 0x89, 0x69, 0xa8, 0x55, 0x8d, 0xcf, 0x66, 0xc2, 0xda, 0xea, 0x50, 0x58, 0x53, 0x45, 0xf6, 0x5e, - 0xdb, 0xa6, 0x64, 0xd4, 0x01, 0x9b, 0x3d, 0x61, 0xe2, 0xd5, 0x80, 0xd2, 0x0b, 0xd7, 0xf6, 0x45, - 0xa9, 0x60, 0x42, 0xde, 0xb5, 0x45, 0x14, 0xc9, 0x2b, 0xb7, 0xdf, 0xa6, 0xb4, 0xcf, 0x77, 0x98, - 0x11, 0xd1, 0x79, 0xc8, 0x93, 0xd7, 0x03, 0x6e, 0x97, 0xbc, 0x8a, 0x34, 0x17, 0x5f, 0x0f, 0xdc, - 0x90, 0x50, 0xc6, 0x44, 0x5e, 0x0f, 0x4c, 0x0a, 0x6a, 0x86, 0x87, 0x0e, 0xa0, 0xc0, 0x9a, 0x52, - 0x99, 0x7a, 0xb6, 0x26, 0xec, 0x7b, 0xd5, 0xa8, 0xb0, 0xc4, 0x27, 0xa1, 0x03, 0xcf, 0xc1, 0x5c, - 0xbe, 0xf9, 0xeb, 0x02, 0x64, 0x9a, 0x0e, 0xd4, 0xd7, 0xc7, 0x94, 0xc6, 0x14, 0xc7, 0x94, 0xc9, - 0x87, 0x8f, 0x1a, 0x55, 0xa2, 0x67, 0xa0, 0x18, 0xb0, 0xfd, 0x90, 0xde, 0xb3, 0x12, 0x07, 0x50, - 0xbe, 0x49, 0x23, 0xb6, 0x4d, 0x70, 0xeb, 0xbb, 0x96, 0x3f, 0x21, 0x2c, 0x7e, 0x5b, 0x4c, 0x14, - 0x64, 0xf7, 0x2e, 0x0e, 0xf0, 0xee, 0xb4, 0x2c, 0x2b, 0x1b, 0xf8, 0x64, 0xb4, 0x20, 0xdb, 0x76, - 0x0d, 0x11, 0x7d, 0x1d, 0xca, 0x34, 0xb2, 0x43, 0x11, 0x94, 0x67, 0xef, 0x39, 0x7e, 0x24, 0xe6, - 0x6b, 0xc4, 0x42, 0xb0, 0x92, 0x87, 0x5e, 0x06, 0x38, 0x70, 0x3d, 0x97, 0xb6, 0xb9, 0xf4, 0xb9, - 0xfb, 0x0b, 0xf9, 0x97, 0x12, 0x09, 0x58, 0x93, 0x66, 0xfe, 0xcc, 0x00, 0x34, 0x22, 0x20, 0x86, - 0x71, 0x89, 0x66, 0x3c, 0x88, 0x80, 0x3d, 0xb2, 0x5a, 0x7b, 0xae, 0xf4, 0xcb, 0xb7, 0x57, 0x66, - 0x6e, 0x7d, 0xb0, 0x3a, 0x63, 0x7e, 0x2f, 0x07, 0x15, 0xed, 0xbe, 0xe7, 0x14, 0xe1, 0x29, 0x73, - 0x3f, 0x95, 0x3b, 0xe5, 0xfd, 0xd4, 0x93, 0x50, 0x0a, 0xfc, 0xae, 0xeb, 0xb8, 0x32, 0x35, 0x95, - 0xad, 0x79, 0xde, 0x6c, 0xc8, 0x35, 0x9c, 0x50, 0x51, 0x04, 0xe5, 0x1b, 0x37, 0x23, 0x1e, 0x16, - 0xe2, 0xdb, 0xac, 0xfa, 0x04, 0x46, 0x89, 0x43, 0x8c, 0xda, 0xf9, 0x78, 0x85, 0x62, 0x05, 0x64, - 0xfe, 0x2d, 0x07, 0xc0, 0xaf, 0x03, 0x5d, 0x3e, 0xa0, 0x59, 0x85, 0x42, 0x48, 0x02, 0x3f, 0x6b, - 0x07, 0xc6, 0x81, 0x39, 0x25, 0xd5, 0x6f, 0xe5, 0xee, 0xa9, 0xdf, 0xca, 0x9f, 0xd8, 0x6f, 0xb1, - 0x84, 0x43, 0xdb, 0x7b, 0xa1, 0x7b, 0x68, 0x47, 0x64, 0x87, 0x0c, 0x64, 0xd4, 0x56, 0x09, 0xa7, - 0xb1, 0xa5, 0x88, 0x38, 0xcd, 0x3b, 0xb2, 0x55, 0x2d, 0xfe, 0x17, 0x5b, 0xd5, 0xdb, 0x06, 0x2c, - 0x2a, 0xcb, 0xfe, 0x7f, 0xdd, 0x40, 0x2b, 0xbd, 0xc7, 0xf4, 0x3d, 0xff, 0x32, 0xe0, 0x4c, 0x5c, - 0x61, 0xcb, 0x8c, 0x3f, 0x95, 0x14, 0x9f, 0xba, 0xcb, 0xc9, 0x9f, 0x7c, 0x97, 0xa3, 0x47, 0xf0, - 0xc2, 0x09, 0x11, 0xfc, 0x2b, 0x99, 0xe4, 0xfe, 0x89, 0xa1, 0xe4, 0x8e, 0x92, 0x5e, 0x62, 0xe0, - 0x39, 0xe9, 0x62, 0xc8, 0xfc, 0x9d, 0x01, 0xf3, 0x31, 0x79, 0xd7, 0x6f, 0xf2, 0x9a, 0x9d, 0x72, - 0x27, 0x33, 0xd2, 0x35, 0xbb, 0x70, 0x07, 0x41, 0x43, 0x7d, 0x28, 0x39, 0x6d, 0xb7, 0xdb, 0x0c, - 0x89, 0x27, 0xb7, 0xe5, 0xf9, 0x29, 0xb4, 0x3a, 0x0c, 0x5f, 0xb9, 0x42, 0x5d, 0x02, 0xe0, 0x04, - 0xca, 0xfc, 0x43, 0x1e, 0x16, 0x52, 0x7d, 0x11, 0x0b, 0x5f, 0xe2, 0x32, 0xa5, 0xa1, 0xe9, 0x9c, - 0x84, 0xaf, 0x7d, 0x45, 0xc2, 0x3a, 0x1f, 0xdb, 0x8f, 0xae, 0x7b, 0x28, 0x64, 0x64, 0xef, 0xd6, - 0x2e, 0xc7, 0x04, 0xac, 0x78, 0xb4, 0xc6, 0x30, 0x7f, 0xcf, 0x8d, 0xe1, 0x5b, 0x06, 0x20, 0xfe, - 0x09, 0x4c, 0x72, 0xd2, 0xbf, 0xc9, 0x58, 0x38, 0x35, 0xbb, 0x2d, 0x49, 0x8d, 0x50, 0x7d, 0x08, - 0x0a, 0x8f, 0x80, 0xd7, 0xe6, 0xc5, 0xc5, 0x87, 0x32, 0x2f, 0x36, 0x7f, 0x5b, 0x80, 0x85, 0x54, - 0x75, 0x90, 0xea, 0x90, 0x8c, 0x13, 0x3b, 0xa4, 0xf3, 0x50, 0x0c, 0xc2, 0xbe, 0x27, 0xf6, 0xab, - 0xa4, 0x1c, 0x73, 0x8f, 0x2d, 0x62, 0x41, 0x63, 0x3d, 0x40, 0x33, 0x1c, 0xe0, 0xbe, 0xa8, 0xa3, - 0x4b, 0x4a, 0x99, 0x4d, 0xbe, 0x8a, 0x25, 0x15, 0xbd, 0x01, 0xf3, 0x94, 0x1f, 0x86, 0xd0, 0x8e, - 0x48, 0x6b, 0x30, 0x85, 0x99, 0x79, 0x43, 0x13, 0x67, 0x9d, 0x3d, 0x3e, 0x5a, 0x99, 0xd7, 0x57, - 0x70, 0x0a, 0x0e, 0xfd, 0xdc, 0x00, 0x14, 0x8c, 0xba, 0xe8, 0x33, 0x26, 0xac, 0x19, 0x86, 0x2b, - 0x12, 0xeb, 0x71, 0xe6, 0x14, 0x23, 0xfa, 0xba, 0x11, 0x0a, 0xa0, 0x37, 0x8d, 0xe1, 0x21, 0xc6, - 0xde, 0x14, 0xab, 0x41, 0x31, 0x85, 0xb9, 0xeb, 0x30, 0xc3, 0xbc, 0x65, 0xc0, 0x63, 0x23, 0xdf, - 0x63, 0x1e, 0xd0, 0x0a, 0xfd, 0x7e, 0x90, 0x0d, 0x4d, 0xfc, 0x3f, 0x1e, 0x58, 0xd0, 0x4e, 0x11, - 0x8c, 0xe3, 0x80, 0x9e, 0x1f, 0x17, 0xd0, 0xcd, 0xdf, 0xe4, 0xe0, 0x91, 0x11, 0x85, 0x2c, 0xba, - 0xa9, 0x5b, 0x47, 0x14, 0x78, 0x2f, 0x4c, 0xe1, 0xfc, 0xca, 0x4c, 0x23, 0xfe, 0xb2, 0x70, 0xe2, - 0x80, 0xe7, 0xe4, 0x59, 0xc2, 0x01, 0x14, 0xdb, 0xbe, 0xdf, 0x89, 0x87, 0x06, 0x93, 0x64, 0x4c, - 0xd5, 0xea, 0x5a, 0x65, 0x66, 0x6a, 0xf6, 0x4c, 0xb1, 0x10, 0x6f, 0xfe, 0xc0, 0x00, 0xed, 0xc6, - 0x10, 0x7d, 0x0b, 0xca, 0x76, 0x3f, 0xf2, 0x7b, 0x76, 0x44, 0x9a, 0xb2, 0x0e, 0xd8, 0x9d, 0xca, - 0xdd, 0xe4, 0x46, 0x2c, 0x55, 0x58, 0x28, 0x79, 0xc4, 0x0a, 0xcf, 0x7c, 0x4e, 0xec, 0x58, 0xe6, - 0x05, 0x15, 0x34, 0x8c, 0xf1, 0x41, 0xc3, 0xfc, 0xa7, 0x01, 0xa9, 0xc3, 0x8a, 0x7a, 0x50, 0x64, - 0x2a, 0x0d, 0xa6, 0x70, 0x23, 0xad, 0xcb, 0xdd, 0x60, 0x32, 0x85, 0x1d, 0xf9, 0x4f, 0x2c, 0x50, - 0x90, 0x0b, 0x05, 0x66, 0x50, 0x39, 0xf1, 0xdc, 0x99, 0x12, 0x1a, 0xdb, 0x2a, 0xd1, 0xda, 0xb2, - 0x5f, 0x98, 0x43, 0x98, 0xcf, 0xc2, 0xb9, 0x21, 0x8d, 0x98, 0x91, 0x0e, 0xfc, 0xf8, 0x02, 0x5e, - 0x33, 0xd2, 0x25, 0xb6, 0x88, 0x05, 0x8d, 0x15, 0x0a, 0x67, 0xb3, 0xe2, 0x59, 0x1c, 0x3b, 0x47, - 0xb3, 0xf2, 0x1e, 0x88, 0xd5, 0x3e, 0x2e, 0x95, 0x1a, 0x56, 0x1f, 0x0f, 0x6b, 0xc0, 0x76, 0x34, - 0x7b, 0x7f, 0xc0, 0xce, 0x90, 0xeb, 0x51, 0xe2, 0xf4, 0xc3, 0xf8, 0x43, 0xd5, 0x60, 0x42, 0xae, - 0xe3, 0x84, 0x03, 0xad, 0x03, 0x88, 0xfb, 0xab, 0x5d, 0xd5, 0x11, 0x24, 0x43, 0x99, 0x46, 0x42, - 0xc1, 0x1a, 0x17, 0x6b, 0x8a, 0x1c, 0x12, 0x46, 0x9b, 0xac, 0x0e, 0x66, 0xc1, 0x65, 0x5e, 0x34, - 0x45, 0x75, 0xb9, 0x86, 0x13, 0x2a, 0xfa, 0x24, 0xcc, 0x75, 0xc8, 0x80, 0x33, 0x16, 0x38, 0x63, - 0x85, 0x95, 0x76, 0x3b, 0x62, 0x09, 0xc7, 0x34, 0x64, 0xc2, 0xac, 0x63, 0x73, 0xae, 0x22, 0xe7, - 0x02, 0x7e, 0x95, 0xb5, 0xc1, 0x99, 0x24, 0xc5, 0xaa, 0xbd, 0x7b, 0x67, 0x79, 0xe6, 0xbd, 0x3b, - 0xcb, 0x33, 0xef, 0xdf, 0x59, 0x9e, 0xb9, 0x75, 0xbc, 0x6c, 0xbc, 0x7b, 0xbc, 0x6c, 0xbc, 0x77, - 0xbc, 0x6c, 0xbc, 0x7f, 0xbc, 0x6c, 0xfc, 0xe3, 0x78, 0xd9, 0xf8, 0xc9, 0x87, 0xcb, 0x33, 0x2f, - 0x97, 0x62, 0xd3, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x22, 0x16, 0x8c, 0xe7, 0x2c, 0x00, - 0x00, + proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_db1db77292b2c83a) +} + +var fileDescriptor_generated_db1db77292b2c83a = []byte{ + // 2823 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x8c, 0x1c, 0x47, + 0xf5, 0xdf, 0x9e, 0x8f, 0xfd, 0x78, 0xfb, 0x61, 0xbb, 0xf2, 0xf1, 0x9f, 0xff, 0x46, 0xda, 0x5d, + 0xb5, 0xf9, 0x08, 0x28, 0x99, 0xc5, 0x86, 0x40, 0x08, 0x08, 0x69, 0x67, 0xd7, 0x8e, 0x37, 0x6b, + 0xaf, 0x97, 0x9a, 0x4d, 0x2c, 0x85, 0x28, 0xd0, 0xee, 0xa9, 0x9d, 0x29, 0xcf, 0x4c, 0x77, 0xa7, + 0xab, 0x66, 0xed, 0x11, 0x0a, 0x72, 0x84, 0x40, 0x20, 0x40, 0x02, 0x22, 0x04, 0x12, 0x97, 0x08, + 0xc1, 0x85, 0x73, 0xc4, 0x81, 0x23, 0x07, 0x94, 0x63, 0x0e, 0x20, 0xa2, 0x10, 0x59, 0x64, 0x73, + 0xe1, 0x86, 0x38, 0x70, 0xc9, 0x09, 0xd5, 0x47, 0x77, 0x55, 0xf7, 0xcc, 0x64, 0xd7, 0x9e, 0xb1, + 0x81, 0xdb, 0x74, 0xbd, 0xd7, 0xef, 0xbd, 0x7e, 0xf5, 0xea, 0xf7, 0x3e, 0x6a, 0x60, 0xbb, 0x49, + 0x79, 0xab, 0x77, 0xbd, 0xea, 0x87, 0xdd, 0x75, 0x2f, 0x6e, 0x86, 0x51, 0x1c, 0xde, 0x90, 0x3f, + 0x9e, 0xf4, 0x1b, 0xeb, 0x51, 0xbb, 0xb9, 0xee, 0x45, 0x94, 0xad, 0x7b, 0x51, 0xd4, 0xa1, 0xbe, + 0xc7, 0x69, 0x18, 0xac, 0x1f, 0x9e, 0xf3, 0x3a, 0x51, 0xcb, 0x3b, 0xb7, 0xde, 0x24, 0x01, 0x89, + 0x3d, 0x4e, 0x1a, 0xd5, 0x28, 0x0e, 0x79, 0x88, 0xbe, 0x68, 0x44, 0x55, 0x13, 0x51, 0xf2, 0xc7, + 0xd7, 0xfd, 0x46, 0x35, 0x6a, 0x37, 0xab, 0x42, 0x54, 0xd5, 0x12, 0x55, 0x4d, 0x44, 0x2d, 0x3f, + 0x69, 0x59, 0xd1, 0x0c, 0x9b, 0xe1, 0xba, 0x94, 0x78, 0xbd, 0x77, 0x20, 0x9f, 0xe4, 0x83, 0xfc, + 0xa5, 0x34, 0x2d, 0x7f, 0xae, 0xfd, 0x34, 0xab, 0xd2, 0x50, 0xd8, 0xd6, 0xf5, 0xfc, 0x16, 0x0d, + 0x48, 0xdc, 0x37, 0xc6, 0x76, 0x09, 0xf7, 0xd6, 0x0f, 0x07, 0xec, 0x5b, 0x5e, 0x1f, 0xf5, 0x56, + 0xdc, 0x0b, 0x38, 0xed, 0x92, 0x81, 0x17, 0x3e, 0x7f, 0xdc, 0x0b, 0xcc, 0x6f, 0x91, 0xae, 0x37, + 0xf0, 0xde, 0x67, 0x47, 0xbd, 0xd7, 0xe3, 0xb4, 0xb3, 0x4e, 0x03, 0xce, 0x78, 0x9c, 0x7f, 0xc9, + 0x7d, 0x05, 0x16, 0x37, 0xae, 0xd5, 0x37, 0x7a, 0xbc, 0xb5, 0x19, 0x06, 0x07, 0xb4, 0x89, 0x9e, + 0x82, 0x79, 0xbf, 0xd3, 0x63, 0x9c, 0xc4, 0xbb, 0x5e, 0x97, 0x54, 0x9c, 0x35, 0xe7, 0xf1, 0xb9, + 0xda, 0x43, 0x6f, 0xdd, 0x59, 0x9d, 0x3a, 0xba, 0xb3, 0x3a, 0xbf, 0x69, 0x48, 0xd8, 0xe6, 0x43, + 0x9f, 0x82, 0x99, 0x38, 0xec, 0x90, 0x0d, 0xbc, 0x5b, 0x29, 0xc8, 0x57, 0x4e, 0xe9, 0x57, 0x66, + 0xb0, 0x5a, 0xc6, 0x09, 0xdd, 0xfd, 0xab, 0x03, 0xb0, 0x11, 0x45, 0x7b, 0x71, 0x78, 0x83, 0xf8, + 0x1c, 0x7d, 0x03, 0x66, 0x85, 0xeb, 0x1a, 0x1e, 0xf7, 0xa4, 0xb6, 0xf9, 0xf3, 0x9f, 0xa9, 0xaa, + 0x2f, 0xa9, 0xda, 0x5f, 0x62, 0xb6, 0x52, 0x70, 0x57, 0x0f, 0xcf, 0x55, 0xaf, 0x5e, 0x17, 0xef, + 0x5f, 0x21, 0xdc, 0xab, 0x21, 0xad, 0x0c, 0xcc, 0x1a, 0x4e, 0xa5, 0xa2, 0x36, 0x94, 0x58, 0x44, + 0x7c, 0x69, 0xd8, 0xfc, 0xf9, 0xed, 0xea, 0x3d, 0x07, 0x4c, 0xd5, 0x98, 0x5d, 0x8f, 0x88, 0x5f, + 0x5b, 0xd0, 0x6a, 0x4b, 0xe2, 0x09, 0x4b, 0x25, 0xee, 0xbb, 0x0e, 0x2c, 0x19, 0xb6, 0xcb, 0x94, + 0x71, 0xf4, 0xd2, 0xc0, 0x17, 0x56, 0x4f, 0xf6, 0x85, 0xe2, 0x6d, 0xf9, 0x7d, 0xa7, 0xb5, 0xa2, + 0xd9, 0x64, 0xc5, 0xfa, 0xba, 0x1b, 0x50, 0xa6, 0x9c, 0x74, 0x59, 0xa5, 0xb0, 0x56, 0x7c, 0x7c, + 0xfe, 0xfc, 0x85, 0x89, 0x7c, 0x5e, 0x6d, 0x51, 0x6b, 0x2c, 0x6f, 0x0b, 0xd9, 0x58, 0xa9, 0x70, + 0x7f, 0x59, 0xb6, 0x3f, 0x4e, 0x7c, 0x35, 0x3a, 0x07, 0xf3, 0x2c, 0xec, 0xc5, 0x3e, 0xc1, 0x24, + 0x0a, 0x59, 0xc5, 0x59, 0x2b, 0x8a, 0xcd, 0x17, 0xb1, 0x52, 0x37, 0xcb, 0xd8, 0xe6, 0x41, 0x3f, + 0x70, 0x60, 0xa1, 0x41, 0x18, 0xa7, 0x81, 0xd4, 0x9f, 0x58, 0xfe, 0xd5, 0xf1, 0x2c, 0x4f, 0x16, + 0xb7, 0x8c, 0xe4, 0xda, 0xc3, 0xfa, 0x2b, 0x16, 0xac, 0x45, 0x86, 0x33, 0xca, 0x45, 0xc0, 0x37, + 0x08, 0xf3, 0x63, 0x1a, 0x89, 0xe7, 0x4a, 0x31, 0x1b, 0xf0, 0x5b, 0x86, 0x84, 0x6d, 0x3e, 0xd4, + 0x86, 0xb2, 0x08, 0x68, 0x56, 0x29, 0x49, 0xe3, 0x2f, 0x8e, 0x61, 0xbc, 0x76, 0xa7, 0x38, 0x28, + 0xc6, 0xef, 0xe2, 0x89, 0x61, 0xa5, 0x03, 0xfd, 0xc8, 0x81, 0x8a, 0x3e, 0x6d, 0x98, 0x28, 0x57, + 0x5e, 0x6b, 0x51, 0x4e, 0x3a, 0x94, 0xf1, 0x4a, 0x59, 0x1a, 0xb0, 0x7e, 0xb2, 0x90, 0x7a, 0x36, + 0x0e, 0x7b, 0xd1, 0x0e, 0x0d, 0x1a, 0xb5, 0x35, 0xad, 0xa9, 0xb2, 0x39, 0x42, 0x30, 0x1e, 0xa9, + 0x12, 0xbd, 0xee, 0xc0, 0x72, 0xe0, 0x75, 0x09, 0x8b, 0x3c, 0xb1, 0xa9, 0x8a, 0x5c, 0xeb, 0x78, + 0x7e, 0x5b, 0x5a, 0x34, 0x7d, 0x6f, 0x16, 0xb9, 0xda, 0xa2, 0xe5, 0xdd, 0x91, 0xa2, 0xf1, 0x47, + 0xa8, 0x75, 0xff, 0x58, 0x84, 0x79, 0x2b, 0x10, 0x1e, 0x00, 0xb2, 0x74, 0x32, 0xc8, 0xf2, 0xdc, + 0x64, 0x02, 0x78, 0x14, 0xb4, 0x20, 0x0e, 0xd3, 0x8c, 0x7b, 0xbc, 0xc7, 0x64, 0x90, 0xce, 0x9f, + 0xbf, 0x3c, 0x21, 0x7d, 0x52, 0x66, 0x6d, 0x49, 0x6b, 0x9c, 0x56, 0xcf, 0x58, 0xeb, 0x42, 0xaf, + 0xc0, 0x5c, 0x18, 0x89, 0x9c, 0x21, 0x4e, 0x47, 0x49, 0x2a, 0xde, 0x1a, 0x43, 0xf1, 0xd5, 0x44, + 0x56, 0x6d, 0xf1, 0xe8, 0xce, 0xea, 0x5c, 0xfa, 0x88, 0x8d, 0x16, 0xd7, 0x87, 0x87, 0x2d, 0xfb, + 0x36, 0xc3, 0xa0, 0x41, 0xe5, 0x86, 0xae, 0x41, 0x89, 0xf7, 0xa3, 0x24, 0x29, 0xa5, 0x2e, 0xda, + 0xef, 0x47, 0x04, 0x4b, 0x8a, 0x48, 0x43, 0x5d, 0xc2, 0x98, 0xd7, 0x24, 0xf9, 0x34, 0x74, 0x45, + 0x2d, 0xe3, 0x84, 0xee, 0xbe, 0x02, 0x8f, 0x0e, 0x47, 0x0d, 0xf4, 0x09, 0x98, 0x66, 0x24, 0x3e, + 0x24, 0xb1, 0x56, 0x64, 0x3c, 0x23, 0x57, 0xb1, 0xa6, 0xa2, 0x75, 0x98, 0x4b, 0xa3, 0x51, 0xab, + 0x3b, 0xa3, 0x59, 0xe7, 0x4c, 0x08, 0x1b, 0x1e, 0xf7, 0x3d, 0x07, 0x4e, 0x59, 0x3a, 0x1f, 0x40, + 0x72, 0x68, 0x67, 0x93, 0xc3, 0xc5, 0xc9, 0x44, 0xcc, 0x88, 0xec, 0xf0, 0xaf, 0x22, 0x9c, 0xb1, + 0xe3, 0x4a, 0x1e, 0x4f, 0x59, 0x19, 0x90, 0x28, 0x7c, 0x1e, 0x5f, 0xd6, 0xee, 0x34, 0x95, 0x81, + 0x5a, 0xc6, 0x09, 0x5d, 0xec, 0x6f, 0xe4, 0xf1, 0x96, 0xf6, 0x65, 0xba, 0xbf, 0x7b, 0x1e, 0x6f, + 0x61, 0x49, 0x11, 0x60, 0x4d, 0x82, 0x43, 0x1a, 0x87, 0x41, 0x97, 0x04, 0x3c, 0x0f, 0xd6, 0x17, + 0x0c, 0x09, 0xdb, 0x7c, 0xe8, 0x2b, 0xb0, 0xc4, 0xbd, 0xb8, 0x49, 0x38, 0x26, 0x87, 0x94, 0x25, + 0x81, 0x3c, 0x57, 0x7b, 0x54, 0xbf, 0xb9, 0xb4, 0x9f, 0xa1, 0xe2, 0x1c, 0x37, 0x7a, 0xd3, 0x81, + 0xc7, 0xfc, 0xb0, 0x1b, 0x85, 0x01, 0x09, 0xf8, 0x9e, 0x17, 0x7b, 0x5d, 0xc2, 0x49, 0x7c, 0xf5, + 0x90, 0xc4, 0x31, 0x6d, 0x10, 0xa6, 0x21, 0xf8, 0xca, 0x18, 0xde, 0xdd, 0x1c, 0x90, 0x5e, 0x3b, + 0xab, 0x8d, 0x7b, 0x6c, 0x73, 0xb4, 0x66, 0xfc, 0x51, 0x66, 0x89, 0xdc, 0x7c, 0xe8, 0x75, 0x7a, + 0x84, 0x5d, 0xa4, 0x22, 0x53, 0x4d, 0x9b, 0xdc, 0xfc, 0x82, 0x59, 0xc6, 0x36, 0x0f, 0x3a, 0x0f, + 0x20, 0xe2, 0x75, 0x2f, 0x26, 0x07, 0xf4, 0x56, 0x65, 0x46, 0x7a, 0x29, 0xc5, 0xc0, 0xdd, 0x94, + 0x82, 0x2d, 0x2e, 0xf7, 0xcd, 0x62, 0x26, 0xac, 0xeb, 0x09, 0x56, 0xc9, 0xfd, 0xd7, 0x41, 0x3d, + 0x29, 0xac, 0x52, 0x90, 0x6f, 0x4e, 0xa4, 0x2a, 0x2b, 0xb4, 0x2e, 0xf4, 0x3d, 0x47, 0x26, 0xf3, + 0xe4, 0x24, 0x6b, 0x5c, 0xbe, 0x0f, 0x85, 0x85, 0x5d, 0x1f, 0x24, 0x8b, 0xd8, 0x56, 0x2d, 0xc2, + 0x3e, 0x52, 0x79, 0x5d, 0x47, 0x69, 0x1a, 0xf6, 0x49, 0xba, 0x4f, 0xe8, 0xa8, 0x07, 0xc0, 0xfa, + 0x81, 0xbf, 0x17, 0x76, 0xa8, 0xdf, 0xd7, 0x10, 0x3b, 0x4e, 0x19, 0x57, 0x4f, 0x85, 0xd5, 0x96, + 0xc4, 0xb6, 0x99, 0x67, 0x6c, 0x29, 0x72, 0xdf, 0x98, 0xce, 0x1e, 0x57, 0x05, 0xf7, 0x3f, 0x71, + 0xe0, 0xb4, 0x88, 0x29, 0x2f, 0xa6, 0x2c, 0x0c, 0x30, 0x61, 0xbd, 0x0e, 0xd7, 0x7b, 0xb8, 0x33, + 0x66, 0x7c, 0xdb, 0x22, 0x6b, 0x15, 0xed, 0x8e, 0xd3, 0x79, 0x0a, 0x1e, 0x50, 0x8f, 0x38, 0xcc, + 0xb4, 0x28, 0xe3, 0x61, 0xdc, 0xd7, 0x38, 0x36, 0x4e, 0x0d, 0xbf, 0x45, 0xa2, 0x4e, 0xd8, 0x17, + 0xb0, 0xb0, 0x1d, 0x1c, 0x84, 0x66, 0x5b, 0x2e, 0x29, 0x0d, 0x38, 0x51, 0x85, 0x5e, 0x73, 0x00, + 0xa2, 0xe4, 0x50, 0x89, 0x9c, 0x7b, 0x1f, 0xce, 0x78, 0x7a, 0xb4, 0xd2, 0x25, 0x86, 0x2d, 0xa5, + 0x28, 0x84, 0xe9, 0x16, 0xf1, 0x3a, 0xbc, 0xa5, 0xc3, 0xe2, 0xd9, 0x31, 0xd4, 0x5f, 0x92, 0x82, + 0xf2, 0xd9, 0x5e, 0xad, 0x62, 0xad, 0x06, 0x7d, 0xc7, 0x81, 0xa5, 0x34, 0x11, 0x0b, 0x5e, 0x52, + 0x29, 0x8f, 0xdd, 0x36, 0x5d, 0xcd, 0x08, 0xac, 0x21, 0x81, 0xb8, 0xd9, 0x35, 0x9c, 0x53, 0x8a, + 0xbe, 0xed, 0x00, 0xf8, 0x49, 0xe2, 0x67, 0xba, 0xa2, 0xbc, 0x3a, 0x99, 0x83, 0x9c, 0x16, 0x14, + 0xc6, 0xfd, 0xe9, 0x12, 0xc3, 0x96, 0x5a, 0xf7, 0x03, 0x07, 0x1e, 0xb1, 0x5e, 0xbc, 0xe6, 0x71, + 0xbf, 0x75, 0xe1, 0x50, 0x64, 0x94, 0x9d, 0x4c, 0x29, 0xf2, 0x05, 0xbb, 0x14, 0xf9, 0xf0, 0xce, + 0xea, 0x27, 0x47, 0xb5, 0xe2, 0x37, 0x85, 0x84, 0xaa, 0x14, 0x61, 0x55, 0x2d, 0xaf, 0xc2, 0xbc, + 0x65, 0xb3, 0x46, 0xad, 0x49, 0xe5, 0xea, 0x14, 0xaa, 0xac, 0x45, 0x6c, 0xeb, 0x73, 0xff, 0x5c, + 0x80, 0x19, 0xdd, 0x04, 0x9c, 0xb8, 0xf6, 0x59, 0x83, 0x92, 0xc8, 0x00, 0xf9, 0x54, 0x2d, 0x07, + 0x03, 0x92, 0x82, 0x22, 0x98, 0xf6, 0xe5, 0x48, 0x41, 0x57, 0xab, 0x97, 0xc6, 0x39, 0x39, 0xca, + 0x3a, 0x35, 0xa2, 0x30, 0x36, 0xa9, 0x67, 0xac, 0xf5, 0x88, 0x2e, 0xe9, 0x94, 0x1f, 0x06, 0x01, + 0xf1, 0x4d, 0xf0, 0x96, 0xc6, 0xae, 0xcc, 0x37, 0xb3, 0x12, 0x6b, 0xff, 0xa7, 0xb5, 0x9f, 0xca, + 0x11, 0x70, 0x5e, 0xb7, 0xfb, 0xbb, 0x22, 0x2c, 0x66, 0x2c, 0x47, 0x4f, 0xc0, 0x6c, 0x8f, 0x91, + 0x38, 0x30, 0x93, 0x95, 0xb4, 0x78, 0x7b, 0x5e, 0xaf, 0xe3, 0x94, 0x43, 0x70, 0x47, 0x1e, 0x63, + 0x37, 0xc3, 0xb8, 0xa1, 0xfd, 0x9c, 0x72, 0xef, 0xe9, 0x75, 0x9c, 0x72, 0x88, 0xd2, 0xe8, 0x3a, + 0xf1, 0x62, 0x12, 0xef, 0x87, 0x6d, 0x32, 0xd0, 0xc7, 0xd6, 0x0c, 0x09, 0xdb, 0x7c, 0xd2, 0x69, + 0xbc, 0xc3, 0x36, 0x3b, 0x94, 0x04, 0x5c, 0x99, 0x39, 0x01, 0xa7, 0xed, 0x5f, 0xae, 0xdb, 0x12, + 0x8d, 0xd3, 0x72, 0x04, 0x9c, 0xd7, 0x2d, 0x50, 0x77, 0xd1, 0xbb, 0xc9, 0xcc, 0x44, 0x4a, 0xe3, + 0xcf, 0x38, 0xe1, 0x93, 0x99, 0x70, 0xd5, 0xce, 0x1c, 0xdd, 0x59, 0xcd, 0x0e, 0xbd, 0x70, 0x56, + 0xa3, 0xfb, 0x27, 0x07, 0x92, 0x49, 0xd7, 0x03, 0xa8, 0xd1, 0x9b, 0xd9, 0x1a, 0xbd, 0x36, 0xfe, + 0x39, 0x19, 0x51, 0x9f, 0xbf, 0x5b, 0x84, 0x81, 0x6c, 0x8b, 0x5e, 0x16, 0x38, 0x2b, 0xd6, 0x48, + 0x63, 0x23, 0x49, 0xf4, 0x9f, 0x3e, 0xd9, 0xd7, 0xed, 0xd3, 0x2e, 0xb1, 0x21, 0x34, 0x91, 0x82, + 0x2d, 0x89, 0xe8, 0xb6, 0x63, 0x14, 0xec, 0x87, 0x1a, 0xdb, 0x26, 0x5b, 0x0d, 0x0e, 0x98, 0xb0, + 0x1f, 0x62, 0x4b, 0x27, 0x7a, 0x26, 0xed, 0x9b, 0xcb, 0xf2, 0x50, 0xb8, 0xd9, 0x4e, 0xf7, 0xc3, + 0x4c, 0x11, 0x92, 0xeb, 0x7e, 0xfb, 0x30, 0x17, 0xeb, 0x41, 0x43, 0x92, 0x85, 0xc6, 0x89, 0xc4, + 0x64, 0x68, 0xa1, 0xa0, 0x24, 0xed, 0x16, 0x93, 0x65, 0x86, 0x8d, 0x36, 0x71, 0xfc, 0xe3, 0xa4, + 0x5d, 0x99, 0xc9, 0x1e, 0xff, 0xb4, 0x51, 0x49, 0x39, 0xdc, 0x1f, 0x3a, 0x80, 0x06, 0x0b, 0x0c, + 0xd1, 0xa3, 0xa6, 0x1d, 0x82, 0x86, 0x9c, 0x54, 0x6b, 0xca, 0x8e, 0x0d, 0xcf, 0x09, 0x80, 0xfd, + 0x2c, 0x94, 0x65, 0xc7, 0xa0, 0x21, 0x26, 0x8d, 0x35, 0xd9, 0x53, 0x60, 0x45, 0x73, 0xff, 0xe0, + 0x40, 0x1e, 0x20, 0x65, 0x6e, 0x51, 0xfb, 0x90, 0xcf, 0x2d, 0x59, 0x9f, 0x9f, 0xbc, 0x89, 0x47, + 0x2f, 0xc1, 0xbc, 0xc7, 0x39, 0xe9, 0x46, 0x5c, 0x86, 0x6f, 0xf1, 0xae, 0xc3, 0x57, 0x16, 0xc8, + 0x57, 0xc2, 0x06, 0x3d, 0xa0, 0x32, 0x74, 0x6d, 0x71, 0xee, 0x3f, 0x0b, 0xb0, 0x94, 0x2d, 0x17, + 0x33, 0x9b, 0x52, 0x38, 0x6e, 0x53, 0x8e, 0xed, 0x1b, 0x8b, 0xff, 0x9d, 0x7d, 0xe3, 0xcb, 0x00, + 0x0d, 0xf9, 0xd9, 0xd2, 0xa9, 0xa5, 0x7b, 0xc7, 0x84, 0xad, 0x54, 0x0a, 0xb6, 0x24, 0xa2, 0x65, + 0x28, 0xd0, 0x86, 0x3c, 0x8c, 0xc5, 0x1a, 0x68, 0xde, 0xc2, 0xf6, 0x16, 0x2e, 0xd0, 0x86, 0xcb, + 0x60, 0xc1, 0x2e, 0x54, 0x4f, 0x1c, 0x34, 0x5f, 0x82, 0x45, 0xf5, 0x6b, 0x8b, 0x70, 0x8f, 0x76, + 0x98, 0xde, 0x9d, 0x47, 0x34, 0xfb, 0x62, 0xdd, 0x26, 0xe2, 0x2c, 0xaf, 0xfb, 0xf3, 0x02, 0xc0, + 0xa5, 0x30, 0x6c, 0x6b, 0x9d, 0xc9, 0x19, 0x70, 0x46, 0x9e, 0x81, 0x35, 0x28, 0xb5, 0x69, 0xd0, + 0xc8, 0x9f, 0x92, 0x1d, 0x1a, 0x34, 0xb0, 0xa4, 0x88, 0x46, 0xda, 0x8b, 0xe8, 0x0b, 0x24, 0x66, + 0x66, 0xaa, 0x9c, 0xfa, 0x65, 0x63, 0x6f, 0x5b, 0x53, 0xb0, 0xc5, 0x85, 0x9e, 0xd0, 0x45, 0xa5, + 0x1a, 0x4e, 0x54, 0x72, 0x45, 0xe5, 0xac, 0xb0, 0xd0, 0xaa, 0x1a, 0x9f, 0xce, 0xc1, 0xda, 0xda, + 0x00, 0xac, 0x99, 0x22, 0x7b, 0xaf, 0xe5, 0x31, 0x32, 0xec, 0x80, 0x4d, 0x1f, 0x33, 0x25, 0xab, + 0xc3, 0xec, 0x73, 0xd7, 0xf6, 0x55, 0xa9, 0xe0, 0x42, 0x91, 0x7a, 0x0a, 0x45, 0x8a, 0x26, 0xec, + 0xb7, 0x19, 0xeb, 0xc9, 0x1d, 0x16, 0x44, 0x74, 0x16, 0x8a, 0xe4, 0x56, 0x24, 0xfd, 0x52, 0x34, + 0x48, 0x73, 0xe1, 0x56, 0x44, 0x63, 0xc2, 0x04, 0x13, 0xb9, 0x15, 0xb9, 0x0c, 0xcc, 0xdc, 0x0f, + 0x1d, 0x40, 0x49, 0x34, 0xa5, 0x3a, 0xf5, 0x5c, 0x1a, 0xb3, 0xef, 0x35, 0xe3, 0xc5, 0x59, 0x39, + 0x3d, 0xed, 0x07, 0x3e, 0x96, 0xf2, 0xdd, 0x5f, 0x95, 0x20, 0xd7, 0x74, 0xa0, 0x9e, 0x3d, 0xda, + 0x74, 0x26, 0x38, 0xda, 0x4c, 0x3f, 0x7c, 0xd8, 0x78, 0x13, 0x3d, 0x05, 0xe5, 0x48, 0xec, 0x87, + 0x8e, 0x9e, 0xd5, 0x04, 0x40, 0xe5, 0x26, 0x0d, 0xd9, 0x36, 0xc5, 0x6d, 0xef, 0x5a, 0xf1, 0x18, + 0x58, 0xfc, 0x96, 0x9a, 0x28, 0xe8, 0xee, 0x5d, 0x1d, 0xe0, 0xdd, 0x49, 0x79, 0x56, 0x37, 0xf0, + 0xe9, 0x68, 0x41, 0xb7, 0xed, 0x96, 0x46, 0xf4, 0x35, 0x98, 0x63, 0xdc, 0x8b, 0x15, 0x28, 0x4f, + 0xdf, 0x35, 0x7e, 0xa4, 0xee, 0xab, 0x27, 0x42, 0xb0, 0x91, 0x87, 0x5e, 0x04, 0x38, 0xa0, 0x01, + 0x65, 0x2d, 0x29, 0x7d, 0xe6, 0xde, 0x20, 0xff, 0x62, 0x2a, 0x01, 0x5b, 0xd2, 0xdc, 0x9f, 0x3a, + 0x80, 0x86, 0x00, 0x62, 0x9c, 0x94, 0x68, 0xce, 0xfd, 0x00, 0xec, 0xa1, 0xd5, 0xda, 0x33, 0xb3, + 0xbf, 0x78, 0x63, 0x75, 0xea, 0xf6, 0x7b, 0x6b, 0x53, 0xee, 0x77, 0x0b, 0x30, 0x6f, 0xdd, 0x11, + 0x9d, 0x00, 0x9e, 0x72, 0x77, 0x5a, 0x85, 0x13, 0xde, 0x69, 0x3d, 0x0e, 0xb3, 0x51, 0xd8, 0xa1, + 0x3e, 0xd5, 0xa9, 0x69, 0xae, 0xb6, 0x20, 0x9b, 0x0d, 0xbd, 0x86, 0x53, 0x2a, 0xe2, 0x30, 0x77, + 0xe3, 0x26, 0x97, 0xb0, 0x90, 0xdc, 0x80, 0x6d, 0x8e, 0xe1, 0x94, 0x04, 0x62, 0xcc, 0xce, 0x27, + 0x2b, 0x0c, 0x1b, 0x45, 0xee, 0x5f, 0x0a, 0x00, 0xf2, 0x0a, 0x91, 0xca, 0x01, 0xcd, 0x1a, 0x94, + 0x62, 0x12, 0x85, 0x79, 0x3f, 0x08, 0x0e, 0x2c, 0x29, 0x99, 0x7e, 0xab, 0x70, 0x57, 0xfd, 0x56, + 0xf1, 0xd8, 0x7e, 0x4b, 0x24, 0x1c, 0xd6, 0xda, 0x8b, 0xe9, 0xa1, 0xc7, 0xc9, 0x0e, 0xe9, 0x6b, + 0xd4, 0x36, 0x09, 0xa7, 0x7e, 0xc9, 0x10, 0x71, 0x96, 0x77, 0x68, 0xab, 0x5a, 0xfe, 0x0f, 0xb6, + 0xaa, 0xef, 0x3a, 0xb0, 0x64, 0x3c, 0xfb, 0xbf, 0x75, 0x6b, 0x6d, 0xec, 0x1e, 0xd1, 0xf7, 0xfc, + 0xc3, 0x81, 0x53, 0x49, 0x85, 0xad, 0x33, 0xfe, 0x44, 0x52, 0x7c, 0xe6, 0xfe, 0xa7, 0x78, 0xfc, + 0xfd, 0x8f, 0x8d, 0xe0, 0xa5, 0x63, 0x10, 0xfc, 0xcb, 0xb9, 0xe4, 0xfe, 0xb1, 0x81, 0xe4, 0x8e, + 0xd2, 0x5e, 0xa2, 0x1f, 0xf8, 0xd9, 0x62, 0xc8, 0xfd, 0xad, 0x03, 0x0b, 0x09, 0x79, 0x37, 0x6c, + 0xc8, 0x9a, 0x9d, 0xc9, 0x20, 0x73, 0xb2, 0x35, 0xbb, 0x0a, 0x07, 0x45, 0x43, 0x3d, 0x98, 0xf5, + 0x5b, 0xb4, 0xd3, 0x88, 0x49, 0xa0, 0xb7, 0xe5, 0xd9, 0x09, 0xb4, 0x3a, 0x42, 0xbf, 0x09, 0x85, + 0x4d, 0xad, 0x00, 0xa7, 0xaa, 0xdc, 0xdf, 0x17, 0x61, 0x31, 0xd3, 0x17, 0x09, 0xf8, 0x52, 0x17, + 0x30, 0x75, 0xcb, 0xe6, 0x14, 0xbe, 0xf6, 0x0d, 0x09, 0xdb, 0x7c, 0x62, 0x3f, 0x3a, 0xf4, 0x50, + 0xc9, 0xc8, 0xdf, 0xc7, 0x5d, 0x4e, 0x08, 0xd8, 0xf0, 0x58, 0x8d, 0x61, 0xf1, 0xae, 0x1b, 0xc3, + 0xd7, 0x1d, 0x40, 0xf2, 0x13, 0x84, 0xe4, 0xb4, 0x7f, 0xd3, 0x58, 0x38, 0x31, 0xbf, 0x2d, 0x6b, + 0x8b, 0xd0, 0xe6, 0x80, 0x2a, 0x3c, 0x44, 0xbd, 0x35, 0x2f, 0x2e, 0x3f, 0x90, 0x79, 0xb1, 0xfb, + 0x9b, 0x12, 0x2c, 0x66, 0xaa, 0x83, 0x4c, 0x87, 0xe4, 0x1c, 0xdb, 0x21, 0x9d, 0x85, 0x72, 0x14, + 0xf7, 0x02, 0xb5, 0x5f, 0xb3, 0x26, 0x30, 0xf7, 0xc4, 0x22, 0x56, 0x34, 0xd1, 0x03, 0x34, 0xe2, + 0x3e, 0xee, 0xa9, 0x3a, 0x7a, 0xd6, 0x18, 0xb3, 0x25, 0x57, 0xb1, 0xa6, 0xa2, 0x57, 0x61, 0x81, + 0xc9, 0xc3, 0x10, 0x7b, 0x9c, 0x34, 0xfb, 0x13, 0x98, 0x99, 0xd7, 0x2d, 0x71, 0xb5, 0xd3, 0x47, + 0x77, 0x56, 0x17, 0xec, 0x15, 0x9c, 0x51, 0x87, 0x7e, 0xe6, 0x00, 0x8a, 0x86, 0x5d, 0x0e, 0x3a, + 0x63, 0xd6, 0x0c, 0x83, 0x15, 0x49, 0xed, 0x51, 0x11, 0x14, 0x43, 0xfa, 0xba, 0x21, 0x06, 0xa0, + 0xd7, 0x9c, 0xc1, 0x21, 0xc6, 0xde, 0x04, 0xab, 0x41, 0x35, 0x85, 0xf9, 0xc8, 0x61, 0x86, 0x7b, + 0xdb, 0x81, 0x47, 0x86, 0xbe, 0x27, 0x22, 0xa0, 0x19, 0x87, 0xbd, 0x28, 0x0f, 0x4d, 0xf2, 0x7f, + 0x21, 0x58, 0xd1, 0x4e, 0x00, 0xc6, 0x09, 0xa0, 0x17, 0x47, 0x01, 0xba, 0xfb, 0xeb, 0x02, 0x3c, + 0x34, 0xa4, 0x90, 0x45, 0x37, 0x6d, 0xef, 0xa8, 0x02, 0xef, 0xb9, 0x09, 0x9c, 0x5f, 0x9d, 0x69, + 0xd4, 0xdf, 0x1c, 0x8e, 0x1d, 0xf0, 0x1c, 0x3f, 0x4b, 0x38, 0x80, 0x72, 0x2b, 0x0c, 0xdb, 0xc9, + 0xd0, 0x60, 0x9c, 0x8c, 0x69, 0x5a, 0xdd, 0xda, 0x9c, 0x70, 0xb5, 0x78, 0x66, 0x58, 0x89, 0x77, + 0xbf, 0xef, 0x80, 0x75, 0x63, 0x88, 0xbe, 0x09, 0x73, 0x5e, 0x8f, 0x87, 0x5d, 0x8f, 0x93, 0x86, + 0xae, 0x03, 0x76, 0x27, 0x72, 0x37, 0xb9, 0x91, 0x48, 0x55, 0x1e, 0x4a, 0x1f, 0xb1, 0xd1, 0xe7, + 0x3e, 0xa3, 0x76, 0x2c, 0xf7, 0x82, 0x01, 0x0d, 0x67, 0x34, 0x68, 0xb8, 0x7f, 0x77, 0x20, 0x73, + 0x58, 0x51, 0x17, 0xca, 0xc2, 0xa4, 0xfe, 0x04, 0x6e, 0xa4, 0x6d, 0xb9, 0x1b, 0x42, 0xa6, 0xf2, + 0xa3, 0xfc, 0x89, 0x95, 0x16, 0x44, 0xa1, 0x24, 0x1c, 0xaa, 0x27, 0x9e, 0x3b, 0x13, 0xd2, 0x26, + 0xb6, 0x4a, 0xb5, 0xb6, 0xe2, 0x17, 0x96, 0x2a, 0xdc, 0xa7, 0xe1, 0xcc, 0x80, 0x45, 0xc2, 0x49, + 0x07, 0x61, 0x72, 0x01, 0x6f, 0x39, 0xe9, 0xa2, 0x58, 0xc4, 0x8a, 0x26, 0x0a, 0x85, 0xd3, 0x79, + 0xf1, 0x02, 0xc7, 0xce, 0xb0, 0xbc, 0xbc, 0xfb, 0xe2, 0xb5, 0xff, 0xd7, 0x46, 0x0d, 0x9a, 0x8f, + 0x07, 0x2d, 0x10, 0x3b, 0x9a, 0xbf, 0x3f, 0x10, 0x67, 0x88, 0x06, 0x8c, 0xf8, 0xbd, 0x38, 0xf9, + 0x50, 0x33, 0x98, 0xd0, 0xeb, 0x38, 0xe5, 0x40, 0xe7, 0x01, 0xd4, 0xfd, 0xd5, 0xae, 0xe9, 0x08, + 0xd2, 0xa1, 0x4c, 0x3d, 0xa5, 0x60, 0x8b, 0x4b, 0x34, 0x45, 0x3e, 0x89, 0xf9, 0x96, 0xa8, 0x83, + 0x05, 0xb8, 0x2c, 0xa8, 0xa6, 0x68, 0x53, 0xaf, 0xe1, 0x94, 0x8a, 0x3e, 0x0e, 0x33, 0x6d, 0xd2, + 0x97, 0x8c, 0x25, 0xc9, 0x38, 0x2f, 0x4a, 0xbb, 0x1d, 0xb5, 0x84, 0x13, 0x1a, 0x72, 0x61, 0xda, + 0xf7, 0x24, 0x57, 0x59, 0x72, 0x81, 0xbc, 0xca, 0xda, 0x90, 0x4c, 0x9a, 0x52, 0xab, 0xbe, 0xf5, + 0xfe, 0xca, 0xd4, 0xdb, 0xef, 0xaf, 0x4c, 0xbd, 0xf3, 0xfe, 0xca, 0xd4, 0xed, 0xa3, 0x15, 0xe7, + 0xad, 0xa3, 0x15, 0xe7, 0xed, 0xa3, 0x15, 0xe7, 0x9d, 0xa3, 0x15, 0xe7, 0x6f, 0x47, 0x2b, 0xce, + 0x8f, 0x3f, 0x58, 0x99, 0x7a, 0x71, 0x36, 0x71, 0xed, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd2, + 0x76, 0xf2, 0xd1, 0x50, 0x2d, 0x00, 0x00, } diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index 81f8b558ab187..c3d10a0a58a24 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -8,6 +8,7 @@ package github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; +import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1alpha1"; @@ -119,6 +120,9 @@ message ApplicationSource { // ValuesFiles is a list of Helm values files to use when generating a template repeated string valuesFiles = 6; + + // NamePrefix is a prefix appended to resources for helm and kustomize apps + optional string namePrefix = 7; } // ApplicationSpec represents desired application state. Contains link to repository with application definition and additional parameters link definition revision. diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index bd9ec90ed6957..5fbe9cafd433b 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -281,6 +281,8 @@ type ApplicationSource struct { ComponentParameterOverrides []ComponentParameter `json:"componentParameterOverrides,omitempty" protobuf:"bytes,5,opt,name=componentParameterOverrides"` // ValuesFiles is a list of Helm values files to use when generating a template ValuesFiles []string `json:"valuesFiles,omitempty" protobuf:"bytes,6,opt,name=valuesFiles"` + // NamePrefix is a prefix appended to resources for helm and kustomize apps + NamePrefix string `json:"namePrefix" protobuf:"bytes,7,opt,name=namePrefix"` } // ApplicationDestination contains deployment destination information diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go index 2067310f63221..77bc3e381d6d3 100644 --- a/reposerver/repository/repository.go +++ b/reposerver/repository/repository.go @@ -191,12 +191,17 @@ func generateManifests(appPath string, q *ManifestRequest) (*ManifestResponse, e case AppSourceKsonnet: targetObjs, params, dest, err = ksShow(appPath, q.Environment, q.ComponentParameterOverrides) case AppSourceHelm: + // TODO: Add prefix h := helm.NewHelmApp(appPath) err = h.DependencyBuild() if err != nil { return nil, err } - targetObjs, err = h.Template(q.AppLabel, q.Namespace, q.ValueFiles, q.ComponentParameterOverrides) + appName := q.AppLabel + if q.NamePrefix != "" { + appName = q.NamePrefix + q.AppLabel + } + targetObjs, err = h.Template(appName, q.Namespace, q.ValueFiles, q.ComponentParameterOverrides) if err != nil { return nil, err } @@ -206,7 +211,7 @@ func generateManifests(appPath string, q *ManifestRequest) (*ManifestResponse, e } case AppSourceKustomize: k := kustomize.NewKustomizeApp(appPath) - targetObjs, params, err = k.Build(q.Namespace, q.ComponentParameterOverrides) + targetObjs, params, err = k.Build(q.Namespace, q.NamePrefix, q.ComponentParameterOverrides) case AppSourceDirectory: targetObjs, err = findManifests(appPath) } @@ -314,7 +319,7 @@ func checkoutRevision(gitClient git.Client, commitSHA string) (string, error) { func manifestCacheKey(commitSHA string, q *ManifestRequest) string { pStr, _ := json.Marshal(q.ComponentParameterOverrides) valuesFiles := strings.Join(q.ValueFiles, ",") - return fmt.Sprintf("mfst|%s|%s|%s|%s|%s|%s|%s", q.AppLabel, q.Path, q.Environment, commitSHA, string(pStr), valuesFiles, q.Namespace) + return fmt.Sprintf("mfst|%s|%s|%s|%s|%s|%s|%s|%s", q.AppLabel, q.Path, q.Environment, commitSHA, string(pStr), valuesFiles, q.Namespace, q.NamePrefix) } func listDirCacheKey(commitSHA string, q *ListDirRequest) string { diff --git a/reposerver/repository/repository.pb.go b/reposerver/repository/repository.pb.go index 66d2bcffd6bb2..68e3cf670d196 100644 --- a/reposerver/repository/repository.pb.go +++ b/reposerver/repository/repository.pb.go @@ -37,6 +37,7 @@ type ManifestRequest struct { ComponentParameterOverrides []*v1alpha1.ComponentParameter `protobuf:"bytes,6,rep,name=componentParameterOverrides" json:"componentParameterOverrides,omitempty"` ValueFiles []string `protobuf:"bytes,7,rep,name=valueFiles" json:"valueFiles,omitempty"` Namespace string `protobuf:"bytes,8,opt,name=namespace,proto3" json:"namespace,omitempty"` + NamePrefix string `protobuf:"bytes,9,opt,name=namePrefix,proto3" json:"namePrefix,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -46,7 +47,7 @@ func (m *ManifestRequest) Reset() { *m = ManifestRequest{} } func (m *ManifestRequest) String() string { return proto.CompactTextString(m) } func (*ManifestRequest) ProtoMessage() {} func (*ManifestRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{0} + return fileDescriptor_repository_bbb9ca7fa4202717, []int{0} } func (m *ManifestRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -131,6 +132,13 @@ func (m *ManifestRequest) GetNamespace() string { return "" } +func (m *ManifestRequest) GetNamePrefix() string { + if m != nil { + return m.NamePrefix + } + return "" +} + type ManifestResponse struct { Manifests []string `protobuf:"bytes,1,rep,name=manifests" json:"manifests,omitempty"` Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` @@ -146,7 +154,7 @@ func (m *ManifestResponse) Reset() { *m = ManifestResponse{} } func (m *ManifestResponse) String() string { return proto.CompactTextString(m) } func (*ManifestResponse) ProtoMessage() {} func (*ManifestResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{1} + return fileDescriptor_repository_bbb9ca7fa4202717, []int{1} } func (m *ManifestResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,7 +232,7 @@ func (m *ListDirRequest) Reset() { *m = ListDirRequest{} } func (m *ListDirRequest) String() string { return proto.CompactTextString(m) } func (*ListDirRequest) ProtoMessage() {} func (*ListDirRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{2} + return fileDescriptor_repository_bbb9ca7fa4202717, []int{2} } func (m *ListDirRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -286,7 +294,7 @@ func (m *FileList) Reset() { *m = FileList{} } func (m *FileList) String() string { return proto.CompactTextString(m) } func (*FileList) ProtoMessage() {} func (*FileList) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{3} + return fileDescriptor_repository_bbb9ca7fa4202717, []int{3} } func (m *FileList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -336,7 +344,7 @@ func (m *GetFileRequest) Reset() { *m = GetFileRequest{} } func (m *GetFileRequest) String() string { return proto.CompactTextString(m) } func (*GetFileRequest) ProtoMessage() {} func (*GetFileRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{4} + return fileDescriptor_repository_bbb9ca7fa4202717, []int{4} } func (m *GetFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -398,7 +406,7 @@ func (m *GetFileResponse) Reset() { *m = GetFileResponse{} } func (m *GetFileResponse) String() string { return proto.CompactTextString(m) } func (*GetFileResponse) ProtoMessage() {} func (*GetFileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_49651600e73b0b40, []int{5} + return fileDescriptor_repository_bbb9ca7fa4202717, []int{5} } func (m *GetFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -669,6 +677,12 @@ func (m *ManifestRequest) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintRepository(dAtA, i, uint64(len(m.Namespace))) i += copy(dAtA[i:], m.Namespace) } + if len(m.NamePrefix) > 0 { + dAtA[i] = 0x4a + i++ + i = encodeVarintRepository(dAtA, i, uint64(len(m.NamePrefix))) + i += copy(dAtA[i:], m.NamePrefix) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -938,6 +952,10 @@ func (m *ManifestRequest) Size() (n int) { if l > 0 { n += 1 + l + sovRepository(uint64(l)) } + l = len(m.NamePrefix) + if l > 0 { + n += 1 + l + sovRepository(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1327,6 +1345,35 @@ func (m *ManifestRequest) Unmarshal(dAtA []byte) error { } m.Namespace = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NamePrefix", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRepository + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthRepository + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NamePrefix = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRepository(dAtA[iNdEx:]) @@ -2099,46 +2146,47 @@ var ( ) func init() { - proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_49651600e73b0b40) -} - -var fileDescriptor_repository_49651600e73b0b40 = []byte{ - // 584 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xdd, 0x8a, 0xd3, 0x40, - 0x14, 0xde, 0x6c, 0xbb, 0xdd, 0x76, 0x2a, 0xee, 0x3a, 0x14, 0x09, 0x69, 0x29, 0x21, 0xa0, 0xf4, - 0xc6, 0x84, 0xd6, 0x1b, 0x6f, 0x44, 0xd0, 0xd5, 0x45, 0xd8, 0x65, 0x25, 0x5e, 0xe9, 0x8d, 0x4c, - 0xd3, 0x63, 0x3a, 0x36, 0x99, 0x19, 0x67, 0xa6, 0x01, 0x9f, 0xc2, 0x07, 0xf0, 0x0d, 0x7c, 0x12, - 0x2f, 0x7d, 0x04, 0xe9, 0xdd, 0xbe, 0x85, 0x64, 0x9a, 0x34, 0x69, 0xb7, 0xec, 0x8d, 0x08, 0x7b, - 0x77, 0xe6, 0x3b, 0x27, 0xdf, 0x77, 0xfe, 0x38, 0x41, 0x8f, 0x25, 0x08, 0xae, 0x40, 0x66, 0x20, - 0x03, 0x63, 0x52, 0xcd, 0xe5, 0xb7, 0x9a, 0xe9, 0x0b, 0xc9, 0x35, 0xc7, 0xa8, 0x42, 0x9c, 0x5e, - 0xcc, 0x63, 0x6e, 0xe0, 0x20, 0xb7, 0xd6, 0x11, 0xce, 0x20, 0xe6, 0x3c, 0x4e, 0x20, 0x20, 0x82, - 0x06, 0x84, 0x31, 0xae, 0x89, 0xa6, 0x9c, 0xa9, 0xc2, 0xeb, 0x2d, 0x9e, 0x29, 0x9f, 0x72, 0xe3, - 0x8d, 0xb8, 0x84, 0x20, 0x1b, 0x07, 0x31, 0x30, 0x90, 0x44, 0xc3, 0xac, 0x88, 0x79, 0x1b, 0x53, - 0x3d, 0x5f, 0x4e, 0xfd, 0x88, 0xa7, 0x01, 0x91, 0x46, 0xe2, 0x8b, 0x31, 0x9e, 0x44, 0xb3, 0x40, - 0x2c, 0xe2, 0xfc, 0x63, 0x15, 0x10, 0x21, 0x12, 0x1a, 0x19, 0xf2, 0x20, 0x1b, 0x93, 0x44, 0xcc, - 0xc9, 0x0d, 0x2a, 0xef, 0x67, 0x03, 0x9d, 0x5c, 0x12, 0x46, 0x3f, 0x83, 0xd2, 0x21, 0x7c, 0x5d, - 0x82, 0xd2, 0xf8, 0x03, 0x6a, 0xe6, 0x45, 0xd8, 0x96, 0x6b, 0x8d, 0xba, 0x93, 0xd7, 0x7e, 0xa5, - 0xe6, 0x97, 0x6a, 0xc6, 0xf8, 0x14, 0xcd, 0x7c, 0xb1, 0x88, 0xfd, 0x5c, 0xcd, 0xaf, 0xa9, 0xf9, - 0xa5, 0x9a, 0x1f, 0x6e, 0x7a, 0x11, 0x1a, 0x4a, 0xec, 0xa0, 0xb6, 0x84, 0x8c, 0x2a, 0xca, 0x99, - 0x7d, 0xe8, 0x5a, 0xa3, 0x4e, 0xb8, 0x79, 0x63, 0x8c, 0x9a, 0x82, 0xe8, 0xb9, 0xdd, 0x30, 0xb8, - 0xb1, 0xb1, 0x8b, 0xba, 0xc0, 0x32, 0x2a, 0x39, 0x4b, 0x81, 0x69, 0xbb, 0x69, 0x5c, 0x75, 0x28, - 0x67, 0x24, 0x42, 0x5c, 0x90, 0x29, 0x24, 0xf6, 0xd1, 0x9a, 0xb1, 0x7c, 0xe3, 0xef, 0x16, 0xea, - 0x47, 0x3c, 0x15, 0x9c, 0x01, 0xd3, 0xef, 0x88, 0x24, 0x29, 0x68, 0x90, 0x57, 0x19, 0x48, 0x49, - 0x67, 0xa0, 0xec, 0x96, 0xdb, 0x18, 0x75, 0x27, 0x97, 0xff, 0x50, 0xe0, 0xab, 0x1b, 0xec, 0xe1, - 0x6d, 0x8a, 0x78, 0x88, 0x50, 0x46, 0x92, 0x25, 0xbc, 0xa1, 0x09, 0x28, 0xfb, 0xd8, 0x6d, 0x8c, - 0x3a, 0x61, 0x0d, 0xc1, 0x03, 0xd4, 0x61, 0x24, 0x05, 0x25, 0x48, 0x04, 0x76, 0xdb, 0x94, 0x53, - 0x01, 0xde, 0xb5, 0x85, 0x4e, 0xab, 0x61, 0x29, 0xc1, 0x99, 0x82, 0xfc, 0x93, 0xb4, 0xc0, 0x94, - 0x6d, 0x19, 0xc6, 0x0a, 0xd8, 0x26, 0x3c, 0xdc, 0x21, 0xc4, 0x0f, 0x51, 0x6b, 0xbd, 0xd2, 0x45, - 0xd3, 0x8b, 0xd7, 0xd6, 0x98, 0x9a, 0x3b, 0x63, 0x02, 0xd4, 0x12, 0x79, 0x61, 0xca, 0x3e, 0xfa, - 0x1f, 0xed, 0x2b, 0xc8, 0xbd, 0x1f, 0x16, 0xba, 0x7f, 0x41, 0x95, 0x3e, 0xa3, 0xf2, 0xee, 0xed, - 0xa5, 0xe7, 0xa2, 0x76, 0x3e, 0xb0, 0x3c, 0x41, 0xdc, 0x43, 0x47, 0x54, 0x43, 0x5a, 0x36, 0x7f, - 0xfd, 0x30, 0xf9, 0x9f, 0x83, 0xce, 0xa3, 0xee, 0x60, 0xfe, 0x8f, 0xd0, 0xc9, 0x26, 0xb9, 0x62, - 0x8f, 0x30, 0x6a, 0xce, 0x88, 0x26, 0x26, 0xbb, 0x7b, 0xa1, 0xb1, 0x27, 0xd7, 0x16, 0x7a, 0x50, - 0x69, 0xbd, 0x07, 0x99, 0xd1, 0x08, 0xf0, 0x15, 0x3a, 0x3d, 0x2f, 0xce, 0x48, 0xb9, 0x8d, 0xb8, - 0xef, 0xd7, 0x2e, 0xe1, 0xce, 0x41, 0x71, 0x06, 0xfb, 0x9d, 0x6b, 0x61, 0xef, 0x00, 0x3f, 0x47, - 0xc7, 0xc5, 0xa8, 0xb1, 0x53, 0x0f, 0xdd, 0x9e, 0xbf, 0xd3, 0xab, 0xfb, 0xca, 0xf6, 0x7b, 0x07, - 0xf8, 0x0c, 0x1d, 0x17, 0xc5, 0x6c, 0x7f, 0xbe, 0xdd, 0x7e, 0xa7, 0xbf, 0xd7, 0x57, 0x26, 0xf1, - 0xf2, 0xc5, 0xaf, 0xd5, 0xd0, 0xfa, 0xbd, 0x1a, 0x5a, 0x7f, 0x56, 0x43, 0xeb, 0xe3, 0xf8, 0xb6, - 0x13, 0xbb, 0xf7, 0x57, 0x30, 0x6d, 0x99, 0x8b, 0xfa, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x22, 0x8e, 0xa1, 0x51, 0x2a, 0x06, 0x00, 0x00, + proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_bbb9ca7fa4202717) +} + +var fileDescriptor_repository_bbb9ca7fa4202717 = []byte{ + // 597 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xae, 0x9b, 0x34, 0x6d, 0xb6, 0x3f, 0xfd, 0x5a, 0x56, 0x15, 0xb2, 0xdc, 0x2a, 0xb2, 0x2c, + 0x81, 0x72, 0xc1, 0x56, 0xc2, 0x85, 0x0b, 0x42, 0x82, 0x42, 0x85, 0xd4, 0xaa, 0x95, 0x39, 0xc1, + 0x05, 0x6d, 0x9c, 0xa9, 0xb3, 0xc4, 0xde, 0x5d, 0x76, 0x37, 0x16, 0x3c, 0x05, 0x0f, 0xc0, 0x0b, + 0x21, 0x4e, 0x3c, 0x02, 0xca, 0xad, 0x6f, 0x81, 0x76, 0x63, 0xc7, 0x4e, 0x1a, 0xf5, 0x82, 0x90, + 0x7a, 0x9b, 0xf9, 0x66, 0xfd, 0x7d, 0xf3, 0x4f, 0x63, 0xf4, 0x58, 0x82, 0xe0, 0x0a, 0x64, 0x01, + 0x32, 0xb2, 0x26, 0xd5, 0x5c, 0x7e, 0x6d, 0x98, 0xa1, 0x90, 0x5c, 0x73, 0x8c, 0x6a, 0xc4, 0x3b, + 0x4a, 0x79, 0xca, 0x2d, 0x1c, 0x19, 0x6b, 0xf1, 0xc2, 0x3b, 0x49, 0x39, 0x4f, 0x33, 0x88, 0x88, + 0xa0, 0x11, 0x61, 0x8c, 0x6b, 0xa2, 0x29, 0x67, 0xaa, 0x8c, 0x06, 0xd3, 0x67, 0x2a, 0xa4, 0xdc, + 0x46, 0x13, 0x2e, 0x21, 0x2a, 0x06, 0x51, 0x0a, 0x0c, 0x24, 0xd1, 0x30, 0x2e, 0xdf, 0xbc, 0x4d, + 0xa9, 0x9e, 0xcc, 0x46, 0x61, 0xc2, 0xf3, 0x88, 0x48, 0x2b, 0xf1, 0xc9, 0x1a, 0x4f, 0x92, 0x71, + 0x24, 0xa6, 0xa9, 0xf9, 0x58, 0x45, 0x44, 0x88, 0x8c, 0x26, 0x96, 0x3c, 0x2a, 0x06, 0x24, 0x13, + 0x13, 0x72, 0x8b, 0x2a, 0xf8, 0xd9, 0x42, 0x07, 0x17, 0x84, 0xd1, 0x6b, 0x50, 0x3a, 0x86, 0xcf, + 0x33, 0x50, 0x1a, 0xbf, 0x47, 0x6d, 0x53, 0x84, 0xeb, 0xf8, 0x4e, 0x7f, 0x7f, 0xf8, 0x3a, 0xac, + 0xd5, 0xc2, 0x4a, 0xcd, 0x1a, 0x1f, 0x93, 0x71, 0x28, 0xa6, 0x69, 0x68, 0xd4, 0xc2, 0x86, 0x5a, + 0x58, 0xa9, 0x85, 0xf1, 0xb2, 0x17, 0xb1, 0xa5, 0xc4, 0x1e, 0xda, 0x93, 0x50, 0x50, 0x45, 0x39, + 0x73, 0xb7, 0x7d, 0xa7, 0xdf, 0x8d, 0x97, 0x3e, 0xc6, 0xa8, 0x2d, 0x88, 0x9e, 0xb8, 0x2d, 0x8b, + 0x5b, 0x1b, 0xfb, 0x68, 0x1f, 0x58, 0x41, 0x25, 0x67, 0x39, 0x30, 0xed, 0xb6, 0x6d, 0xa8, 0x09, + 0x19, 0x46, 0x22, 0xc4, 0x39, 0x19, 0x41, 0xe6, 0xee, 0x2c, 0x18, 0x2b, 0x1f, 0x7f, 0x73, 0xd0, + 0x71, 0xc2, 0x73, 0xc1, 0x19, 0x30, 0x7d, 0x45, 0x24, 0xc9, 0x41, 0x83, 0xbc, 0x2c, 0x40, 0x4a, + 0x3a, 0x06, 0xe5, 0x76, 0xfc, 0x56, 0x7f, 0x7f, 0x78, 0xf1, 0x17, 0x05, 0xbe, 0xba, 0xc5, 0x1e, + 0xdf, 0xa5, 0x88, 0x7b, 0x08, 0x15, 0x24, 0x9b, 0xc1, 0x1b, 0x9a, 0x81, 0x72, 0x77, 0xfd, 0x56, + 0xbf, 0x1b, 0x37, 0x10, 0x7c, 0x82, 0xba, 0x8c, 0xe4, 0xa0, 0x04, 0x49, 0xc0, 0xdd, 0xb3, 0xe5, + 0xd4, 0x80, 0xf9, 0xda, 0x38, 0x57, 0x12, 0xae, 0xe9, 0x17, 0xb7, 0x6b, 0xc3, 0x0d, 0x24, 0xb8, + 0x71, 0xd0, 0x61, 0x3d, 0x4c, 0x25, 0x38, 0x53, 0x60, 0x28, 0xf3, 0x12, 0x53, 0xae, 0x63, 0x15, + 0x6b, 0x60, 0x55, 0x70, 0x7b, 0x5d, 0xf0, 0x21, 0xea, 0x2c, 0x56, 0xbe, 0x1c, 0x4a, 0xe9, 0xad, + 0x8c, 0xb1, 0xbd, 0x36, 0x46, 0x40, 0x1d, 0x61, 0x0a, 0x57, 0xee, 0xce, 0xbf, 0x68, 0x6f, 0x49, + 0x1e, 0x7c, 0x77, 0xd0, 0xff, 0xe7, 0x54, 0xe9, 0x53, 0x2a, 0xef, 0xdf, 0xde, 0x06, 0x3e, 0xda, + 0x33, 0x03, 0x35, 0x09, 0xe2, 0x23, 0xb4, 0x43, 0x35, 0xe4, 0x55, 0xf3, 0x17, 0x8e, 0xcd, 0xff, + 0x0c, 0xb4, 0x79, 0x75, 0x0f, 0xf3, 0x7f, 0x84, 0x0e, 0x96, 0xc9, 0x95, 0x7b, 0x84, 0x51, 0x7b, + 0x4c, 0x34, 0xb1, 0xd9, 0xfd, 0x17, 0x5b, 0x7b, 0x78, 0xe3, 0xa0, 0x07, 0xb5, 0xd6, 0x3b, 0x90, + 0x05, 0x4d, 0x00, 0x5f, 0xa2, 0xc3, 0xb3, 0xf2, 0xcc, 0x54, 0xdb, 0x88, 0x8f, 0xc3, 0xc6, 0xa5, + 0x5c, 0x3b, 0x38, 0xde, 0xc9, 0xe6, 0xe0, 0x42, 0x38, 0xd8, 0xc2, 0xcf, 0xd1, 0x6e, 0x39, 0x6a, + 0xec, 0x35, 0x9f, 0xae, 0xce, 0xdf, 0x3b, 0x6a, 0xc6, 0xaa, 0xf6, 0x07, 0x5b, 0xf8, 0x14, 0xed, + 0x96, 0xc5, 0xac, 0x7e, 0xbe, 0xda, 0x7e, 0xef, 0x78, 0x63, 0xac, 0x4a, 0xe2, 0xe5, 0x8b, 0x1f, + 0xf3, 0x9e, 0xf3, 0x6b, 0xde, 0x73, 0x7e, 0xcf, 0x7b, 0xce, 0x87, 0xc1, 0x5d, 0x27, 0x78, 0xe3, + 0xaf, 0x62, 0xd4, 0xb1, 0x17, 0xf7, 0xe9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x03, 0x2d, + 0xa5, 0x4a, 0x06, 0x00, 0x00, } diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto index 9638d45af0ff2..a8ba6b1381bd0 100644 --- a/reposerver/repository/repository.proto +++ b/reposerver/repository/repository.proto @@ -18,6 +18,7 @@ message ManifestRequest { repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ComponentParameter componentParameterOverrides = 6; repeated string valueFiles = 7; string namespace = 8; + string namePrefix = 9; } message ManifestResponse { diff --git a/server/account/account.pb.go b/server/account/account.pb.go index af01a1b26365b..ab3e7b80d9bb9 100644 --- a/server/account/account.pb.go +++ b/server/account/account.pb.go @@ -37,7 +37,7 @@ func (m *UpdatePasswordRequest) Reset() { *m = UpdatePasswordRequest{} } func (m *UpdatePasswordRequest) String() string { return proto.CompactTextString(m) } func (*UpdatePasswordRequest) ProtoMessage() {} func (*UpdatePasswordRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_account_d27ff2bbd0f6944b, []int{0} + return fileDescriptor_account_c227670d8e34bf5f, []int{0} } func (m *UpdatePasswordRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +90,7 @@ func (m *UpdatePasswordResponse) Reset() { *m = UpdatePasswordResponse{} func (m *UpdatePasswordResponse) String() string { return proto.CompactTextString(m) } func (*UpdatePasswordResponse) ProtoMessage() {} func (*UpdatePasswordResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_account_d27ff2bbd0f6944b, []int{1} + return fileDescriptor_account_c227670d8e34bf5f, []int{1} } func (m *UpdatePasswordResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,10 +566,10 @@ var ( ) func init() { - proto.RegisterFile("server/account/account.proto", fileDescriptor_account_d27ff2bbd0f6944b) + proto.RegisterFile("server/account/account.proto", fileDescriptor_account_c227670d8e34bf5f) } -var fileDescriptor_account_d27ff2bbd0f6944b = []byte{ +var fileDescriptor_account_c227670d8e34bf5f = []byte{ // 268 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x81, 0xd1, 0x7a, 0x05, 0x45, 0xf9, diff --git a/server/application/application.go b/server/application/application.go index 2285dfe773693..0a0cade9cf054 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -243,6 +243,7 @@ func (s *Server) GetManifests(ctx context.Context, q *ApplicationManifestQuery) AppLabel: a.Name, ValueFiles: a.Spec.Source.ValuesFiles, Namespace: a.Spec.Destination.Namespace, + NamePrefix: a.Spec.Source.NamePrefix, }) if err != nil { return nil, err diff --git a/server/application/application.pb.go b/server/application/application.pb.go index c309eb4fe7645..eee0e2c5e6677 100644 --- a/server/application/application.pb.go +++ b/server/application/application.pb.go @@ -51,7 +51,7 @@ func (m *ApplicationQuery) Reset() { *m = ApplicationQuery{} } func (m *ApplicationQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationQuery) ProtoMessage() {} func (*ApplicationQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{0} + return fileDescriptor_application_29e2d383e1dc72bd, []int{0} } func (m *ApplicationQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -115,7 +115,7 @@ func (m *ApplicationResourceEventsQuery) Reset() { *m = ApplicationResou func (m *ApplicationResourceEventsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceEventsQuery) ProtoMessage() {} func (*ApplicationResourceEventsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{1} + return fileDescriptor_application_29e2d383e1dc72bd, []int{1} } func (m *ApplicationResourceEventsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -178,7 +178,7 @@ func (m *ApplicationManifestQuery) Reset() { *m = ApplicationManifestQue func (m *ApplicationManifestQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationManifestQuery) ProtoMessage() {} func (*ApplicationManifestQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{2} + return fileDescriptor_application_29e2d383e1dc72bd, []int{2} } func (m *ApplicationManifestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -231,7 +231,7 @@ func (m *ApplicationResponse) Reset() { *m = ApplicationResponse{} } func (m *ApplicationResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResponse) ProtoMessage() {} func (*ApplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{3} + return fileDescriptor_application_29e2d383e1dc72bd, []int{3} } func (m *ApplicationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -272,7 +272,7 @@ func (m *ApplicationCreateRequest) Reset() { *m = ApplicationCreateReque func (m *ApplicationCreateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationCreateRequest) ProtoMessage() {} func (*ApplicationCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{4} + return fileDescriptor_application_29e2d383e1dc72bd, []int{4} } func (m *ApplicationCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -326,7 +326,7 @@ func (m *ApplicationUpdateRequest) Reset() { *m = ApplicationUpdateReque func (m *ApplicationUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateRequest) ProtoMessage() {} func (*ApplicationUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{5} + return fileDescriptor_application_29e2d383e1dc72bd, []int{5} } func (m *ApplicationUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -374,7 +374,7 @@ func (m *ApplicationDeleteRequest) Reset() { *m = ApplicationDeleteReque func (m *ApplicationDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationDeleteRequest) ProtoMessage() {} func (*ApplicationDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{6} + return fileDescriptor_application_29e2d383e1dc72bd, []int{6} } func (m *ApplicationDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -435,7 +435,7 @@ func (m *ApplicationSyncRequest) Reset() { *m = ApplicationSyncRequest{} func (m *ApplicationSyncRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationSyncRequest) ProtoMessage() {} func (*ApplicationSyncRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{7} + return fileDescriptor_application_29e2d383e1dc72bd, []int{7} } func (m *ApplicationSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -526,7 +526,7 @@ func (m *ParameterOverrides) Reset() { *m = ParameterOverrides{} } func (m *ParameterOverrides) String() string { return proto.CompactTextString(m) } func (*ParameterOverrides) ProtoMessage() {} func (*ParameterOverrides) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{8} + return fileDescriptor_application_29e2d383e1dc72bd, []int{8} } func (m *ParameterOverrides) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -575,7 +575,7 @@ func (m *Parameter) Reset() { *m = Parameter{} } func (m *Parameter) String() string { return proto.CompactTextString(m) } func (*Parameter) ProtoMessage() {} func (*Parameter) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{9} + return fileDescriptor_application_29e2d383e1dc72bd, []int{9} } func (m *Parameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -638,7 +638,7 @@ func (m *ApplicationUpdateSpecRequest) Reset() { *m = ApplicationUpdateS func (m *ApplicationUpdateSpecRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationUpdateSpecRequest) ProtoMessage() {} func (*ApplicationUpdateSpecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{10} + return fileDescriptor_application_29e2d383e1dc72bd, []int{10} } func (m *ApplicationUpdateSpecRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -695,7 +695,7 @@ func (m *ApplicationRollbackRequest) Reset() { *m = ApplicationRollbackR func (m *ApplicationRollbackRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationRollbackRequest) ProtoMessage() {} func (*ApplicationRollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{11} + return fileDescriptor_application_29e2d383e1dc72bd, []int{11} } func (m *ApplicationRollbackRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -766,7 +766,7 @@ func (m *ApplicationDeleteResourceRequest) Reset() { *m = ApplicationDel func (m *ApplicationDeleteResourceRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationDeleteResourceRequest) ProtoMessage() {} func (*ApplicationDeleteResourceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{12} + return fileDescriptor_application_29e2d383e1dc72bd, []int{12} } func (m *ApplicationDeleteResourceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -840,7 +840,7 @@ func (m *ApplicationPodLogsQuery) Reset() { *m = ApplicationPodLogsQuery func (m *ApplicationPodLogsQuery) String() string { return proto.CompactTextString(m) } func (*ApplicationPodLogsQuery) ProtoMessage() {} func (*ApplicationPodLogsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{13} + return fileDescriptor_application_29e2d383e1dc72bd, []int{13} } func (m *ApplicationPodLogsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -930,7 +930,7 @@ func (m *LogEntry) Reset() { *m = LogEntry{} } func (m *LogEntry) String() string { return proto.CompactTextString(m) } func (*LogEntry) ProtoMessage() {} func (*LogEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{14} + return fileDescriptor_application_29e2d383e1dc72bd, []int{14} } func (m *LogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -984,7 +984,7 @@ func (m *OperationTerminateRequest) Reset() { *m = OperationTerminateReq func (m *OperationTerminateRequest) String() string { return proto.CompactTextString(m) } func (*OperationTerminateRequest) ProtoMessage() {} func (*OperationTerminateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{15} + return fileDescriptor_application_29e2d383e1dc72bd, []int{15} } func (m *OperationTerminateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1030,7 +1030,7 @@ func (m *OperationTerminateResponse) Reset() { *m = OperationTerminateRe func (m *OperationTerminateResponse) String() string { return proto.CompactTextString(m) } func (*OperationTerminateResponse) ProtoMessage() {} func (*OperationTerminateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_a0bd93d5f02bc9d6, []int{16} + return fileDescriptor_application_29e2d383e1dc72bd, []int{16} } func (m *OperationTerminateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -4934,10 +4934,10 @@ var ( ) func init() { - proto.RegisterFile("server/application/application.proto", fileDescriptor_application_a0bd93d5f02bc9d6) + proto.RegisterFile("server/application/application.proto", fileDescriptor_application_29e2d383e1dc72bd) } -var fileDescriptor_application_a0bd93d5f02bc9d6 = []byte{ +var fileDescriptor_application_29e2d383e1dc72bd = []byte{ // 1427 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcf, 0x6f, 0x1b, 0x45, 0x14, 0x66, 0xec, 0xc4, 0x8e, 0x5f, 0x2a, 0x04, 0x43, 0x1b, 0x96, 0x25, 0x4d, 0xac, 0x6d, 0x9a, diff --git a/server/cluster/cluster.pb.go b/server/cluster/cluster.pb.go index 3b955688baba4..fa4c2ba9ebf42 100644 --- a/server/cluster/cluster.pb.go +++ b/server/cluster/cluster.pb.go @@ -45,7 +45,7 @@ func (m *ClusterQuery) Reset() { *m = ClusterQuery{} } func (m *ClusterQuery) String() string { return proto.CompactTextString(m) } func (*ClusterQuery) ProtoMessage() {} func (*ClusterQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{0} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{0} } func (m *ClusterQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,7 +91,7 @@ func (m *ClusterResponse) Reset() { *m = ClusterResponse{} } func (m *ClusterResponse) String() string { return proto.CompactTextString(m) } func (*ClusterResponse) ProtoMessage() {} func (*ClusterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{1} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{1} } func (m *ClusterResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -132,7 +132,7 @@ func (m *ClusterCreateRequest) Reset() { *m = ClusterCreateRequest{} } func (m *ClusterCreateRequest) String() string { return proto.CompactTextString(m) } func (*ClusterCreateRequest) ProtoMessage() {} func (*ClusterCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{2} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{2} } func (m *ClusterCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -189,7 +189,7 @@ func (m *ClusterCreateFromKubeConfigRequest) Reset() { *m = ClusterCreat func (m *ClusterCreateFromKubeConfigRequest) String() string { return proto.CompactTextString(m) } func (*ClusterCreateFromKubeConfigRequest) ProtoMessage() {} func (*ClusterCreateFromKubeConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{3} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{3} } func (m *ClusterCreateFromKubeConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -257,7 +257,7 @@ func (m *ClusterUpdateRequest) Reset() { *m = ClusterUpdateRequest{} } func (m *ClusterUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ClusterUpdateRequest) ProtoMessage() {} func (*ClusterUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_cluster_0875510a34378ea0, []int{4} + return fileDescriptor_cluster_bf8d7367dfc95a3e, []int{4} } func (m *ClusterUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1393,10 +1393,10 @@ var ( ) func init() { - proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_0875510a34378ea0) + proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_bf8d7367dfc95a3e) } -var fileDescriptor_cluster_0875510a34378ea0 = []byte{ +var fileDescriptor_cluster_bf8d7367dfc95a3e = []byte{ // 564 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcd, 0x6e, 0x13, 0x31, 0x10, 0xc7, 0xe5, 0xb6, 0xda, 0x12, 0x83, 0xf8, 0xb0, 0x0a, 0x5a, 0xd2, 0x10, 0xa5, 0x3e, 0x54, diff --git a/server/project/project.pb.go b/server/project/project.pb.go index 492ce08be4a2c..cb59249682e04 100644 --- a/server/project/project.pb.go +++ b/server/project/project.pb.go @@ -46,7 +46,7 @@ func (m *ProjectCreateRequest) Reset() { *m = ProjectCreateRequest{} } func (m *ProjectCreateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectCreateRequest) ProtoMessage() {} func (*ProjectCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{0} + return fileDescriptor_project_8d94583ca767d5b3, []int{0} } func (m *ProjectCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -96,7 +96,7 @@ func (m *ProjectTokenDeleteRequest) Reset() { *m = ProjectTokenDeleteReq func (m *ProjectTokenDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ProjectTokenDeleteRequest) ProtoMessage() {} func (*ProjectTokenDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{1} + return fileDescriptor_project_8d94583ca767d5b3, []int{1} } func (m *ProjectTokenDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,7 +162,7 @@ func (m *ProjectTokenCreateRequest) Reset() { *m = ProjectTokenCreateReq func (m *ProjectTokenCreateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectTokenCreateRequest) ProtoMessage() {} func (*ProjectTokenCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{2} + return fileDescriptor_project_8d94583ca767d5b3, []int{2} } func (m *ProjectTokenCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -231,7 +231,7 @@ func (m *ProjectTokenResponse) Reset() { *m = ProjectTokenResponse{} } func (m *ProjectTokenResponse) String() string { return proto.CompactTextString(m) } func (*ProjectTokenResponse) ProtoMessage() {} func (*ProjectTokenResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{3} + return fileDescriptor_project_8d94583ca767d5b3, []int{3} } func (m *ProjectTokenResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -279,7 +279,7 @@ func (m *ProjectQuery) Reset() { *m = ProjectQuery{} } func (m *ProjectQuery) String() string { return proto.CompactTextString(m) } func (*ProjectQuery) ProtoMessage() {} func (*ProjectQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{4} + return fileDescriptor_project_8d94583ca767d5b3, []int{4} } func (m *ProjectQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -326,7 +326,7 @@ func (m *ProjectUpdateRequest) Reset() { *m = ProjectUpdateRequest{} } func (m *ProjectUpdateRequest) String() string { return proto.CompactTextString(m) } func (*ProjectUpdateRequest) ProtoMessage() {} func (*ProjectUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{5} + return fileDescriptor_project_8d94583ca767d5b3, []int{5} } func (m *ProjectUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -372,7 +372,7 @@ func (m *EmptyResponse) Reset() { *m = EmptyResponse{} } func (m *EmptyResponse) String() string { return proto.CompactTextString(m) } func (*EmptyResponse) ProtoMessage() {} func (*EmptyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_project_082822b5d17b8c4e, []int{6} + return fileDescriptor_project_8d94583ca767d5b3, []int{6} } func (m *EmptyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1846,10 +1846,10 @@ var ( ) func init() { - proto.RegisterFile("server/project/project.proto", fileDescriptor_project_082822b5d17b8c4e) + proto.RegisterFile("server/project/project.proto", fileDescriptor_project_8d94583ca767d5b3) } -var fileDescriptor_project_082822b5d17b8c4e = []byte{ +var fileDescriptor_project_8d94583ca767d5b3 = []byte{ // 697 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x5d, 0x6b, 0x13, 0x4d, 0x14, 0x66, 0x9a, 0xbe, 0x79, 0xdf, 0x4e, 0x5e, 0xb5, 0x0c, 0xad, 0xa6, 0xb1, 0x8d, 0x61, 0x2e, diff --git a/server/repository/repository.pb.go b/server/repository/repository.pb.go index aa4eabde84f4b..803c50098f571 100644 --- a/server/repository/repository.pb.go +++ b/server/repository/repository.pb.go @@ -46,7 +46,7 @@ func (m *RepoAppsQuery) Reset() { *m = RepoAppsQuery{} } func (m *RepoAppsQuery) String() string { return proto.CompactTextString(m) } func (*RepoAppsQuery) ProtoMessage() {} func (*RepoAppsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{0} + return fileDescriptor_repository_6cfdcc280f230e64, []int{0} } func (m *RepoAppsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -102,7 +102,7 @@ func (m *AppInfo) Reset() { *m = AppInfo{} } func (m *AppInfo) String() string { return proto.CompactTextString(m) } func (*AppInfo) ProtoMessage() {} func (*AppInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{1} + return fileDescriptor_repository_6cfdcc280f230e64, []int{1} } func (m *AppInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +159,7 @@ func (m *RepoAppDetailsQuery) Reset() { *m = RepoAppDetailsQuery{} } func (m *RepoAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsQuery) ProtoMessage() {} func (*RepoAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{2} + return fileDescriptor_repository_6cfdcc280f230e64, []int{2} } func (m *RepoAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,7 +224,7 @@ func (m *RepoAppDetailsResponse) Reset() { *m = RepoAppDetailsResponse{} func (m *RepoAppDetailsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppDetailsResponse) ProtoMessage() {} func (*RepoAppDetailsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{3} + return fileDescriptor_repository_6cfdcc280f230e64, []int{3} } func (m *RepoAppDetailsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -293,7 +293,7 @@ func (m *RepoAppsResponse) Reset() { *m = RepoAppsResponse{} } func (m *RepoAppsResponse) String() string { return proto.CompactTextString(m) } func (*RepoAppsResponse) ProtoMessage() {} func (*RepoAppsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{4} + return fileDescriptor_repository_6cfdcc280f230e64, []int{4} } func (m *RepoAppsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -344,7 +344,7 @@ func (m *KsonnetAppSpec) Reset() { *m = KsonnetAppSpec{} } func (m *KsonnetAppSpec) String() string { return proto.CompactTextString(m) } func (*KsonnetAppSpec) ProtoMessage() {} func (*KsonnetAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{5} + return fileDescriptor_repository_6cfdcc280f230e64, []int{5} } func (m *KsonnetAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -408,7 +408,7 @@ func (m *HelmAppSpec) Reset() { *m = HelmAppSpec{} } func (m *HelmAppSpec) String() string { return proto.CompactTextString(m) } func (*HelmAppSpec) ProtoMessage() {} func (*HelmAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{6} + return fileDescriptor_repository_6cfdcc280f230e64, []int{6} } func (m *HelmAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -470,7 +470,7 @@ func (m *KustomizeAppSpec) Reset() { *m = KustomizeAppSpec{} } func (m *KustomizeAppSpec) String() string { return proto.CompactTextString(m) } func (*KustomizeAppSpec) ProtoMessage() {} func (*KustomizeAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{7} + return fileDescriptor_repository_6cfdcc280f230e64, []int{7} } func (m *KustomizeAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -524,7 +524,7 @@ func (m *KsonnetEnvironment) Reset() { *m = KsonnetEnvironment{} } func (m *KsonnetEnvironment) String() string { return proto.CompactTextString(m) } func (*KsonnetEnvironment) ProtoMessage() {} func (*KsonnetEnvironment) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{8} + return fileDescriptor_repository_6cfdcc280f230e64, []int{8} } func (m *KsonnetEnvironment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -595,7 +595,7 @@ func (m *KsonnetEnvironmentDestination) Reset() { *m = KsonnetEnvironmen func (m *KsonnetEnvironmentDestination) String() string { return proto.CompactTextString(m) } func (*KsonnetEnvironmentDestination) ProtoMessage() {} func (*KsonnetEnvironmentDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{9} + return fileDescriptor_repository_6cfdcc280f230e64, []int{9} } func (m *KsonnetEnvironmentDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -650,7 +650,7 @@ func (m *RepoQuery) Reset() { *m = RepoQuery{} } func (m *RepoQuery) String() string { return proto.CompactTextString(m) } func (*RepoQuery) ProtoMessage() {} func (*RepoQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{10} + return fileDescriptor_repository_6cfdcc280f230e64, []int{10} } func (m *RepoQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -696,7 +696,7 @@ func (m *RepoResponse) Reset() { *m = RepoResponse{} } func (m *RepoResponse) String() string { return proto.CompactTextString(m) } func (*RepoResponse) ProtoMessage() {} func (*RepoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{11} + return fileDescriptor_repository_6cfdcc280f230e64, []int{11} } func (m *RepoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -737,7 +737,7 @@ func (m *RepoCreateRequest) Reset() { *m = RepoCreateRequest{} } func (m *RepoCreateRequest) String() string { return proto.CompactTextString(m) } func (*RepoCreateRequest) ProtoMessage() {} func (*RepoCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{12} + return fileDescriptor_repository_6cfdcc280f230e64, []int{12} } func (m *RepoCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -791,7 +791,7 @@ func (m *RepoUpdateRequest) Reset() { *m = RepoUpdateRequest{} } func (m *RepoUpdateRequest) String() string { return proto.CompactTextString(m) } func (*RepoUpdateRequest) ProtoMessage() {} func (*RepoUpdateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_31d36efd186d2b01, []int{13} + return fileDescriptor_repository_6cfdcc280f230e64, []int{13} } func (m *RepoUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3710,10 +3710,10 @@ var ( ) func init() { - proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_31d36efd186d2b01) + proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_6cfdcc280f230e64) } -var fileDescriptor_repository_31d36efd186d2b01 = []byte{ +var fileDescriptor_repository_6cfdcc280f230e64 = []byte{ // 911 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x5b, 0x45, 0x10, 0xd7, 0xc6, 0xa9, 0x13, 0x8f, 0xdb, 0x2a, 0xdd, 0x96, 0x60, 0x1e, 0x8e, 0x1b, 0x2d, 0x12, diff --git a/server/session/session.pb.go b/server/session/session.pb.go index e3db19fa810ae..f594a9a3f7362 100644 --- a/server/session/session.pb.go +++ b/server/session/session.pb.go @@ -47,7 +47,7 @@ func (m *SessionCreateRequest) Reset() { *m = SessionCreateRequest{} } func (m *SessionCreateRequest) String() string { return proto.CompactTextString(m) } func (*SessionCreateRequest) ProtoMessage() {} func (*SessionCreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{0} + return fileDescriptor_session_217b926c109d1cc2, []int{0} } func (m *SessionCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -108,7 +108,7 @@ func (m *SessionDeleteRequest) Reset() { *m = SessionDeleteRequest{} } func (m *SessionDeleteRequest) String() string { return proto.CompactTextString(m) } func (*SessionDeleteRequest) ProtoMessage() {} func (*SessionDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{1} + return fileDescriptor_session_217b926c109d1cc2, []int{1} } func (m *SessionDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -149,7 +149,7 @@ func (m *SessionResponse) Reset() { *m = SessionResponse{} } func (m *SessionResponse) String() string { return proto.CompactTextString(m) } func (*SessionResponse) ProtoMessage() {} func (*SessionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_session_8e535ce77fc5e082, []int{2} + return fileDescriptor_session_217b926c109d1cc2, []int{2} } func (m *SessionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -827,10 +827,10 @@ var ( ) func init() { - proto.RegisterFile("server/session/session.proto", fileDescriptor_session_8e535ce77fc5e082) + proto.RegisterFile("server/session/session.proto", fileDescriptor_session_217b926c109d1cc2) } -var fileDescriptor_session_8e535ce77fc5e082 = []byte{ +var fileDescriptor_session_217b926c109d1cc2 = []byte{ // 356 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xb1, 0x4e, 0xeb, 0x30, 0x14, 0x86, 0xe5, 0x5e, 0xdd, 0xde, 0x7b, 0x3d, 0xdc, 0x8a, 0x28, 0x82, 0x28, 0x2a, 0x15, 0xca, diff --git a/server/settings/settings.pb.go b/server/settings/settings.pb.go index a825a3ae6c6c9..c50c207503f6a 100644 --- a/server/settings/settings.pb.go +++ b/server/settings/settings.pb.go @@ -42,7 +42,7 @@ func (m *SettingsQuery) Reset() { *m = SettingsQuery{} } func (m *SettingsQuery) String() string { return proto.CompactTextString(m) } func (*SettingsQuery) ProtoMessage() {} func (*SettingsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_843b05f20a608370, []int{0} + return fileDescriptor_settings_78f024359af61686, []int{0} } func (m *SettingsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -84,7 +84,7 @@ func (m *Settings) Reset() { *m = Settings{} } func (m *Settings) String() string { return proto.CompactTextString(m) } func (*Settings) ProtoMessage() {} func (*Settings) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_843b05f20a608370, []int{1} + return fileDescriptor_settings_78f024359af61686, []int{1} } func (m *Settings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -145,7 +145,7 @@ func (m *DexConfig) Reset() { *m = DexConfig{} } func (m *DexConfig) String() string { return proto.CompactTextString(m) } func (*DexConfig) ProtoMessage() {} func (*DexConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_843b05f20a608370, []int{2} + return fileDescriptor_settings_78f024359af61686, []int{2} } func (m *DexConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -193,7 +193,7 @@ func (m *Connector) Reset() { *m = Connector{} } func (m *Connector) String() string { return proto.CompactTextString(m) } func (*Connector) ProtoMessage() {} func (*Connector) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_843b05f20a608370, []int{3} + return fileDescriptor_settings_78f024359af61686, []int{3} } func (m *Connector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -249,7 +249,7 @@ func (m *OIDCConfig) Reset() { *m = OIDCConfig{} } func (m *OIDCConfig) String() string { return proto.CompactTextString(m) } func (*OIDCConfig) ProtoMessage() {} func (*OIDCConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_settings_843b05f20a608370, []int{4} + return fileDescriptor_settings_78f024359af61686, []int{4} } func (m *OIDCConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1291,10 +1291,10 @@ var ( ) func init() { - proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_843b05f20a608370) + proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_78f024359af61686) } -var fileDescriptor_settings_843b05f20a608370 = []byte{ +var fileDescriptor_settings_78f024359af61686 = []byte{ // 397 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xcd, 0x8a, 0xdb, 0x30, 0x18, 0x44, 0x71, 0x49, 0xe2, 0xaf, 0x3f, 0x69, 0xd5, 0x12, 0xdc, 0x50, 0x9c, 0xe0, 0x53, 0xa0, diff --git a/server/swagger.json b/server/swagger.json index 95c85aa792354..ef7d8fc2a6845 100644 --- a/server/swagger.json +++ b/server/swagger.json @@ -1198,6 +1198,87 @@ "accountUpdatePasswordResponse": { "type": "object" }, + "apismetav1ObjectMeta": { + "description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects\nusers must create.", + "type": "object", + "properties": { + "annotations": { + "type": "object", + "title": "Annotations is an unstructured key value map stored with a resource that may be\nset by external tools to store and retrieve arbitrary metadata. They are not\nqueryable and should be preserved when modifying objects.\nMore info: http://kubernetes.io/docs/user-guide/annotations\n+optional", + "additionalProperties": { + "type": "string" + } + }, + "clusterName": { + "type": "string", + "title": "The name of the cluster which the object belongs to.\nThis is used to distinguish resources with same name and namespace in different clusters.\nThis field is not set anywhere right now and apiserver is going to ignore it if set in create or update request.\n+optional" + }, + "creationTimestamp": { + "$ref": "#/definitions/v1Time" + }, + "deletionGracePeriodSeconds": { + "type": "string", + "format": "int64", + "title": "Number of seconds allowed for this object to gracefully terminate before\nit will be removed from the system. Only set when deletionTimestamp is also set.\nMay only be shortened.\nRead-only.\n+optional" + }, + "deletionTimestamp": { + "$ref": "#/definitions/v1Time" + }, + "finalizers": { + "type": "array", + "title": "Must be empty before the object is deleted from the registry. Each entry\nis an identifier for the responsible component that will remove the entry\nfrom the list. If the deletionTimestamp of the object is non-nil, entries\nin this list can only be removed.\n+optional\n+patchStrategy=merge", + "items": { + "type": "string" + } + }, + "generateName": { + "description": "GenerateName is an optional prefix, used by the server, to generate a unique\nname ONLY IF the Name field has not been provided.\nIf this field is used, the name returned to the client will be different\nthan the name passed. This value will also be combined with a unique suffix.\nThe provided value has the same validation rules as the Name field,\nand may be truncated by the length of the suffix required to make the value\nunique on the server.\n\nIf this field is specified and the generated name exists, the server will\nNOT return a 409 - instead, it will either return 201 Created or 500 with Reason\nServerTimeout indicating a unique name could not be found in the time allotted, and the client\nshould retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified.\nMore info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency\n+optional", + "type": "string" + }, + "generation": { + "type": "string", + "format": "int64", + "title": "A sequence number representing a specific generation of the desired state.\nPopulated by the system. Read-only.\n+optional" + }, + "initializers": { + "$ref": "#/definitions/v1Initializers" + }, + "labels": { + "type": "object", + "title": "Map of string keys and values that can be used to organize and categorize\n(scope and select) objects. May match selectors of replication controllers\nand services.\nMore info: http://kubernetes.io/docs/user-guide/labels\n+optional", + "additionalProperties": { + "type": "string" + } + }, + "name": { + "type": "string", + "title": "Name must be unique within a namespace. Is required when creating resources, although\nsome resources may allow a client to request the generation of an appropriate name\nautomatically. Name is primarily intended for creation idempotence and configuration\ndefinition.\nCannot be updated.\nMore info: http://kubernetes.io/docs/user-guide/identifiers#names\n+optional" + }, + "namespace": { + "description": "Namespace defines the space within each name must be unique. An empty namespace is\nequivalent to the \"default\" namespace, but \"default\" is the canonical representation.\nNot all objects are required to be scoped to a namespace - the value of this field for\nthose objects will be empty.\n\nMust be a DNS_LABEL.\nCannot be updated.\nMore info: http://kubernetes.io/docs/user-guide/namespaces\n+optional", + "type": "string" + }, + "ownerReferences": { + "type": "array", + "title": "List of objects depended by this object. If ALL objects in the list have\nbeen deleted, this object will be garbage collected. If this object is managed by a controller,\nthen an entry in this list will point to this controller, with the controller field set to true.\nThere cannot be more than one managing controller.\n+optional\n+patchMergeKey=uid\n+patchStrategy=merge", + "items": { + "$ref": "#/definitions/v1OwnerReference" + } + }, + "resourceVersion": { + "description": "An opaque value that represents the internal version of this object that can\nbe used by clients to determine when objects have changed. May be used for optimistic\nconcurrency, change detection, and the watch operation on a resource or set of resources.\nClients must treat these values as opaque and passed unmodified back to the server.\nThey may only be valid for a particular resource or set of resources.\n\nPopulated by the system.\nRead-only.\nValue must be treated as opaque by clients and .\nMore info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency\n+optional", + "type": "string" + }, + "selfLink": { + "type": "string", + "title": "SelfLink is a URL representing this object.\nPopulated by the system.\nRead-only.\n+optional" + }, + "uid": { + "description": "UID is the unique in time and space value for this object. It is typically generated by\nthe server on successful creation of a resource and is not allowed to change on PUT\noperations.\n\nPopulated by the system.\nRead-only.\nMore info: http://kubernetes.io/docs/user-guide/identifiers#uids\n+optional", + "type": "string" + } + } + }, "applicationApplicationResponse": { "type": "object" }, @@ -1629,7 +1710,7 @@ "title": "A human-readable description of the status of this operation.\nTODO: decide on maximum length.\n+optional" }, "metadata": { - "$ref": "#/definitions/v1ObjectMeta" + "$ref": "#/definitions/apismetav1ObjectMeta" }, "reason": { "type": "string", @@ -1750,7 +1831,7 @@ "type": "object", "properties": { "continue": { - "description": "continue may be set if the user set a limit on the number of items returned, and indicates that\nthe server has more data available. The value is opaque and may be used to issue another request\nto the endpoint that served this list to retrieve the next set of available objects. Continuing a\nconsistent list may not be possible if the server configuration has changed or more than a few\nminutes have passed. The resourceVersion field returned when using this continue value will be\nidentical to the value in the first response, unless you have received this token from an error\nmessage.", + "description": "continue may be set if the user set a limit on the number of items returned, and indicates that\nthe server has more data available. The value is opaque and may be used to issue another request\nto the endpoint that served this list to retrieve the next set of available objects. Continuing a\nlist may not be possible if the server configuration has changed or more than a few minutes have\npassed. The resourceVersion field returned when using this continue value will be identical to\nthe value in the first response.", "type": "string" }, "resourceVersion": { @@ -1779,87 +1860,6 @@ } } }, - "v1ObjectMeta": { - "description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects\nusers must create.", - "type": "object", - "properties": { - "annotations": { - "type": "object", - "title": "Annotations is an unstructured key value map stored with a resource that may be\nset by external tools to store and retrieve arbitrary metadata. They are not\nqueryable and should be preserved when modifying objects.\nMore info: http://kubernetes.io/docs/user-guide/annotations\n+optional", - "additionalProperties": { - "type": "string" - } - }, - "clusterName": { - "type": "string", - "title": "The name of the cluster which the object belongs to.\nThis is used to distinguish resources with same name and namespace in different clusters.\nThis field is not set anywhere right now and apiserver is going to ignore it if set in create or update request.\n+optional" - }, - "creationTimestamp": { - "$ref": "#/definitions/v1Time" - }, - "deletionGracePeriodSeconds": { - "type": "string", - "format": "int64", - "title": "Number of seconds allowed for this object to gracefully terminate before\nit will be removed from the system. Only set when deletionTimestamp is also set.\nMay only be shortened.\nRead-only.\n+optional" - }, - "deletionTimestamp": { - "$ref": "#/definitions/v1Time" - }, - "finalizers": { - "type": "array", - "title": "Must be empty before the object is deleted from the registry. Each entry\nis an identifier for the responsible component that will remove the entry\nfrom the list. If the deletionTimestamp of the object is non-nil, entries\nin this list can only be removed.\n+optional\n+patchStrategy=merge", - "items": { - "type": "string" - } - }, - "generateName": { - "description": "GenerateName is an optional prefix, used by the server, to generate a unique\nname ONLY IF the Name field has not been provided.\nIf this field is used, the name returned to the client will be different\nthan the name passed. This value will also be combined with a unique suffix.\nThe provided value has the same validation rules as the Name field,\nand may be truncated by the length of the suffix required to make the value\nunique on the server.\n\nIf this field is specified and the generated name exists, the server will\nNOT return a 409 - instead, it will either return 201 Created or 500 with Reason\nServerTimeout indicating a unique name could not be found in the time allotted, and the client\nshould retry (optionally after the time indicated in the Retry-After header).\n\nApplied only if Name is not specified.\nMore info: https://git.k8s.io/community/contributors/devel/api-conventions.md#idempotency\n+optional", - "type": "string" - }, - "generation": { - "type": "string", - "format": "int64", - "title": "A sequence number representing a specific generation of the desired state.\nPopulated by the system. Read-only.\n+optional" - }, - "initializers": { - "$ref": "#/definitions/v1Initializers" - }, - "labels": { - "type": "object", - "title": "Map of string keys and values that can be used to organize and categorize\n(scope and select) objects. May match selectors of replication controllers\nand services.\nMore info: http://kubernetes.io/docs/user-guide/labels\n+optional", - "additionalProperties": { - "type": "string" - } - }, - "name": { - "type": "string", - "title": "Name must be unique within a namespace. Is required when creating resources, although\nsome resources may allow a client to request the generation of an appropriate name\nautomatically. Name is primarily intended for creation idempotence and configuration\ndefinition.\nCannot be updated.\nMore info: http://kubernetes.io/docs/user-guide/identifiers#names\n+optional" - }, - "namespace": { - "description": "Namespace defines the space within each name must be unique. An empty namespace is\nequivalent to the \"default\" namespace, but \"default\" is the canonical representation.\nNot all objects are required to be scoped to a namespace - the value of this field for\nthose objects will be empty.\n\nMust be a DNS_LABEL.\nCannot be updated.\nMore info: http://kubernetes.io/docs/user-guide/namespaces\n+optional", - "type": "string" - }, - "ownerReferences": { - "type": "array", - "title": "List of objects depended by this object. If ALL objects in the list have\nbeen deleted, this object will be garbage collected. If this object is managed by a controller,\nthen an entry in this list will point to this controller, with the controller field set to true.\nThere cannot be more than one managing controller.\n+optional\n+patchMergeKey=uid\n+patchStrategy=merge", - "items": { - "$ref": "#/definitions/v1OwnerReference" - } - }, - "resourceVersion": { - "description": "An opaque value that represents the internal version of this object that can\nbe used by clients to determine when objects have changed. May be used for optimistic\nconcurrency, change detection, and the watch operation on a resource or set of resources.\nClients must treat these values as opaque and passed unmodified back to the server.\nThey may only be valid for a particular resource or set of resources.\n\nPopulated by the system.\nRead-only.\nValue must be treated as opaque by clients and .\nMore info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency\n+optional", - "type": "string" - }, - "selfLink": { - "type": "string", - "title": "SelfLink is a URL representing this object.\nPopulated by the system.\nRead-only.\n+optional" - }, - "uid": { - "description": "UID is the unique in time and space value for this object. It is typically generated by\nthe server on successful creation of a resource and is not allowed to change on PUT\noperations.\n\nPopulated by the system.\nRead-only.\nMore info: http://kubernetes.io/docs/user-guide/identifiers#uids\n+optional", - "type": "string" - } - } - }, "v1ObjectReference": { "type": "object", "title": "ObjectReference contains enough information to let you inspect or modify the referred object.\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object", @@ -2042,7 +2042,7 @@ "title": "AppProject is a definition of AppProject resource.\n+genclient\n+genclient:noStatus\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object", "properties": { "metadata": { - "$ref": "#/definitions/v1ObjectMeta" + "$ref": "#/definitions/apismetav1ObjectMeta" }, "spec": { "$ref": "#/definitions/v1alpha1AppProjectSpec" @@ -2113,7 +2113,7 @@ "title": "Application is a definition of Application resource.\n+genclient\n+genclient:noStatus\n+k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object", "properties": { "metadata": { - "$ref": "#/definitions/v1ObjectMeta" + "$ref": "#/definitions/apismetav1ObjectMeta" }, "operation": { "$ref": "#/definitions/v1alpha1Operation" @@ -2184,6 +2184,10 @@ "type": "string", "title": "Environment is a ksonnet application environment name" }, + "namePrefix": { + "type": "string", + "title": "NamePrefix is a prefix appended to resources for helm and kustomize apps" + }, "path": { "type": "string", "title": "Path is a directory path within the repository containing a" diff --git a/server/version/version.pb.go b/server/version/version.pb.go index ae8734accdafb..a6bd3d2c48771 100644 --- a/server/version/version.pb.go +++ b/server/version/version.pb.go @@ -51,7 +51,7 @@ func (m *VersionMessage) Reset() { *m = VersionMessage{} } func (m *VersionMessage) String() string { return proto.CompactTextString(m) } func (*VersionMessage) ProtoMessage() {} func (*VersionMessage) Descriptor() ([]byte, []int) { - return fileDescriptor_version_cdcdf9fc14514c9b, []int{0} + return fileDescriptor_version_6f54499c257f90e5, []int{0} } func (m *VersionMessage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -781,10 +781,10 @@ var ( ) func init() { - proto.RegisterFile("server/version/version.proto", fileDescriptor_version_cdcdf9fc14514c9b) + proto.RegisterFile("server/version/version.proto", fileDescriptor_version_6f54499c257f90e5) } -var fileDescriptor_version_cdcdf9fc14514c9b = []byte{ +var fileDescriptor_version_6f54499c257f90e5 = []byte{ // 343 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcf, 0x4a, 0xc3, 0x40, 0x10, 0xc6, 0x49, 0xd5, 0xfe, 0x59, 0x4a, 0x0f, 0x8b, 0xd4, 0x25, 0x96, 0x22, 0x3d, 0x88, 0x08, diff --git a/util/kustomize/kustomize.go b/util/kustomize/kustomize.go index bd9af9ebfaa50..aa72e399754e6 100644 --- a/util/kustomize/kustomize.go +++ b/util/kustomize/kustomize.go @@ -14,7 +14,7 @@ import ( // Kustomize provides wrapper functionality around the `kustomize` command. type Kustomize interface { // Build returns a list of unstructured objects from a `kustomize build` command and extract supported parameters - Build(namespace string, overrides []*v1alpha1.ComponentParameter) ([]*unstructured.Unstructured, []*v1alpha1.ComponentParameter, error) + Build(namespace string, namePrefix string, overrides []*v1alpha1.ComponentParameter) ([]*unstructured.Unstructured, []*v1alpha1.ComponentParameter, error) } // NewKustomizeApp create a new wrapper to run commands on the `kustomize` command-line tool. @@ -26,7 +26,7 @@ type kustomize struct { path string } -func (k *kustomize) Build(namespace string, overrides []*v1alpha1.ComponentParameter) ([]*unstructured.Unstructured, []*v1alpha1.ComponentParameter, error) { +func (k *kustomize) Build(namespace string, namePrefix string, overrides []*v1alpha1.ComponentParameter) ([]*unstructured.Unstructured, []*v1alpha1.ComponentParameter, error) { if namespace != "" { cmd := exec.Command("kustomize", "edit", "set", "namespace", namespace) cmd.Dir = k.path @@ -36,6 +36,15 @@ func (k *kustomize) Build(namespace string, overrides []*v1alpha1.ComponentParam } } + if namePrefix != "" { + cmd := exec.Command("kustomize", "edit", "set", "nameprefix", namePrefix) + cmd.Dir = k.path + _, err := argoexec.RunCommandExt(cmd) + if err != nil { + return nil, nil, err + } + } + for _, override := range overrides { cmd := exec.Command("kustomize", "edit", "set", "imagetag", fmt.Sprintf("%s:%s", override.Name, override.Value)) cmd.Dir = k.path diff --git a/util/kustomize/kustomize_test.go b/util/kustomize/kustomize_test.go index b1ba6e7887218..aea8f447aae6b 100644 --- a/util/kustomize/kustomize_test.go +++ b/util/kustomize/kustomize_test.go @@ -26,9 +26,9 @@ func testDataDir() (string, error) { func TestKustomizeBuild(t *testing.T) { appPath, err := testDataDir() assert.Nil(t, err) - + namePrefix := "namePrefix-" kustomize := NewKustomizeApp(appPath) - objs, params, err := kustomize.Build("mynamespace", []*v1alpha1.ComponentParameter{{ + objs, params, err := kustomize.Build("mynamespace", namePrefix, []*v1alpha1.ComponentParameter{{ Component: "imagetag", Name: "k8s.gcr.io/nginx-slim", Value: "latest", @@ -41,9 +41,9 @@ func TestKustomizeBuild(t *testing.T) { for _, obj := range objs { switch obj.GetKind() { case "StatefulSet": - assert.Equal(t, "web", obj.GetName()) + assert.Equal(t, namePrefix+"web", obj.GetName()) case "Deployment": - assert.Equal(t, "nginx-deployment", obj.GetName()) + assert.Equal(t, namePrefix+"nginx-deployment", obj.GetName()) } assert.Equal(t, "mynamespace", obj.GetNamespace()) }