diff --git a/assets/swagger.json b/assets/swagger.json index 3efc8567e4732..ce16be48188cd 100644 --- a/assets/swagger.json +++ b/assets/swagger.json @@ -49,7 +49,7 @@ "ApplicationService" ], "summary": "List returns list of applications", - "operationId": "ListMixin5", + "operationId": "ListMixin1", "parameters": [ { "type": "string", @@ -89,7 +89,7 @@ "ApplicationService" ], "summary": "Create creates an application", - "operationId": "CreateMixin5", + "operationId": "CreateMixin1", "parameters": [ { "name": "body", @@ -116,7 +116,7 @@ "ApplicationService" ], "summary": "Update updates an application", - "operationId": "UpdateMixin5", + "operationId": "UpdateMixin1", "parameters": [ { "type": "string", @@ -197,7 +197,7 @@ "ApplicationService" ], "summary": "Get returns an application by name", - "operationId": "GetMixin5", + "operationId": "Get", "parameters": [ { "type": "string", @@ -238,7 +238,7 @@ "ApplicationService" ], "summary": "Delete deletes an application", - "operationId": "DeleteMixin5", + "operationId": "DeleteMixin1", "parameters": [ { "type": "string", @@ -744,7 +744,7 @@ "ClusterService" ], "summary": "List returns list of clusters", - "operationId": "List", + "operationId": "ListMixin2", "parameters": [ { "type": "string", @@ -766,7 +766,7 @@ "ClusterService" ], "summary": "Create creates a cluster", - "operationId": "Create", + "operationId": "CreateMixin2", "parameters": [ { "name": "body", @@ -820,7 +820,7 @@ "ClusterService" ], "summary": "Update updates a cluster", - "operationId": "Update", + "operationId": "UpdateMixin2", "parameters": [ { "type": "string", @@ -853,7 +853,7 @@ "ClusterService" ], "summary": "Get returns a cluster by server address", - "operationId": "GetMixin1", + "operationId": "GetMixin2", "parameters": [ { "type": "string", @@ -876,7 +876,7 @@ "ClusterService" ], "summary": "Delete deletes a cluster", - "operationId": "Delete", + "operationId": "DeleteMixin2", "parameters": [ { "type": "string", @@ -1133,7 +1133,7 @@ "RepositoryService" ], "summary": "List returns list of repos", - "operationId": "ListMixin2", + "operationId": "List", "parameters": [ { "type": "string", @@ -1155,7 +1155,7 @@ "RepositoryService" ], "summary": "Create creates a repo", - "operationId": "CreateMixin2", + "operationId": "Create", "parameters": [ { "name": "body", @@ -1182,7 +1182,7 @@ "RepositoryService" ], "summary": "Update updates a repo", - "operationId": "UpdateMixin2", + "operationId": "Update", "parameters": [ { "type": "string", @@ -1215,7 +1215,7 @@ "RepositoryService" ], "summary": "Delete deletes a repo", - "operationId": "DeleteMixin2", + "operationId": "Delete", "parameters": [ { "type": "string", @@ -1361,7 +1361,7 @@ "SettingsService" ], "summary": "Get returns Argo CD settings", - "operationId": "Get", + "operationId": "GetMixin4", "responses": { "200": { "description": "(empty)", @@ -1568,6 +1568,10 @@ "kubeconfig": { "type": "string" }, + "systemNamespace": { + "type": "string", + "title": "Optional alternative system namespace to use (defaults to \"kube-system\")" + }, "upsert": { "type": "boolean", "format": "boolean" diff --git a/cmd/argocd/commands/cluster.go b/cmd/argocd/commands/cluster.go index d581f6c12abf4..7eb218faca5d9 100644 --- a/cmd/argocd/commands/cluster.go +++ b/cmd/argocd/commands/cluster.go @@ -45,10 +45,11 @@ func NewClusterCommand(clientOpts *argocdclient.ClientOptions, pathOpts *clientc // NewClusterAddCommand returns a new instance of an `argocd cluster add` command func NewClusterAddCommand(clientOpts *argocdclient.ClientOptions, pathOpts *clientcmd.PathOptions) *cobra.Command { var ( - inCluster bool - upsert bool - awsRoleArn string - awsClusterName string + inCluster bool + upsert bool + awsRoleArn string + awsClusterName string + systemNamespace string ) var command = &cobra.Command{ Use: "add", @@ -85,7 +86,7 @@ func NewClusterAddCommand(clientOpts *argocdclient.ClientOptions, pathOpts *clie // Install RBAC resources for managing the cluster clientset, err := kubernetes.NewForConfig(conf) errors.CheckError(err) - managerBearerToken, err = common.InstallClusterManagerRBAC(clientset) + managerBearerToken, err = common.InstallClusterManagerRBAC(clientset, systemNamespace) errors.CheckError(err) } conn, clusterIf := argocdclient.NewClientOrDie(clientOpts).NewClusterClientOrDie() @@ -108,6 +109,7 @@ func NewClusterAddCommand(clientOpts *argocdclient.ClientOptions, pathOpts *clie command.Flags().BoolVar(&upsert, "upsert", false, "Override an existing cluster with the same name even if the spec differs") command.Flags().StringVar(&awsClusterName, "aws-cluster-name", "", "AWS Cluster name if set then aws-iam-authenticator will be used to access cluster") command.Flags().StringVar(&awsRoleArn, "aws-role-arn", "", "Optional AWS role arn. If set then AWS IAM Authenticator assume a role to perform cluster operations instead of the default AWS credential provider chain.") + command.Flags().StringVar(&systemNamespace, "system-namespace", common.DefaultSystemNamespace, "Use different system namespace") return command } diff --git a/common/common.go b/common/common.go index 47297c8d1f489..95c47406d2158 100644 --- a/common/common.go +++ b/common/common.go @@ -17,6 +17,11 @@ const ( ArgoCDRBACConfigMapName = "argocd-rbac-cm" ) +// Default system namespace +const ( + DefaultSystemNamespace = "kube-system" +) + // Default listener ports for ArgoCD components const ( DefaultPortAPIServer = 8080 diff --git a/common/installer.go b/common/installer.go index caf05f626ae79..45c487b8912fb 100644 --- a/common/installer.go +++ b/common/installer.go @@ -33,7 +33,7 @@ var ArgoCDManagerPolicyRules = []rbacv1.PolicyRule{ }, } -// CreateServiceAccount creates a service account +// CreateServiceAccount creates a service account in a given namespace func CreateServiceAccount( clientset kubernetes.Interface, serviceAccountName string, @@ -52,12 +52,12 @@ func CreateServiceAccount( _, err := clientset.CoreV1().ServiceAccounts(namespace).Create(&serviceAccount) if err != nil { if !apierr.IsAlreadyExists(err) { - return fmt.Errorf("Failed to create service account %q: %v", serviceAccountName, err) + return fmt.Errorf("Failed to create service account %q in namespace %q: %v", serviceAccountName, namespace, err) } - log.Infof("ServiceAccount %q already exists", serviceAccountName) + log.Infof("ServiceAccount %q already exists in namespace %q", serviceAccountName, namespace) return nil } - log.Infof("ServiceAccount %q created", serviceAccountName) + log.Infof("ServiceAccount %q created in namespace %q", serviceAccountName, namespace) return nil } @@ -136,8 +136,7 @@ func CreateClusterRoleBinding( } // InstallClusterManagerRBAC installs RBAC resources for a cluster manager to operate a cluster. Returns a token -func InstallClusterManagerRBAC(clientset kubernetes.Interface) (string, error) { - const ns = "kube-system" +func InstallClusterManagerRBAC(clientset kubernetes.Interface, ns string) (string, error) { err := CreateServiceAccount(clientset, ArgoCDManagerServiceAccount, ns) if err != nil { diff --git a/pkg/apis/api-rules/violation_exceptions.list b/pkg/apis/api-rules/violation_exceptions.list index aba7fb05a53cd..356b76a6fe276 100644 --- a/pkg/apis/api-rules/violation_exceptions.list +++ b/pkg/apis/api-rules/violation_exceptions.list @@ -1,3 +1,48 @@ +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectList,Items +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,ClusterResourceWhitelist +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,Destinations +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,NamespaceResourceBlacklist +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,Roles +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,SourceRepos +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationList,Items +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceHelm,Parameters +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceHelm,ValueFiles +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,ExtVars +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceKsonnet,Parameters +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceKustomize,ImageTags +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceKustomize,Images +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSpec,IgnoreDifferences +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationStatus,Conditions +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationStatus,History +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationStatus,Resources +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSummary,ExternalURLs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSummary,Images +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationTree,Nodes +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ClusterList,Items +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Command,Args +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Command,Command +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,HelmRepository,CAData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,HelmRepository,CertData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,HelmRepository,KeyData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ProjectRole,Groups +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ProjectRole,JWTTokens +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ProjectRole,Policies +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,RepositoryList,Items +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceAction,Params +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceActions,Definitions +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceIgnoreDifferences,JSONPointers +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,ExternalURLs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,Ingress +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,TargetRefs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNode,Images +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNode,Info +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNode,ParentRefs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncOperation,Resources +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncOperationResult,Resources +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,TLSClientConfig,CAData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,TLSClientConfig,CertData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,TLSClientConfig,KeyData API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ConnectionState,ModifiedAt API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,JWTToken,ExpiresAt diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index 262e0eeb4ce05..b958e68d36d9f 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -33,7 +33,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_d32927f52090824d, []int{0} + return fileDescriptor_generated_963e9bd04280b36e, []int{0} } func (m *AWSAuthConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -61,7 +61,7 @@ var xxx_messageInfo_AWSAuthConfig proto.InternalMessageInfo func (m *AppProject) Reset() { *m = AppProject{} } func (*AppProject) ProtoMessage() {} func (*AppProject) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{1} + return fileDescriptor_generated_963e9bd04280b36e, []int{1} } func (m *AppProject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -89,7 +89,7 @@ var xxx_messageInfo_AppProject proto.InternalMessageInfo func (m *AppProjectList) Reset() { *m = AppProjectList{} } func (*AppProjectList) ProtoMessage() {} func (*AppProjectList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{2} + return fileDescriptor_generated_963e9bd04280b36e, []int{2} } func (m *AppProjectList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -117,7 +117,7 @@ var xxx_messageInfo_AppProjectList proto.InternalMessageInfo func (m *AppProjectSpec) Reset() { *m = AppProjectSpec{} } func (*AppProjectSpec) ProtoMessage() {} func (*AppProjectSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{3} + return fileDescriptor_generated_963e9bd04280b36e, []int{3} } func (m *AppProjectSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -145,7 +145,7 @@ var xxx_messageInfo_AppProjectSpec proto.InternalMessageInfo func (m *Application) Reset() { *m = Application{} } func (*Application) ProtoMessage() {} func (*Application) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{4} + return fileDescriptor_generated_963e9bd04280b36e, []int{4} } func (m *Application) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -173,7 +173,7 @@ var xxx_messageInfo_Application proto.InternalMessageInfo func (m *ApplicationCondition) Reset() { *m = ApplicationCondition{} } func (*ApplicationCondition) ProtoMessage() {} func (*ApplicationCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{5} + return fileDescriptor_generated_963e9bd04280b36e, []int{5} } func (m *ApplicationCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -201,7 +201,7 @@ var xxx_messageInfo_ApplicationCondition proto.InternalMessageInfo func (m *ApplicationDestination) Reset() { *m = ApplicationDestination{} } func (*ApplicationDestination) ProtoMessage() {} func (*ApplicationDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{6} + return fileDescriptor_generated_963e9bd04280b36e, []int{6} } func (m *ApplicationDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -229,7 +229,7 @@ var xxx_messageInfo_ApplicationDestination proto.InternalMessageInfo func (m *ApplicationList) Reset() { *m = ApplicationList{} } func (*ApplicationList) ProtoMessage() {} func (*ApplicationList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{7} + return fileDescriptor_generated_963e9bd04280b36e, []int{7} } func (m *ApplicationList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -257,7 +257,7 @@ var xxx_messageInfo_ApplicationList proto.InternalMessageInfo func (m *ApplicationSource) Reset() { *m = ApplicationSource{} } func (*ApplicationSource) ProtoMessage() {} func (*ApplicationSource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{8} + return fileDescriptor_generated_963e9bd04280b36e, []int{8} } func (m *ApplicationSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -285,7 +285,7 @@ var xxx_messageInfo_ApplicationSource proto.InternalMessageInfo func (m *ApplicationSourceDirectory) Reset() { *m = ApplicationSourceDirectory{} } func (*ApplicationSourceDirectory) ProtoMessage() {} func (*ApplicationSourceDirectory) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{9} + return fileDescriptor_generated_963e9bd04280b36e, []int{9} } func (m *ApplicationSourceDirectory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -313,7 +313,7 @@ var xxx_messageInfo_ApplicationSourceDirectory proto.InternalMessageInfo func (m *ApplicationSourceHelm) Reset() { *m = ApplicationSourceHelm{} } func (*ApplicationSourceHelm) ProtoMessage() {} func (*ApplicationSourceHelm) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{10} + return fileDescriptor_generated_963e9bd04280b36e, []int{10} } func (m *ApplicationSourceHelm) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -341,7 +341,7 @@ var xxx_messageInfo_ApplicationSourceHelm proto.InternalMessageInfo func (m *ApplicationSourceJsonnet) Reset() { *m = ApplicationSourceJsonnet{} } func (*ApplicationSourceJsonnet) ProtoMessage() {} func (*ApplicationSourceJsonnet) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{11} + return fileDescriptor_generated_963e9bd04280b36e, []int{11} } func (m *ApplicationSourceJsonnet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -369,7 +369,7 @@ var xxx_messageInfo_ApplicationSourceJsonnet proto.InternalMessageInfo func (m *ApplicationSourceKsonnet) Reset() { *m = ApplicationSourceKsonnet{} } func (*ApplicationSourceKsonnet) ProtoMessage() {} func (*ApplicationSourceKsonnet) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{12} + return fileDescriptor_generated_963e9bd04280b36e, []int{12} } func (m *ApplicationSourceKsonnet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -397,7 +397,7 @@ var xxx_messageInfo_ApplicationSourceKsonnet proto.InternalMessageInfo func (m *ApplicationSourceKustomize) Reset() { *m = ApplicationSourceKustomize{} } func (*ApplicationSourceKustomize) ProtoMessage() {} func (*ApplicationSourceKustomize) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{13} + return fileDescriptor_generated_963e9bd04280b36e, []int{13} } func (m *ApplicationSourceKustomize) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -425,7 +425,7 @@ var xxx_messageInfo_ApplicationSourceKustomize proto.InternalMessageInfo func (m *ApplicationSourcePlugin) Reset() { *m = ApplicationSourcePlugin{} } func (*ApplicationSourcePlugin) ProtoMessage() {} func (*ApplicationSourcePlugin) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{14} + return fileDescriptor_generated_963e9bd04280b36e, []int{14} } func (m *ApplicationSourcePlugin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -453,7 +453,7 @@ var xxx_messageInfo_ApplicationSourcePlugin proto.InternalMessageInfo func (m *ApplicationSpec) Reset() { *m = ApplicationSpec{} } func (*ApplicationSpec) ProtoMessage() {} func (*ApplicationSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{15} + return fileDescriptor_generated_963e9bd04280b36e, []int{15} } func (m *ApplicationSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -481,7 +481,7 @@ var xxx_messageInfo_ApplicationSpec proto.InternalMessageInfo func (m *ApplicationStatus) Reset() { *m = ApplicationStatus{} } func (*ApplicationStatus) ProtoMessage() {} func (*ApplicationStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{16} + return fileDescriptor_generated_963e9bd04280b36e, []int{16} } func (m *ApplicationStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -509,7 +509,7 @@ var xxx_messageInfo_ApplicationStatus proto.InternalMessageInfo func (m *ApplicationSummary) Reset() { *m = ApplicationSummary{} } func (*ApplicationSummary) ProtoMessage() {} func (*ApplicationSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{17} + return fileDescriptor_generated_963e9bd04280b36e, []int{17} } func (m *ApplicationSummary) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -537,7 +537,7 @@ var xxx_messageInfo_ApplicationSummary proto.InternalMessageInfo func (m *ApplicationTree) Reset() { *m = ApplicationTree{} } func (*ApplicationTree) ProtoMessage() {} func (*ApplicationTree) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{18} + return fileDescriptor_generated_963e9bd04280b36e, []int{18} } func (m *ApplicationTree) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -565,7 +565,7 @@ var xxx_messageInfo_ApplicationTree proto.InternalMessageInfo func (m *ApplicationWatchEvent) Reset() { *m = ApplicationWatchEvent{} } func (*ApplicationWatchEvent) ProtoMessage() {} func (*ApplicationWatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{19} + return fileDescriptor_generated_963e9bd04280b36e, []int{19} } func (m *ApplicationWatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -593,7 +593,7 @@ var xxx_messageInfo_ApplicationWatchEvent proto.InternalMessageInfo func (m *Cluster) Reset() { *m = Cluster{} } func (*Cluster) ProtoMessage() {} func (*Cluster) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{20} + return fileDescriptor_generated_963e9bd04280b36e, []int{20} } func (m *Cluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -621,7 +621,7 @@ var xxx_messageInfo_Cluster proto.InternalMessageInfo func (m *ClusterConfig) Reset() { *m = ClusterConfig{} } func (*ClusterConfig) ProtoMessage() {} func (*ClusterConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{21} + return fileDescriptor_generated_963e9bd04280b36e, []int{21} } func (m *ClusterConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -649,7 +649,7 @@ var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo func (m *ClusterList) Reset() { *m = ClusterList{} } func (*ClusterList) ProtoMessage() {} func (*ClusterList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{22} + return fileDescriptor_generated_963e9bd04280b36e, []int{22} } func (m *ClusterList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -677,7 +677,7 @@ var xxx_messageInfo_ClusterList proto.InternalMessageInfo func (m *Command) Reset() { *m = Command{} } func (*Command) ProtoMessage() {} func (*Command) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{23} + return fileDescriptor_generated_963e9bd04280b36e, []int{23} } func (m *Command) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -705,7 +705,7 @@ var xxx_messageInfo_Command proto.InternalMessageInfo func (m *ComparedTo) Reset() { *m = ComparedTo{} } func (*ComparedTo) ProtoMessage() {} func (*ComparedTo) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{24} + return fileDescriptor_generated_963e9bd04280b36e, []int{24} } func (m *ComparedTo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -733,7 +733,7 @@ var xxx_messageInfo_ComparedTo proto.InternalMessageInfo func (m *ComponentParameter) Reset() { *m = ComponentParameter{} } func (*ComponentParameter) ProtoMessage() {} func (*ComponentParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{25} + return fileDescriptor_generated_963e9bd04280b36e, []int{25} } func (m *ComponentParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -761,7 +761,7 @@ var xxx_messageInfo_ComponentParameter proto.InternalMessageInfo func (m *ConfigManagementPlugin) Reset() { *m = ConfigManagementPlugin{} } func (*ConfigManagementPlugin) ProtoMessage() {} func (*ConfigManagementPlugin) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{26} + return fileDescriptor_generated_963e9bd04280b36e, []int{26} } func (m *ConfigManagementPlugin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -789,7 +789,7 @@ var xxx_messageInfo_ConfigManagementPlugin proto.InternalMessageInfo func (m *ConnectionState) Reset() { *m = ConnectionState{} } func (*ConnectionState) ProtoMessage() {} func (*ConnectionState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{27} + return fileDescriptor_generated_963e9bd04280b36e, []int{27} } func (m *ConnectionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -817,7 +817,7 @@ var xxx_messageInfo_ConnectionState proto.InternalMessageInfo func (m *HealthStatus) Reset() { *m = HealthStatus{} } func (*HealthStatus) ProtoMessage() {} func (*HealthStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{28} + return fileDescriptor_generated_963e9bd04280b36e, []int{28} } func (m *HealthStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -845,7 +845,7 @@ var xxx_messageInfo_HealthStatus proto.InternalMessageInfo func (m *HelmParameter) Reset() { *m = HelmParameter{} } func (*HelmParameter) ProtoMessage() {} func (*HelmParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{29} + return fileDescriptor_generated_963e9bd04280b36e, []int{29} } func (m *HelmParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -873,7 +873,7 @@ var xxx_messageInfo_HelmParameter proto.InternalMessageInfo func (m *HelmRepository) Reset() { *m = HelmRepository{} } func (*HelmRepository) ProtoMessage() {} func (*HelmRepository) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{30} + return fileDescriptor_generated_963e9bd04280b36e, []int{30} } func (m *HelmRepository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -901,7 +901,7 @@ var xxx_messageInfo_HelmRepository proto.InternalMessageInfo func (m *InfoItem) Reset() { *m = InfoItem{} } func (*InfoItem) ProtoMessage() {} func (*InfoItem) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{31} + return fileDescriptor_generated_963e9bd04280b36e, []int{31} } func (m *InfoItem) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -929,7 +929,7 @@ var xxx_messageInfo_InfoItem proto.InternalMessageInfo func (m *JWTToken) Reset() { *m = JWTToken{} } func (*JWTToken) ProtoMessage() {} func (*JWTToken) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{32} + return fileDescriptor_generated_963e9bd04280b36e, []int{32} } func (m *JWTToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -957,7 +957,7 @@ var xxx_messageInfo_JWTToken proto.InternalMessageInfo func (m *JsonnetVar) Reset() { *m = JsonnetVar{} } func (*JsonnetVar) ProtoMessage() {} func (*JsonnetVar) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{33} + return fileDescriptor_generated_963e9bd04280b36e, []int{33} } func (m *JsonnetVar) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -985,7 +985,7 @@ var xxx_messageInfo_JsonnetVar proto.InternalMessageInfo func (m *KsonnetParameter) Reset() { *m = KsonnetParameter{} } func (*KsonnetParameter) ProtoMessage() {} func (*KsonnetParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{34} + return fileDescriptor_generated_963e9bd04280b36e, []int{34} } func (m *KsonnetParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1013,7 +1013,7 @@ var xxx_messageInfo_KsonnetParameter proto.InternalMessageInfo func (m *KustomizeImageTag) Reset() { *m = KustomizeImageTag{} } func (*KustomizeImageTag) ProtoMessage() {} func (*KustomizeImageTag) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{35} + return fileDescriptor_generated_963e9bd04280b36e, []int{35} } func (m *KustomizeImageTag) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1041,7 +1041,7 @@ var xxx_messageInfo_KustomizeImageTag proto.InternalMessageInfo func (m *Operation) Reset() { *m = Operation{} } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{36} + return fileDescriptor_generated_963e9bd04280b36e, []int{36} } func (m *Operation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1069,7 +1069,7 @@ var xxx_messageInfo_Operation proto.InternalMessageInfo func (m *OperationState) Reset() { *m = OperationState{} } func (*OperationState) ProtoMessage() {} func (*OperationState) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{37} + return fileDescriptor_generated_963e9bd04280b36e, []int{37} } func (m *OperationState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1097,7 +1097,7 @@ var xxx_messageInfo_OperationState proto.InternalMessageInfo func (m *ProjectRole) Reset() { *m = ProjectRole{} } func (*ProjectRole) ProtoMessage() {} func (*ProjectRole) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{38} + return fileDescriptor_generated_963e9bd04280b36e, []int{38} } func (m *ProjectRole) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1125,7 +1125,7 @@ var xxx_messageInfo_ProjectRole proto.InternalMessageInfo func (m *Repository) Reset() { *m = Repository{} } func (*Repository) ProtoMessage() {} func (*Repository) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{39} + return fileDescriptor_generated_963e9bd04280b36e, []int{39} } func (m *Repository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1153,7 +1153,7 @@ var xxx_messageInfo_Repository proto.InternalMessageInfo func (m *RepositoryList) Reset() { *m = RepositoryList{} } func (*RepositoryList) ProtoMessage() {} func (*RepositoryList) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{40} + return fileDescriptor_generated_963e9bd04280b36e, []int{40} } func (m *RepositoryList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1181,7 +1181,7 @@ var xxx_messageInfo_RepositoryList proto.InternalMessageInfo func (m *ResourceAction) Reset() { *m = ResourceAction{} } func (*ResourceAction) ProtoMessage() {} func (*ResourceAction) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{41} + return fileDescriptor_generated_963e9bd04280b36e, []int{41} } func (m *ResourceAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1209,7 +1209,7 @@ var xxx_messageInfo_ResourceAction proto.InternalMessageInfo func (m *ResourceActionDefinition) Reset() { *m = ResourceActionDefinition{} } func (*ResourceActionDefinition) ProtoMessage() {} func (*ResourceActionDefinition) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{42} + return fileDescriptor_generated_963e9bd04280b36e, []int{42} } func (m *ResourceActionDefinition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1237,7 +1237,7 @@ var xxx_messageInfo_ResourceActionDefinition proto.InternalMessageInfo func (m *ResourceActionParam) Reset() { *m = ResourceActionParam{} } func (*ResourceActionParam) ProtoMessage() {} func (*ResourceActionParam) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{43} + return fileDescriptor_generated_963e9bd04280b36e, []int{43} } func (m *ResourceActionParam) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1265,7 +1265,7 @@ var xxx_messageInfo_ResourceActionParam proto.InternalMessageInfo func (m *ResourceActions) Reset() { *m = ResourceActions{} } func (*ResourceActions) ProtoMessage() {} func (*ResourceActions) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{44} + return fileDescriptor_generated_963e9bd04280b36e, []int{44} } func (m *ResourceActions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1293,7 +1293,7 @@ var xxx_messageInfo_ResourceActions proto.InternalMessageInfo func (m *ResourceDiff) Reset() { *m = ResourceDiff{} } func (*ResourceDiff) ProtoMessage() {} func (*ResourceDiff) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{45} + return fileDescriptor_generated_963e9bd04280b36e, []int{45} } func (m *ResourceDiff) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1321,7 +1321,7 @@ var xxx_messageInfo_ResourceDiff proto.InternalMessageInfo func (m *ResourceIgnoreDifferences) Reset() { *m = ResourceIgnoreDifferences{} } func (*ResourceIgnoreDifferences) ProtoMessage() {} func (*ResourceIgnoreDifferences) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{46} + return fileDescriptor_generated_963e9bd04280b36e, []int{46} } func (m *ResourceIgnoreDifferences) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1349,7 +1349,7 @@ var xxx_messageInfo_ResourceIgnoreDifferences proto.InternalMessageInfo func (m *ResourceNetworkingInfo) Reset() { *m = ResourceNetworkingInfo{} } func (*ResourceNetworkingInfo) ProtoMessage() {} func (*ResourceNetworkingInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{47} + return fileDescriptor_generated_963e9bd04280b36e, []int{47} } func (m *ResourceNetworkingInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1377,7 +1377,7 @@ var xxx_messageInfo_ResourceNetworkingInfo proto.InternalMessageInfo func (m *ResourceNode) Reset() { *m = ResourceNode{} } func (*ResourceNode) ProtoMessage() {} func (*ResourceNode) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{48} + return fileDescriptor_generated_963e9bd04280b36e, []int{48} } func (m *ResourceNode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1405,7 +1405,7 @@ var xxx_messageInfo_ResourceNode proto.InternalMessageInfo func (m *ResourceOverride) Reset() { *m = ResourceOverride{} } func (*ResourceOverride) ProtoMessage() {} func (*ResourceOverride) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{49} + return fileDescriptor_generated_963e9bd04280b36e, []int{49} } func (m *ResourceOverride) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1433,7 +1433,7 @@ var xxx_messageInfo_ResourceOverride proto.InternalMessageInfo func (m *ResourceRef) Reset() { *m = ResourceRef{} } func (*ResourceRef) ProtoMessage() {} func (*ResourceRef) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{50} + return fileDescriptor_generated_963e9bd04280b36e, []int{50} } func (m *ResourceRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1461,7 +1461,7 @@ var xxx_messageInfo_ResourceRef proto.InternalMessageInfo func (m *ResourceResult) Reset() { *m = ResourceResult{} } func (*ResourceResult) ProtoMessage() {} func (*ResourceResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{51} + return fileDescriptor_generated_963e9bd04280b36e, []int{51} } func (m *ResourceResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1489,7 +1489,7 @@ var xxx_messageInfo_ResourceResult proto.InternalMessageInfo func (m *ResourceStatus) Reset() { *m = ResourceStatus{} } func (*ResourceStatus) ProtoMessage() {} func (*ResourceStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{52} + return fileDescriptor_generated_963e9bd04280b36e, []int{52} } func (m *ResourceStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1517,7 +1517,7 @@ var xxx_messageInfo_ResourceStatus proto.InternalMessageInfo func (m *RevisionHistory) Reset() { *m = RevisionHistory{} } func (*RevisionHistory) ProtoMessage() {} func (*RevisionHistory) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{53} + return fileDescriptor_generated_963e9bd04280b36e, []int{53} } func (m *RevisionHistory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1545,7 +1545,7 @@ var xxx_messageInfo_RevisionHistory proto.InternalMessageInfo func (m *SyncOperation) Reset() { *m = SyncOperation{} } func (*SyncOperation) ProtoMessage() {} func (*SyncOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{54} + return fileDescriptor_generated_963e9bd04280b36e, []int{54} } func (m *SyncOperation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1573,7 +1573,7 @@ var xxx_messageInfo_SyncOperation proto.InternalMessageInfo func (m *SyncOperationResource) Reset() { *m = SyncOperationResource{} } func (*SyncOperationResource) ProtoMessage() {} func (*SyncOperationResource) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{55} + return fileDescriptor_generated_963e9bd04280b36e, []int{55} } func (m *SyncOperationResource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1601,7 +1601,7 @@ var xxx_messageInfo_SyncOperationResource proto.InternalMessageInfo func (m *SyncOperationResult) Reset() { *m = SyncOperationResult{} } func (*SyncOperationResult) ProtoMessage() {} func (*SyncOperationResult) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{56} + return fileDescriptor_generated_963e9bd04280b36e, []int{56} } func (m *SyncOperationResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1629,7 +1629,7 @@ var xxx_messageInfo_SyncOperationResult proto.InternalMessageInfo func (m *SyncPolicy) Reset() { *m = SyncPolicy{} } func (*SyncPolicy) ProtoMessage() {} func (*SyncPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{57} + return fileDescriptor_generated_963e9bd04280b36e, []int{57} } func (m *SyncPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1657,7 +1657,7 @@ var xxx_messageInfo_SyncPolicy proto.InternalMessageInfo func (m *SyncPolicyAutomated) Reset() { *m = SyncPolicyAutomated{} } func (*SyncPolicyAutomated) ProtoMessage() {} func (*SyncPolicyAutomated) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{58} + return fileDescriptor_generated_963e9bd04280b36e, []int{58} } func (m *SyncPolicyAutomated) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1685,7 +1685,7 @@ var xxx_messageInfo_SyncPolicyAutomated proto.InternalMessageInfo func (m *SyncStatus) Reset() { *m = SyncStatus{} } func (*SyncStatus) ProtoMessage() {} func (*SyncStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{59} + return fileDescriptor_generated_963e9bd04280b36e, []int{59} } func (m *SyncStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1713,7 +1713,7 @@ var xxx_messageInfo_SyncStatus proto.InternalMessageInfo func (m *SyncStrategy) Reset() { *m = SyncStrategy{} } func (*SyncStrategy) ProtoMessage() {} func (*SyncStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{60} + return fileDescriptor_generated_963e9bd04280b36e, []int{60} } func (m *SyncStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1741,7 +1741,7 @@ var xxx_messageInfo_SyncStrategy proto.InternalMessageInfo func (m *SyncStrategyApply) Reset() { *m = SyncStrategyApply{} } func (*SyncStrategyApply) ProtoMessage() {} func (*SyncStrategyApply) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{61} + return fileDescriptor_generated_963e9bd04280b36e, []int{61} } func (m *SyncStrategyApply) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1769,7 +1769,7 @@ var xxx_messageInfo_SyncStrategyApply proto.InternalMessageInfo func (m *SyncStrategyHook) Reset() { *m = SyncStrategyHook{} } func (*SyncStrategyHook) ProtoMessage() {} func (*SyncStrategyHook) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{62} + return fileDescriptor_generated_963e9bd04280b36e, []int{62} } func (m *SyncStrategyHook) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1797,7 +1797,7 @@ var xxx_messageInfo_SyncStrategyHook proto.InternalMessageInfo func (m *TLSClientConfig) Reset() { *m = TLSClientConfig{} } func (*TLSClientConfig) ProtoMessage() {} func (*TLSClientConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_generated_d32927f52090824d, []int{63} + return fileDescriptor_generated_963e9bd04280b36e, []int{63} } func (m *TLSClientConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -16401,10 +16401,10 @@ var ( ) func init() { - proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_d32927f52090824d) + proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_generated_963e9bd04280b36e) } -var fileDescriptor_generated_d32927f52090824d = []byte{ +var fileDescriptor_generated_963e9bd04280b36e = []byte{ // 3976 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x3b, 0x5b, 0x8c, 0x1c, 0xd9, 0x55, 0xae, 0x7e, 0xf7, 0x99, 0x87, 0x3d, 0x77, 0xd7, 0x9b, 0xce, 0x28, 0x3b, 0xb6, 0x6a, 0x45, diff --git a/pkg/apis/application/v1alpha1/openapi_generated.go b/pkg/apis/application/v1alpha1/openapi_generated.go index fab6a7072bcb8..ac77880df596a 100644 --- a/pkg/apis/application/v1alpha1/openapi_generated.go +++ b/pkg/apis/application/v1alpha1/openapi_generated.go @@ -105,7 +105,6 @@ func schema_pkg_apis_application_v1alpha1_AWSAuthConfig(ref common.ReferenceCall }, }, }, - Dependencies: []string{}, } } @@ -359,7 +358,6 @@ func schema_pkg_apis_application_v1alpha1_ApplicationCondition(ref common.Refere Required: []string{"type", "message"}, }, }, - Dependencies: []string{}, } } @@ -387,7 +385,6 @@ func schema_pkg_apis_application_v1alpha1_ApplicationDestination(ref common.Refe }, }, }, - Dependencies: []string{}, } } @@ -713,7 +710,6 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourcePlugin(ref common.Ref }, }, }, - Dependencies: []string{}, } } @@ -895,7 +891,6 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSummary(ref common.Referenc }, }, }, - Dependencies: []string{}, } } @@ -1113,7 +1108,6 @@ func schema_pkg_apis_application_v1alpha1_Command(ref common.ReferenceCallback) }, }, }, - Dependencies: []string{}, } } @@ -1172,7 +1166,6 @@ func schema_pkg_apis_application_v1alpha1_ComponentParameter(ref common.Referenc Required: []string{"name", "value"}, }, }, - Dependencies: []string{}, } } @@ -1262,7 +1255,6 @@ func schema_pkg_apis_application_v1alpha1_HealthStatus(ref common.ReferenceCallb }, }, }, - Dependencies: []string{}, } } @@ -1290,7 +1282,6 @@ func schema_pkg_apis_application_v1alpha1_HelmParameter(ref common.ReferenceCall }, }, }, - Dependencies: []string{}, } } @@ -1346,7 +1337,6 @@ func schema_pkg_apis_application_v1alpha1_HelmRepository(ref common.ReferenceCal Required: []string{"url", "name"}, }, }, - Dependencies: []string{}, } } @@ -1374,7 +1364,6 @@ func schema_pkg_apis_application_v1alpha1_InfoItem(ref common.ReferenceCallback) }, }, }, - Dependencies: []string{}, } } @@ -1401,7 +1390,6 @@ func schema_pkg_apis_application_v1alpha1_JWTToken(ref common.ReferenceCallback) Required: []string{"iat"}, }, }, - Dependencies: []string{}, } } @@ -1434,7 +1422,6 @@ func schema_pkg_apis_application_v1alpha1_JsonnetVar(ref common.ReferenceCallbac Required: []string{"name", "value"}, }, }, - Dependencies: []string{}, } } @@ -1467,7 +1454,6 @@ func schema_pkg_apis_application_v1alpha1_KsonnetParameter(ref common.ReferenceC Required: []string{"name", "value"}, }, }, - Dependencies: []string{}, } } @@ -1495,7 +1481,6 @@ func schema_pkg_apis_application_v1alpha1_KustomizeImageTag(ref common.Reference }, }, }, - Dependencies: []string{}, } } @@ -1782,7 +1767,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceActionDefinition(ref common.Re Required: []string{"name", "action.lua"}, }, }, - Dependencies: []string{}, } } @@ -1819,7 +1803,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceActionParam(ref common.Referen }, }, }, - Dependencies: []string{}, } } @@ -1908,7 +1891,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceDiff(ref common.ReferenceCallb }, }, }, - Dependencies: []string{}, } } @@ -1960,7 +1942,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceIgnoreDifferences(ref common.R Required: []string{"group", "kind", "jsonPointers"}, }, }, - Dependencies: []string{}, } } @@ -1975,6 +1956,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNetworkingInfo(ref common.Refe SchemaProps: spec.SchemaProps{ Type: []string{"object"}, AdditionalProperties: &spec.SchemaOrBool{ + Allows: true, Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Type: []string{"string"}, @@ -2000,6 +1982,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNetworkingInfo(ref common.Refe SchemaProps: spec.SchemaProps{ Type: []string{"object"}, AdditionalProperties: &spec.SchemaOrBool{ + Allows: true, Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Type: []string{"string"}, @@ -2175,7 +2158,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceOverride(ref common.ReferenceC }, }, }, - Dependencies: []string{}, } } @@ -2225,7 +2207,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceRef(ref common.ReferenceCallba }, }, }, - Dependencies: []string{}, } } @@ -2294,7 +2275,6 @@ func schema_pkg_apis_application_v1alpha1_ResourceResult(ref common.ReferenceCal Required: []string{"group", "version", "kind", "namespace", "name"}, }, }, - Dependencies: []string{}, } } @@ -2488,7 +2468,6 @@ func schema_pkg_apis_application_v1alpha1_SyncOperationResource(ref common.Refer Required: []string{"kind", "name"}, }, }, - Dependencies: []string{}, } } @@ -2572,7 +2551,6 @@ func schema_pkg_apis_application_v1alpha1_SyncPolicyAutomated(ref common.Referen }, }, }, - Dependencies: []string{}, } } @@ -2653,7 +2631,6 @@ func schema_pkg_apis_application_v1alpha1_SyncStrategyApply(ref common.Reference }, }, }, - Dependencies: []string{}, } } @@ -2724,7 +2701,6 @@ func schema_pkg_apis_application_v1alpha1_TLSClientConfig(ref common.ReferenceCa Required: []string{"insecure"}, }, }, - Dependencies: []string{}, } } @@ -2745,6 +2721,5 @@ func schema_pkg_apis_application_v1alpha1_objectMeta(ref common.ReferenceCallbac Required: []string{"Name"}, }, }, - Dependencies: []string{}, } } diff --git a/reposerver/repository/repository.pb.go b/reposerver/repository/repository.pb.go index d1496f7883c41..cf516bdffd85d 100644 --- a/reposerver/repository/repository.pb.go +++ b/reposerver/repository/repository.pb.go @@ -47,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_a40b5a752434083f, []int{0} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{0} } func (m *ManifestRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -154,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_a40b5a752434083f, []int{1} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{1} } func (m *ManifestResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -232,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_a40b5a752434083f, []int{2} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{2} } func (m *ListDirRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -294,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_a40b5a752434083f, []int{3} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{3} } func (m *FileList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -344,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_a40b5a752434083f, []int{4} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{4} } func (m *GetFileRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -406,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_a40b5a752434083f, []int{5} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{5} } func (m *GetFileResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -460,7 +460,7 @@ func (m *RepoServerAppDetailsQuery) Reset() { *m = RepoServerAppDetailsQ func (m *RepoServerAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*RepoServerAppDetailsQuery) ProtoMessage() {} func (*RepoServerAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_a40b5a752434083f, []int{6} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{6} } func (m *RepoServerAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -549,7 +549,7 @@ func (m *HelmAppDetailsQuery) Reset() { *m = HelmAppDetailsQuery{} } func (m *HelmAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*HelmAppDetailsQuery) ProtoMessage() {} func (*HelmAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_a40b5a752434083f, []int{7} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{7} } func (m *HelmAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -596,7 +596,7 @@ func (m *KsonnetAppDetailsQuery) Reset() { *m = KsonnetAppDetailsQuery{} func (m *KsonnetAppDetailsQuery) String() string { return proto.CompactTextString(m) } func (*KsonnetAppDetailsQuery) ProtoMessage() {} func (*KsonnetAppDetailsQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_a40b5a752434083f, []int{8} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{8} } func (m *KsonnetAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -648,7 +648,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_a40b5a752434083f, []int{9} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{9} } func (m *RepoAppDetailsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -728,7 +728,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_a40b5a752434083f, []int{10} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{10} } func (m *KsonnetAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -800,7 +800,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_a40b5a752434083f, []int{11} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{11} } func (m *HelmAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -873,7 +873,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_a40b5a752434083f, []int{12} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{12} } func (m *KustomizeAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -941,7 +941,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_a40b5a752434083f, []int{13} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{13} } func (m *KsonnetEnvironment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1012,7 +1012,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_a40b5a752434083f, []int{14} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{14} } func (m *KsonnetEnvironmentDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1066,7 +1066,7 @@ func (m *DirectoryAppSpec) Reset() { *m = DirectoryAppSpec{} } func (m *DirectoryAppSpec) String() string { return proto.CompactTextString(m) } func (*DirectoryAppSpec) ProtoMessage() {} func (*DirectoryAppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_repository_a40b5a752434083f, []int{15} + return fileDescriptor_repository_7075e68bfb1c8d80, []int{15} } func (m *DirectoryAppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -5127,10 +5127,10 @@ var ( ) func init() { - proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_a40b5a752434083f) + proto.RegisterFile("reposerver/repository/repository.proto", fileDescriptor_repository_7075e68bfb1c8d80) } -var fileDescriptor_repository_a40b5a752434083f = []byte{ +var fileDescriptor_repository_7075e68bfb1c8d80 = []byte{ // 1103 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xdd, 0x6e, 0x1b, 0xc5, 0x17, 0xcf, 0xda, 0x4e, 0x1c, 0x1f, 0xa7, 0x6d, 0x32, 0xff, 0x28, 0xff, 0xc5, 0x0d, 0xc6, 0x1a, diff --git a/server/account/account.pb.go b/server/account/account.pb.go index 50ba4cd76e99d..116230533b9f2 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_6b332ae3d6f3a375, []int{0} + return fileDescriptor_account_c12a236fbb4926f3, []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_6b332ae3d6f3a375, []int{1} + return fileDescriptor_account_c12a236fbb4926f3, []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_6b332ae3d6f3a375) + proto.RegisterFile("server/account/account.proto", fileDescriptor_account_c12a236fbb4926f3) } -var fileDescriptor_account_6b332ae3d6f3a375 = []byte{ +var fileDescriptor_account_c12a236fbb4926f3 = []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.pb.go b/server/application/application.pb.go index 9d6e6883cf6c3..7c4d45e0454e0 100644 --- a/server/application/application.pb.go +++ b/server/application/application.pb.go @@ -52,7 +52,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_5178689ec7ddb110, []int{0} + return fileDescriptor_application_a312b6d468f6c22a, []int{0} } func (m *ApplicationQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,7 +124,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_5178689ec7ddb110, []int{1} + return fileDescriptor_application_a312b6d468f6c22a, []int{1} } func (m *ApplicationResourceEventsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -194,7 +194,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_5178689ec7ddb110, []int{2} + return fileDescriptor_application_a312b6d468f6c22a, []int{2} } func (m *ApplicationManifestQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -247,7 +247,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_5178689ec7ddb110, []int{3} + return fileDescriptor_application_a312b6d468f6c22a, []int{3} } func (m *ApplicationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -288,7 +288,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_5178689ec7ddb110, []int{4} + return fileDescriptor_application_a312b6d468f6c22a, []int{4} } func (m *ApplicationCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -342,7 +342,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_5178689ec7ddb110, []int{5} + return fileDescriptor_application_a312b6d468f6c22a, []int{5} } func (m *ApplicationUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -390,7 +390,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_5178689ec7ddb110, []int{6} + return fileDescriptor_application_a312b6d468f6c22a, []int{6} } func (m *ApplicationDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -450,7 +450,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_5178689ec7ddb110, []int{7} + return fileDescriptor_application_a312b6d468f6c22a, []int{7} } func (m *ApplicationSyncRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -534,7 +534,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_5178689ec7ddb110, []int{8} + return fileDescriptor_application_a312b6d468f6c22a, []int{8} } func (m *ApplicationUpdateSpecRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -590,7 +590,7 @@ func (m *ApplicationPatchRequest) Reset() { *m = ApplicationPatchRequest func (m *ApplicationPatchRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationPatchRequest) ProtoMessage() {} func (*ApplicationPatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{9} + return fileDescriptor_application_a312b6d468f6c22a, []int{9} } func (m *ApplicationPatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -647,7 +647,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_5178689ec7ddb110, []int{10} + return fileDescriptor_application_a312b6d468f6c22a, []int{10} } func (m *ApplicationRollbackRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -720,7 +720,7 @@ func (m *ApplicationResourceRequest) Reset() { *m = ApplicationResourceR func (m *ApplicationResourceRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceRequest) ProtoMessage() {} func (*ApplicationResourceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{11} + return fileDescriptor_application_a312b6d468f6c22a, []int{11} } func (m *ApplicationResourceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -809,7 +809,7 @@ func (m *ApplicationResourcePatchRequest) Reset() { *m = ApplicationReso func (m *ApplicationResourcePatchRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourcePatchRequest) ProtoMessage() {} func (*ApplicationResourcePatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{12} + return fileDescriptor_application_a312b6d468f6c22a, []int{12} } func (m *ApplicationResourcePatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -911,7 +911,7 @@ func (m *ApplicationResourceDeleteRequest) Reset() { *m = ApplicationRes func (m *ApplicationResourceDeleteRequest) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceDeleteRequest) ProtoMessage() {} func (*ApplicationResourceDeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{13} + return fileDescriptor_application_a312b6d468f6c22a, []int{13} } func (m *ApplicationResourceDeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1006,7 +1006,7 @@ func (m *ResourceActionRunRequest) Reset() { *m = ResourceActionRunReque func (m *ResourceActionRunRequest) String() string { return proto.CompactTextString(m) } func (*ResourceActionRunRequest) ProtoMessage() {} func (*ResourceActionRunRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{14} + return fileDescriptor_application_a312b6d468f6c22a, []int{14} } func (m *ResourceActionRunRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1095,7 +1095,7 @@ func (m *ResourceActionsListResponse) Reset() { *m = ResourceActionsList func (m *ResourceActionsListResponse) String() string { return proto.CompactTextString(m) } func (*ResourceActionsListResponse) ProtoMessage() {} func (*ResourceActionsListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{15} + return fileDescriptor_application_a312b6d468f6c22a, []int{15} } func (m *ResourceActionsListResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1142,7 +1142,7 @@ func (m *ApplicationResourceResponse) Reset() { *m = ApplicationResource func (m *ApplicationResourceResponse) String() string { return proto.CompactTextString(m) } func (*ApplicationResourceResponse) ProtoMessage() {} func (*ApplicationResourceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{16} + return fileDescriptor_application_a312b6d468f6c22a, []int{16} } func (m *ApplicationResourceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1196,7 +1196,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_5178689ec7ddb110, []int{17} + return fileDescriptor_application_a312b6d468f6c22a, []int{17} } func (m *ApplicationPodLogsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1293,7 +1293,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_5178689ec7ddb110, []int{18} + return fileDescriptor_application_a312b6d468f6c22a, []int{18} } func (m *LogEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1347,7 +1347,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_5178689ec7ddb110, []int{19} + return fileDescriptor_application_a312b6d468f6c22a, []int{19} } func (m *OperationTerminateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1393,7 +1393,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_5178689ec7ddb110, []int{20} + return fileDescriptor_application_a312b6d468f6c22a, []int{20} } func (m *OperationTerminateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1433,7 +1433,7 @@ func (m *ResourcesQuery) Reset() { *m = ResourcesQuery{} } func (m *ResourcesQuery) String() string { return proto.CompactTextString(m) } func (*ResourcesQuery) ProtoMessage() {} func (*ResourcesQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{21} + return fileDescriptor_application_a312b6d468f6c22a, []int{21} } func (m *ResourcesQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1480,7 +1480,7 @@ func (m *ManagedResourcesResponse) Reset() { *m = ManagedResourcesRespon func (m *ManagedResourcesResponse) String() string { return proto.CompactTextString(m) } func (*ManagedResourcesResponse) ProtoMessage() {} func (*ManagedResourcesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_application_5178689ec7ddb110, []int{22} + return fileDescriptor_application_a312b6d468f6c22a, []int{22} } func (m *ManagedResourcesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -7264,10 +7264,10 @@ var ( ) func init() { - proto.RegisterFile("server/application/application.proto", fileDescriptor_application_5178689ec7ddb110) + proto.RegisterFile("server/application/application.proto", fileDescriptor_application_a312b6d468f6c22a) } -var fileDescriptor_application_5178689ec7ddb110 = []byte{ +var fileDescriptor_application_a312b6d468f6c22a = []byte{ // 1792 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0xdc, 0x5a, 0x15, 0xe7, 0xce, 0x4c, 0x66, 0x26, 0x27, 0xe1, 0x7d, 0xdc, 0xf7, 0x5e, 0xf1, 0x73, 0xd2, 0x64, diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go index a7ec549e9a73e..7033b1b96fc47 100644 --- a/server/cluster/cluster.go +++ b/server/cluster/cluster.go @@ -153,6 +153,8 @@ func (s *Server) CreateFromKubeConfig(ctx context.Context, q *ClusterCreateFromK var clusterServer string var clusterInsecure bool + var systemNamespace string + if q.InCluster { clusterServer = common.KubernetesInternalAPIServerAddr } else if cluster, ok := kubeconfig.Clusters[q.Context]; ok { @@ -162,6 +164,12 @@ func (s *Server) CreateFromKubeConfig(ctx context.Context, q *ClusterCreateFromK return nil, status.Errorf(codes.Internal, "Context %s does not exist in kubeconfig", q.Context) } + if q.SystemNamespace != "" { + systemNamespace = q.SystemNamespace + } else { + systemNamespace = common.DefaultSystemNamespace + } + c := &appv1.Cluster{ Server: clusterServer, Name: q.Context, @@ -178,7 +186,7 @@ func (s *Server) CreateFromKubeConfig(ctx context.Context, q *ClusterCreateFromK return nil, status.Errorf(codes.Internal, "Could not create Kubernetes clientset: %v", err) } - bearerToken, err := common.InstallClusterManagerRBAC(clientset) + bearerToken, err := common.InstallClusterManagerRBAC(clientset, systemNamespace) if err != nil { return nil, status.Errorf(codes.Internal, "Could not install cluster manager RBAC: %v", err) } diff --git a/server/cluster/cluster.pb.go b/server/cluster/cluster.pb.go index 61f7f0eba1e3c..957b6e722462a 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_79097064e119a5a6, []int{0} + return fileDescriptor_cluster_6ee48698ede88737, []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_79097064e119a5a6, []int{1} + return fileDescriptor_cluster_6ee48698ede88737, []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_79097064e119a5a6, []int{2} + return fileDescriptor_cluster_6ee48698ede88737, []int{2} } func (m *ClusterCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -176,10 +176,12 @@ func (m *ClusterCreateRequest) GetUpsert() bool { } type ClusterCreateFromKubeConfigRequest struct { - Kubeconfig string `protobuf:"bytes,1,opt,name=kubeconfig,proto3" json:"kubeconfig,omitempty"` - Context string `protobuf:"bytes,2,opt,name=context,proto3" json:"context,omitempty"` - Upsert bool `protobuf:"varint,3,opt,name=upsert,proto3" json:"upsert,omitempty"` - InCluster bool `protobuf:"varint,4,opt,name=inCluster,proto3" json:"inCluster,omitempty"` + Kubeconfig string `protobuf:"bytes,1,opt,name=kubeconfig,proto3" json:"kubeconfig,omitempty"` + Context string `protobuf:"bytes,2,opt,name=context,proto3" json:"context,omitempty"` + Upsert bool `protobuf:"varint,3,opt,name=upsert,proto3" json:"upsert,omitempty"` + InCluster bool `protobuf:"varint,4,opt,name=inCluster,proto3" json:"inCluster,omitempty"` + // Optional alternative system namespace to use (defaults to "kube-system") + SystemNamespace string `protobuf:"bytes,5,opt,name=systemNamespace,proto3" json:"systemNamespace,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -189,7 +191,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_79097064e119a5a6, []int{3} + return fileDescriptor_cluster_6ee48698ede88737, []int{3} } func (m *ClusterCreateFromKubeConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -246,6 +248,13 @@ func (m *ClusterCreateFromKubeConfigRequest) GetInCluster() bool { return false } +func (m *ClusterCreateFromKubeConfigRequest) GetSystemNamespace() string { + if m != nil { + return m.SystemNamespace + } + return "" +} + type ClusterUpdateRequest struct { Cluster *v1alpha1.Cluster `protobuf:"bytes,1,opt,name=cluster" json:"cluster,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -257,7 +266,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_79097064e119a5a6, []int{4} + return fileDescriptor_cluster_6ee48698ede88737, []int{4} } func (m *ClusterUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -686,6 +695,12 @@ func (m *ClusterCreateFromKubeConfigRequest) MarshalTo(dAtA []byte) (int, error) } i++ } + if len(m.SystemNamespace) > 0 { + dAtA[i] = 0x2a + i++ + i = encodeVarintCluster(dAtA, i, uint64(len(m.SystemNamespace))) + i += copy(dAtA[i:], m.SystemNamespace) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -787,6 +802,10 @@ func (m *ClusterCreateFromKubeConfigRequest) Size() (n int) { if m.InCluster { n += 2 } + l = len(m.SystemNamespace) + if l > 0 { + n += 1 + l + sovCluster(uint64(l)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -1181,6 +1200,35 @@ func (m *ClusterCreateFromKubeConfigRequest) Unmarshal(dAtA []byte) error { } } m.InCluster = bool(v != 0) + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SystemNamespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCluster + } + 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 ErrInvalidLengthCluster + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SystemNamespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCluster(dAtA[iNdEx:]) @@ -1393,45 +1441,46 @@ var ( ) func init() { - proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_79097064e119a5a6) -} - -var fileDescriptor_cluster_79097064e119a5a6 = []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, - 0x55, 0xa0, 0xb6, 0x12, 0x2e, 0x55, 0x8f, 0x0d, 0x2a, 0x42, 0x70, 0x21, 0x88, 0x0b, 0xaa, 0x84, - 0x36, 0x9b, 0x61, 0xbb, 0x24, 0x5d, 0x2f, 0xb6, 0x37, 0x02, 0x21, 0x84, 0x04, 0x57, 0xc4, 0x05, - 0xee, 0x3c, 0x02, 0xaf, 0xc1, 0x11, 0x89, 0x1b, 0x27, 0x14, 0xf1, 0x20, 0x68, 0xbd, 0x76, 0xbe, - 0xc3, 0x85, 0x88, 0x53, 0xec, 0x19, 0x67, 0xe6, 0x37, 0x33, 0xff, 0x4c, 0x70, 0x45, 0x81, 0x1c, - 0x80, 0xe4, 0x61, 0x3f, 0x53, 0x7a, 0xfc, 0xc9, 0x52, 0x29, 0xb4, 0x20, 0x9b, 0xf6, 0x5a, 0xde, - 0x8a, 0x44, 0x24, 0x8c, 0x8d, 0xe7, 0xa7, 0xc2, 0x5d, 0xae, 0x44, 0x42, 0x44, 0x7d, 0xe0, 0x41, - 0x1a, 0xf3, 0x20, 0x49, 0x84, 0x0e, 0x74, 0x2c, 0x12, 0x65, 0xbd, 0xb4, 0x77, 0xa0, 0x58, 0x2c, - 0x8c, 0x37, 0x14, 0x12, 0xf8, 0xa0, 0xc1, 0x23, 0x48, 0x40, 0x06, 0x1a, 0xba, 0xf6, 0xcd, 0xbd, - 0x28, 0xd6, 0xa7, 0x59, 0x87, 0x85, 0xe2, 0x8c, 0x07, 0xd2, 0xa4, 0x78, 0x6e, 0x0e, 0xfb, 0x61, - 0x97, 0xa7, 0xbd, 0x28, 0xff, 0xb2, 0xe2, 0x41, 0x9a, 0xf6, 0xe3, 0xd0, 0x04, 0xe7, 0x83, 0x46, - 0xd0, 0x4f, 0x4f, 0x83, 0xb9, 0x50, 0x74, 0x17, 0x5f, 0x68, 0x15, 0xb4, 0x0f, 0x33, 0x90, 0xaf, - 0xc8, 0x35, 0xec, 0x15, 0xb5, 0xf9, 0xa8, 0x86, 0xf6, 0x4a, 0x6d, 0x7b, 0xa3, 0x57, 0xf0, 0x25, - 0xfb, 0xae, 0x0d, 0x2a, 0x15, 0x89, 0x02, 0xfa, 0x01, 0xe1, 0x2d, 0x6b, 0x6b, 0x49, 0x08, 0x34, - 0xb4, 0xe1, 0x45, 0x06, 0x4a, 0x93, 0x13, 0xec, 0x3a, 0x60, 0x82, 0x9c, 0x6f, 0x1e, 0xb1, 0x31, - 0x30, 0x73, 0xc0, 0xe6, 0xf0, 0x34, 0xec, 0xb2, 0xb4, 0x17, 0xb1, 0x1c, 0x98, 0x4d, 0x00, 0x33, - 0x07, 0xcc, 0x5c, 0x56, 0x17, 0x32, 0x27, 0xcc, 0x52, 0x05, 0x52, 0xfb, 0x6b, 0x35, 0xb4, 0x77, - 0xae, 0x6d, 0x6f, 0xf4, 0x33, 0xc2, 0x74, 0x0a, 0xe7, 0x58, 0x8a, 0xb3, 0xfb, 0x59, 0x07, 0x5a, - 0x22, 0x79, 0x16, 0x47, 0x0e, 0xae, 0x8a, 0x71, 0x2f, 0xeb, 0x40, 0x68, 0x8c, 0xb6, 0xc8, 0x09, - 0x0b, 0xf1, 0xf1, 0x66, 0x28, 0x12, 0x0d, 0x2f, 0x8b, 0xf8, 0xa5, 0xb6, 0xbb, 0x4e, 0x24, 0x5e, - 0x9f, 0x4c, 0x4c, 0x2a, 0xb8, 0x14, 0x27, 0x36, 0xb3, 0xbf, 0x61, 0x5c, 0x63, 0x03, 0xd5, 0xa3, - 0x26, 0x3d, 0x4e, 0xbb, 0xff, 0xab, 0x49, 0xcd, 0x9f, 0x1e, 0xbe, 0x68, 0x8d, 0x8f, 0x40, 0x0e, - 0xe2, 0x10, 0xc8, 0x5b, 0xbc, 0xf1, 0x20, 0x56, 0x9a, 0x5c, 0x65, 0x4e, 0xad, 0x93, 0x83, 0x2f, - 0x1f, 0xff, 0x7b, 0xfa, 0x3c, 0x3c, 0xf5, 0xdf, 0xfd, 0xf8, 0xfd, 0x69, 0x8d, 0x90, 0xcb, 0x46, - 0xc1, 0x83, 0x86, 0xfb, 0x6d, 0x28, 0xf2, 0x11, 0x61, 0xaf, 0x98, 0x0c, 0xb9, 0x31, 0xcb, 0x30, - 0x25, 0xa0, 0xf2, 0x0a, 0x5a, 0x41, 0x77, 0x0c, 0xc7, 0x36, 0x9d, 0xe3, 0x38, 0x1c, 0x29, 0xe9, - 0x6b, 0x2e, 0xe0, 0x05, 0x52, 0x21, 0x37, 0x17, 0xe3, 0x2d, 0x14, 0xd4, 0x4a, 0x60, 0x77, 0x0d, - 0x6c, 0x8d, 0x6e, 0xcf, 0xc2, 0xee, 0x8f, 0x95, 0x79, 0x88, 0xea, 0xe4, 0x3d, 0xc2, 0xeb, 0x77, - 0x61, 0xe9, 0x0c, 0x57, 0xd8, 0x37, 0x72, 0x7d, 0x16, 0x85, 0xbf, 0x2e, 0x56, 0xc1, 0x1b, 0xf2, - 0x05, 0x61, 0xaf, 0x10, 0xf3, 0xfc, 0x20, 0xa7, 0x44, 0xbe, 0x12, 0xa0, 0xa6, 0x01, 0xba, 0x55, - 0xde, 0x99, 0x07, 0x72, 0xb9, 0x2d, 0xd8, 0x78, 0xb2, 0x27, 0xd8, 0xbb, 0x03, 0x7d, 0xd0, 0xb0, - 0xac, 0x53, 0xfe, 0xac, 0x79, 0xb4, 0xd5, 0x6c, 0xfd, 0xf5, 0xe5, 0xf5, 0x1f, 0x1d, 0x7c, 0x1b, - 0x56, 0xd1, 0xf7, 0x61, 0x15, 0xfd, 0x1a, 0x56, 0xd1, 0x93, 0xfa, 0xdf, 0x96, 0xf1, 0xf4, 0xff, - 0x44, 0xc7, 0x33, 0x4b, 0xf7, 0xf6, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x23, 0xc4, 0x8d, 0xa4, - 0x40, 0x06, 0x00, 0x00, + proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_cluster_6ee48698ede88737) +} + +var fileDescriptor_cluster_6ee48698ede88737 = []byte{ + // 586 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x95, 0xcf, 0x6b, 0x13, 0x41, + 0x14, 0xc7, 0x99, 0xb6, 0x6e, 0xcd, 0x28, 0x56, 0x87, 0x2a, 0x6b, 0x1a, 0x43, 0xba, 0x87, 0x12, + 0xa2, 0xdd, 0x21, 0xf1, 0x52, 0x7a, 0x6c, 0xa4, 0x22, 0x8a, 0x60, 0xc4, 0x8b, 0x14, 0x64, 0xb2, + 0x79, 0x6e, 0xd7, 0x24, 0x3b, 0xe3, 0xcc, 0x6c, 0xb0, 0x88, 0x08, 0x7a, 0x15, 0x2f, 0xfe, 0x01, + 0xfe, 0x09, 0xfe, 0x07, 0x9e, 0x3d, 0x0a, 0xde, 0x3c, 0x49, 0xf0, 0x0f, 0x91, 0x9d, 0x9d, 0xcd, + 0xef, 0x78, 0x31, 0x78, 0xca, 0xcc, 0x77, 0x26, 0xef, 0x7d, 0xe6, 0xbd, 0x6f, 0x5e, 0x70, 0x49, + 0x81, 0x1c, 0x80, 0xa4, 0x41, 0x2f, 0x51, 0x7a, 0xfc, 0xe9, 0x0b, 0xc9, 0x35, 0x27, 0x9b, 0x76, + 0x5b, 0xdc, 0x0e, 0x79, 0xc8, 0x8d, 0x46, 0xd3, 0x55, 0x76, 0x5c, 0x2c, 0x85, 0x9c, 0x87, 0x3d, + 0xa0, 0x4c, 0x44, 0x94, 0xc5, 0x31, 0xd7, 0x4c, 0x47, 0x3c, 0x56, 0xf6, 0xd4, 0xeb, 0x1e, 0x28, + 0x3f, 0xe2, 0xe6, 0x34, 0xe0, 0x12, 0xe8, 0xa0, 0x4e, 0x43, 0x88, 0x41, 0x32, 0x0d, 0x1d, 0x7b, + 0xe7, 0x5e, 0x18, 0xe9, 0xd3, 0xa4, 0xed, 0x07, 0xbc, 0x4f, 0x99, 0x34, 0x29, 0x5e, 0x98, 0xc5, + 0x7e, 0xd0, 0xa1, 0xa2, 0x1b, 0xa6, 0x5f, 0x56, 0x94, 0x09, 0xd1, 0x8b, 0x02, 0x13, 0x9c, 0x0e, + 0xea, 0xac, 0x27, 0x4e, 0xd9, 0x5c, 0x28, 0x6f, 0x0f, 0x5f, 0x6c, 0x66, 0xb4, 0x8f, 0x12, 0x90, + 0x67, 0xe4, 0x1a, 0x76, 0xb2, 0xb7, 0xb9, 0xa8, 0x82, 0xaa, 0x85, 0x96, 0xdd, 0x79, 0x57, 0xf0, + 0x96, 0xbd, 0xd7, 0x02, 0x25, 0x78, 0xac, 0xc0, 0xfb, 0x80, 0xf0, 0xb6, 0xd5, 0x9a, 0x12, 0x98, + 0x86, 0x16, 0xbc, 0x4c, 0x40, 0x69, 0x72, 0x82, 0xf3, 0x0a, 0x98, 0x20, 0x17, 0x1a, 0x47, 0xfe, + 0x18, 0xd8, 0xcf, 0x81, 0xcd, 0xe2, 0x59, 0xd0, 0xf1, 0x45, 0x37, 0xf4, 0x53, 0x60, 0x7f, 0x02, + 0xd8, 0xcf, 0x81, 0xfd, 0x3c, 0x6b, 0x1e, 0x32, 0x25, 0x4c, 0x84, 0x02, 0xa9, 0xdd, 0xb5, 0x0a, + 0xaa, 0x9e, 0x6f, 0xd9, 0x9d, 0xf7, 0x15, 0x61, 0x6f, 0x0a, 0xe7, 0x58, 0xf2, 0xfe, 0xfd, 0xa4, + 0x0d, 0x4d, 0x1e, 0x3f, 0x8f, 0xc2, 0x1c, 0xae, 0x8c, 0x71, 0x37, 0x69, 0x43, 0x60, 0x44, 0xfb, + 0xc8, 0x09, 0x85, 0xb8, 0x78, 0x33, 0xe0, 0xb1, 0x86, 0x57, 0x59, 0xfc, 0x42, 0x2b, 0xdf, 0x4e, + 0x24, 0x5e, 0x9f, 0x4c, 0x4c, 0x4a, 0xb8, 0x10, 0xc5, 0x36, 0xb3, 0xbb, 0x61, 0x8e, 0xc6, 0x02, + 0xa9, 0xe2, 0x2d, 0x75, 0xa6, 0x34, 0xf4, 0x1f, 0xb2, 0x3e, 0x28, 0xc1, 0x02, 0x70, 0xcf, 0x99, + 0xb8, 0xb3, 0xb2, 0xa7, 0x47, 0xe5, 0x7c, 0x22, 0x3a, 0xff, 0xab, 0x9c, 0x8d, 0x9f, 0x0e, 0xbe, + 0x64, 0xc5, 0xc7, 0x20, 0x07, 0x51, 0x00, 0xe4, 0x2d, 0xde, 0x78, 0x10, 0x29, 0x4d, 0xae, 0xfa, + 0xb9, 0xaf, 0x27, 0x2d, 0x52, 0x3c, 0xfe, 0xf7, 0xf4, 0x69, 0x78, 0xcf, 0x7d, 0xf7, 0xe3, 0xf7, + 0xa7, 0x35, 0x42, 0x2e, 0x1b, 0xaf, 0x0f, 0xea, 0xf9, 0xaf, 0x48, 0x91, 0x8f, 0x08, 0x3b, 0x59, + 0x0f, 0xc9, 0x8d, 0x59, 0x86, 0x29, 0xab, 0x15, 0x57, 0x50, 0x0a, 0x6f, 0xd7, 0x70, 0xec, 0x78, + 0x73, 0x1c, 0x87, 0x23, 0xcf, 0x7d, 0x49, 0xad, 0xbe, 0xc0, 0x54, 0xe4, 0xe6, 0x62, 0xbc, 0x85, + 0xd6, 0x5b, 0x09, 0xec, 0x9e, 0x81, 0xad, 0x78, 0x3b, 0xb3, 0xb0, 0xfb, 0x63, 0x0f, 0x1f, 0xa2, + 0x1a, 0x79, 0x8f, 0xf0, 0xfa, 0x5d, 0x58, 0xda, 0xc3, 0x15, 0xd6, 0x8d, 0x5c, 0x9f, 0x45, 0xa1, + 0xaf, 0xb3, 0xa1, 0xf1, 0x86, 0x7c, 0x46, 0xd8, 0xc9, 0xcc, 0x3c, 0xdf, 0xc8, 0x29, 0x93, 0xaf, + 0x04, 0xa8, 0x61, 0x80, 0x6e, 0x15, 0x77, 0xe7, 0x81, 0xf2, 0xdc, 0x16, 0x6c, 0xdc, 0xd9, 0x13, + 0xec, 0xdc, 0x81, 0x1e, 0x68, 0x58, 0x56, 0x29, 0x77, 0x56, 0x1e, 0xcd, 0x3f, 0xfb, 0xfe, 0xda, + 0xf2, 0xf7, 0x1f, 0x1d, 0x7c, 0x1b, 0x96, 0xd1, 0xf7, 0x61, 0x19, 0xfd, 0x1a, 0x96, 0xd1, 0xd3, + 0xda, 0xdf, 0xc6, 0xf6, 0xf4, 0x3f, 0x4a, 0xdb, 0x31, 0xe3, 0xf9, 0xf6, 0x9f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x64, 0x1d, 0xc3, 0xc0, 0x6a, 0x06, 0x00, 0x00, } diff --git a/server/cluster/cluster.proto b/server/cluster/cluster.proto index b24c0ae93133c..3b47911529480 100644 --- a/server/cluster/cluster.proto +++ b/server/cluster/cluster.proto @@ -29,6 +29,8 @@ message ClusterCreateFromKubeConfigRequest { string context = 2; bool upsert = 3; bool inCluster = 4; + // Optional alternative system namespace to use (defaults to "kube-system") + string systemNamespace = 5; } message ClusterUpdateRequest { diff --git a/server/project/project.pb.go b/server/project/project.pb.go index f7418919246e4..492ce08be4a2c 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_579f5f5e657aac5a, []int{0} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a, []int{1} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a, []int{2} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a, []int{3} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a, []int{4} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a, []int{5} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a, []int{6} + return fileDescriptor_project_082822b5d17b8c4e, []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_579f5f5e657aac5a) + proto.RegisterFile("server/project/project.proto", fileDescriptor_project_082822b5d17b8c4e) } -var fileDescriptor_project_579f5f5e657aac5a = []byte{ +var fileDescriptor_project_082822b5d17b8c4e = []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 a15717dbae7dd..75c11b2cb7d17 100644 --- a/server/repository/repository.pb.go +++ b/server/repository/repository.pb.go @@ -47,7 +47,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_40c78d186a0140db, []int{0} + return fileDescriptor_repository_8a59358b1a9ab690, []int{0} } func (m *RepoAppsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -103,7 +103,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_40c78d186a0140db, []int{1} + return fileDescriptor_repository_8a59358b1a9ab690, []int{1} } func (m *AppInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,7 +162,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_40c78d186a0140db, []int{2} + return fileDescriptor_repository_8a59358b1a9ab690, []int{2} } func (m *RepoAppDetailsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -238,7 +238,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_40c78d186a0140db, []int{3} + return fileDescriptor_repository_8a59358b1a9ab690, []int{3} } func (m *RepoAppsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -286,7 +286,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_40c78d186a0140db, []int{4} + return fileDescriptor_repository_8a59358b1a9ab690, []int{4} } func (m *RepoQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -332,7 +332,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_40c78d186a0140db, []int{5} + return fileDescriptor_repository_8a59358b1a9ab690, []int{5} } func (m *RepoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -373,7 +373,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_40c78d186a0140db, []int{6} + return fileDescriptor_repository_8a59358b1a9ab690, []int{6} } func (m *RepoCreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -427,7 +427,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_40c78d186a0140db, []int{7} + return fileDescriptor_repository_8a59358b1a9ab690, []int{7} } func (m *RepoUpdateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2081,10 +2081,10 @@ var ( ) func init() { - proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_40c78d186a0140db) + proto.RegisterFile("server/repository/repository.proto", fileDescriptor_repository_8a59358b1a9ab690) } -var fileDescriptor_repository_40c78d186a0140db = []byte{ +var fileDescriptor_repository_8a59358b1a9ab690 = []byte{ // 675 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x6e, 0x13, 0x3d, 0x14, 0xd5, 0xb4, 0x69, 0xda, 0xba, 0x5f, 0x3f, 0x81, 0x5b, 0xaa, 0x30, 0xa4, 0x6d, 0x64, 0x16, diff --git a/server/session/session.pb.go b/server/session/session.pb.go index 85d3787ac70c6..e3db19fa810ae 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_ce4750ea85292617, []int{0} + return fileDescriptor_session_8e535ce77fc5e082, []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_ce4750ea85292617, []int{1} + return fileDescriptor_session_8e535ce77fc5e082, []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_ce4750ea85292617, []int{2} + return fileDescriptor_session_8e535ce77fc5e082, []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_ce4750ea85292617) + proto.RegisterFile("server/session/session.proto", fileDescriptor_session_8e535ce77fc5e082) } -var fileDescriptor_session_ce4750ea85292617 = []byte{ +var fileDescriptor_session_8e535ce77fc5e082 = []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 07979a91634a9..577809dde94fa 100644 --- a/server/settings/settings.pb.go +++ b/server/settings/settings.pb.go @@ -43,7 +43,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_e1e5490ce99485a2, []int{0} + return fileDescriptor_settings_4373c06dcc35da1b, []int{0} } func (m *SettingsQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -87,7 +87,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_e1e5490ce99485a2, []int{1} + return fileDescriptor_settings_4373c06dcc35da1b, []int{1} } func (m *Settings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,7 +162,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_e1e5490ce99485a2, []int{2} + return fileDescriptor_settings_4373c06dcc35da1b, []int{2} } func (m *DexConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -210,7 +210,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_e1e5490ce99485a2, []int{3} + return fileDescriptor_settings_4373c06dcc35da1b, []int{3} } func (m *Connector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -268,7 +268,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_e1e5490ce99485a2, []int{4} + return fileDescriptor_settings_4373c06dcc35da1b, []int{4} } func (m *OIDCConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1617,10 +1617,10 @@ var ( ) func init() { - proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_e1e5490ce99485a2) + proto.RegisterFile("server/settings/settings.proto", fileDescriptor_settings_4373c06dcc35da1b) } -var fileDescriptor_settings_e1e5490ce99485a2 = []byte{ +var fileDescriptor_settings_4373c06dcc35da1b = []byte{ // 577 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x5d, 0x6b, 0x13, 0x41, 0x14, 0x65, 0xbb, 0xfd, 0xda, 0x1b, 0xb5, 0xed, 0x28, 0x25, 0x06, 0x49, 0x42, 0x9e, 0x02, 0xe2, diff --git a/server/version/version.pb.go b/server/version/version.pb.go index 2c521725bf1c0..24be96b970d06 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_d7990ce5151ca1a0, []int{0} + return fileDescriptor_version_9a67e1897074bbcc, []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_d7990ce5151ca1a0) + proto.RegisterFile("server/version/version.proto", fileDescriptor_version_9a67e1897074bbcc) } -var fileDescriptor_version_d7990ce5151ca1a0 = []byte{ +var fileDescriptor_version_9a67e1897074bbcc = []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,