From f83a35fb16b85eb75a24648efe0211a35189ac02 Mon Sep 17 00:00:00 2001 From: gitlawr Date: Tue, 6 Mar 2018 11:23:07 +0800 Subject: [PATCH] update generated code --- .../v3/zz_generated_deepcopy.go | 13 +++- .../v3/zz_generated_k8s_client.go | 64 +++++++++---------- .../v3/zz_generated_scheme.go | 8 +-- ...rated_source_code_credential_controller.go | 5 +- ...rated_source_code_repository_controller.go | 5 +- client/management/v3/zz_generated_client.go | 8 +-- client/management/v3/zz_generated_pipeline.go | 54 ++++++++-------- .../v3/zz_generated_pipeline_status.go | 36 ++++++----- 8 files changed, 105 insertions(+), 88 deletions(-) diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index cf17885b..a763ce0a 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -3819,7 +3819,7 @@ func (in *Pipeline) DeepCopyInto(out *Pipeline) { out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) - out.Status = in.Status + in.Status.DeepCopyInto(&out.Status) return } @@ -4092,6 +4092,15 @@ func (in *PipelineSpec) DeepCopy() *PipelineSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *PipelineStatus) DeepCopyInto(out *PipelineStatus) { *out = *in + if in.SourceCodeCredential != nil { + in, out := &in.SourceCodeCredential, &out.SourceCodeCredential + if *in == nil { + *out = nil + } else { + *out = new(SourceCodeCredential) + (*in).DeepCopyInto(*out) + } + } return } @@ -5326,6 +5335,7 @@ func (in *SourceCodeConfig) DeepCopy() *SourceCodeConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SourceCodeCredential) DeepCopyInto(out *SourceCodeCredential) { *out = *in + out.Namespaced = in.Namespaced out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec @@ -5421,6 +5431,7 @@ func (in *SourceCodeCredentialStatus) DeepCopy() *SourceCodeCredentialStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SourceCodeRepository) DeepCopyInto(out *SourceCodeRepository) { *out = *in + out.Namespaced = in.Namespaced out.TypeMeta = in.TypeMeta in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) out.Spec = in.Spec diff --git a/apis/management.cattle.io/v3/zz_generated_k8s_client.go b/apis/management.cattle.io/v3/zz_generated_k8s_client.go index fcf95e04..c8d39a97 100644 --- a/apis/management.cattle.io/v3/zz_generated_k8s_client.go +++ b/apis/management.cattle.io/v3/zz_generated_k8s_client.go @@ -47,12 +47,12 @@ type Interface interface { NotifiersGetter ClusterAlertsGetter ProjectAlertsGetter - SourceCodeCredentialsGetter ClusterPipelinesGetter + SourceCodeCredentialsGetter PipelinesGetter PipelineExecutionsGetter - SourceCodeRepositoriesGetter PipelineExecutionLogsGetter + SourceCodeRepositoriesGetter } type Client struct { @@ -93,12 +93,12 @@ type Client struct { notifierControllers map[string]NotifierController clusterAlertControllers map[string]ClusterAlertController projectAlertControllers map[string]ProjectAlertController - sourceCodeCredentialControllers map[string]SourceCodeCredentialController clusterPipelineControllers map[string]ClusterPipelineController + sourceCodeCredentialControllers map[string]SourceCodeCredentialController pipelineControllers map[string]PipelineController pipelineExecutionControllers map[string]PipelineExecutionController - sourceCodeRepositoryControllers map[string]SourceCodeRepositoryController pipelineExecutionLogControllers map[string]PipelineExecutionLogController + sourceCodeRepositoryControllers map[string]SourceCodeRepositoryController } func NewForConfig(config rest.Config) (Interface, error) { @@ -148,12 +148,12 @@ func NewForConfig(config rest.Config) (Interface, error) { notifierControllers: map[string]NotifierController{}, clusterAlertControllers: map[string]ClusterAlertController{}, projectAlertControllers: map[string]ProjectAlertController{}, - sourceCodeCredentialControllers: map[string]SourceCodeCredentialController{}, clusterPipelineControllers: map[string]ClusterPipelineController{}, + sourceCodeCredentialControllers: map[string]SourceCodeCredentialController{}, pipelineControllers: map[string]PipelineController{}, pipelineExecutionControllers: map[string]PipelineExecutionController{}, - sourceCodeRepositoryControllers: map[string]SourceCodeRepositoryController{}, pipelineExecutionLogControllers: map[string]PipelineExecutionLogController{}, + sourceCodeRepositoryControllers: map[string]SourceCodeRepositoryController{}, }, nil } @@ -598,19 +598,6 @@ func (c *Client) ProjectAlerts(namespace string) ProjectAlertInterface { } } -type SourceCodeCredentialsGetter interface { - SourceCodeCredentials(namespace string) SourceCodeCredentialInterface -} - -func (c *Client) SourceCodeCredentials(namespace string) SourceCodeCredentialInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SourceCodeCredentialResource, SourceCodeCredentialGroupVersionKind, sourceCodeCredentialFactory{}) - return &sourceCodeCredentialClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} - type ClusterPipelinesGetter interface { ClusterPipelines(namespace string) ClusterPipelineInterface } @@ -624,6 +611,19 @@ func (c *Client) ClusterPipelines(namespace string) ClusterPipelineInterface { } } +type SourceCodeCredentialsGetter interface { + SourceCodeCredentials(namespace string) SourceCodeCredentialInterface +} + +func (c *Client) SourceCodeCredentials(namespace string) SourceCodeCredentialInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SourceCodeCredentialResource, SourceCodeCredentialGroupVersionKind, sourceCodeCredentialFactory{}) + return &sourceCodeCredentialClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} + type PipelinesGetter interface { Pipelines(namespace string) PipelineInterface } @@ -650,19 +650,6 @@ func (c *Client) PipelineExecutions(namespace string) PipelineExecutionInterface } } -type SourceCodeRepositoriesGetter interface { - SourceCodeRepositories(namespace string) SourceCodeRepositoryInterface -} - -func (c *Client) SourceCodeRepositories(namespace string) SourceCodeRepositoryInterface { - objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SourceCodeRepositoryResource, SourceCodeRepositoryGroupVersionKind, sourceCodeRepositoryFactory{}) - return &sourceCodeRepositoryClient{ - ns: namespace, - client: c, - objectClient: objectClient, - } -} - type PipelineExecutionLogsGetter interface { PipelineExecutionLogs(namespace string) PipelineExecutionLogInterface } @@ -675,3 +662,16 @@ func (c *Client) PipelineExecutionLogs(namespace string) PipelineExecutionLogInt objectClient: objectClient, } } + +type SourceCodeRepositoriesGetter interface { + SourceCodeRepositories(namespace string) SourceCodeRepositoryInterface +} + +func (c *Client) SourceCodeRepositories(namespace string) SourceCodeRepositoryInterface { + objectClient := clientbase.NewObjectClient(namespace, c.restClient, &SourceCodeRepositoryResource, SourceCodeRepositoryGroupVersionKind, sourceCodeRepositoryFactory{}) + return &sourceCodeRepositoryClient{ + ns: namespace, + client: c, + objectClient: objectClient, + } +} diff --git a/apis/management.cattle.io/v3/zz_generated_scheme.go b/apis/management.cattle.io/v3/zz_generated_scheme.go index f6701774..fb2e9a6c 100644 --- a/apis/management.cattle.io/v3/zz_generated_scheme.go +++ b/apis/management.cattle.io/v3/zz_generated_scheme.go @@ -99,18 +99,18 @@ func addKnownTypes(scheme *runtime.Scheme) error { &ClusterAlertList{}, &ProjectAlert{}, &ProjectAlertList{}, - &SourceCodeCredential{}, - &SourceCodeCredentialList{}, &ClusterPipeline{}, &ClusterPipelineList{}, + &SourceCodeCredential{}, + &SourceCodeCredentialList{}, &Pipeline{}, &PipelineList{}, &PipelineExecution{}, &PipelineExecutionList{}, - &SourceCodeRepository{}, - &SourceCodeRepositoryList{}, &PipelineExecutionLog{}, &PipelineExecutionLogList{}, + &SourceCodeRepository{}, + &SourceCodeRepositoryList{}, ) return nil } diff --git a/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go b/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go index d0fdc02c..a9dbfda7 100644 --- a/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_source_code_credential_controller.go @@ -23,8 +23,9 @@ var ( SourceCodeCredentialResource = metav1.APIResource{ Name: "sourcecodecredentials", SingularName: "sourcecodecredential", - Namespaced: false, - Kind: SourceCodeCredentialGroupVersionKind.Kind, + Namespaced: true, + + Kind: SourceCodeCredentialGroupVersionKind.Kind, } ) diff --git a/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go b/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go index 8a6d2873..851cca64 100644 --- a/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go +++ b/apis/management.cattle.io/v3/zz_generated_source_code_repository_controller.go @@ -23,8 +23,9 @@ var ( SourceCodeRepositoryResource = metav1.APIResource{ Name: "sourcecoderepositories", SingularName: "sourcecoderepository", - Namespaced: false, - Kind: SourceCodeRepositoryGroupVersionKind.Kind, + Namespaced: true, + + Kind: SourceCodeRepositoryGroupVersionKind.Kind, } ) diff --git a/client/management/v3/zz_generated_client.go b/client/management/v3/zz_generated_client.go index 9fa4a4eb..db9d4da4 100644 --- a/client/management/v3/zz_generated_client.go +++ b/client/management/v3/zz_generated_client.go @@ -40,12 +40,12 @@ type Client struct { Notifier NotifierOperations ClusterAlert ClusterAlertOperations ProjectAlert ProjectAlertOperations - SourceCodeCredential SourceCodeCredentialOperations ClusterPipeline ClusterPipelineOperations + SourceCodeCredential SourceCodeCredentialOperations Pipeline PipelineOperations PipelineExecution PipelineExecutionOperations - SourceCodeRepository SourceCodeRepositoryOperations PipelineExecutionLog PipelineExecutionLogOperations + SourceCodeRepository SourceCodeRepositoryOperations } func NewClient(opts *clientbase.ClientOpts) (*Client, error) { @@ -91,12 +91,12 @@ func NewClient(opts *clientbase.ClientOpts) (*Client, error) { client.Notifier = newNotifierClient(client) client.ClusterAlert = newClusterAlertClient(client) client.ProjectAlert = newProjectAlertClient(client) - client.SourceCodeCredential = newSourceCodeCredentialClient(client) client.ClusterPipeline = newClusterPipelineClient(client) + client.SourceCodeCredential = newSourceCodeCredentialClient(client) client.Pipeline = newPipelineClient(client) client.PipelineExecution = newPipelineExecutionClient(client) - client.SourceCodeRepository = newSourceCodeRepositoryClient(client) client.PipelineExecutionLog = newPipelineExecutionLogClient(client) + client.SourceCodeRepository = newSourceCodeRepositoryClient(client) return client, nil } diff --git a/client/management/v3/zz_generated_pipeline.go b/client/management/v3/zz_generated_pipeline.go index 9a9b34c8..f5a995fe 100644 --- a/client/management/v3/zz_generated_pipeline.go +++ b/client/management/v3/zz_generated_pipeline.go @@ -21,6 +21,7 @@ const ( PipelineFieldPipelineState = "pipelineState" PipelineFieldProjectId = "projectId" PipelineFieldRemoved = "removed" + PipelineFieldSourceCodeCredential = "sourceCodeCredential" PipelineFieldStages = "stages" PipelineFieldState = "state" PipelineFieldTemplates = "templates" @@ -36,32 +37,33 @@ const ( type Pipeline struct { types.Resource - Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` - Created string `json:"created,omitempty" yaml:"created,omitempty"` - CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` - Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` - LastExecutionID string `json:"lastExecutionId,omitempty" yaml:"lastExecutionId,omitempty"` - LastRunState string `json:"lastRunState,omitempty" yaml:"lastRunState,omitempty"` - LastStarted string `json:"lastStarted,omitempty" yaml:"lastStarted,omitempty"` - Name string `json:"name,omitempty" yaml:"name,omitempty"` - NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"` - NextRun *int64 `json:"nextRun,omitempty" yaml:"nextRun,omitempty"` - NextStart string `json:"nextStart,omitempty" yaml:"nextStart,omitempty"` - OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` - PipelineState string `json:"pipelineState,omitempty" yaml:"pipelineState,omitempty"` - ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` - Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` - Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty"` - State string `json:"state,omitempty" yaml:"state,omitempty"` - Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` - Token string `json:"token,omitempty" yaml:"token,omitempty"` - Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` - TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` - TriggerCronExpression string `json:"triggerCronExpression,omitempty" yaml:"triggerCronExpression,omitempty"` - TriggerCronTimezone string `json:"triggerCronTimezone,omitempty" yaml:"triggerCronTimezone,omitempty"` - TriggerWebhook bool `json:"triggerWebhook,omitempty" yaml:"triggerWebhook,omitempty"` - Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` - WebHookID string `json:"webhookId,omitempty" yaml:"webhookId,omitempty"` + Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` + Created string `json:"created,omitempty" yaml:"created,omitempty"` + CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` + LastExecutionID string `json:"lastExecutionId,omitempty" yaml:"lastExecutionId,omitempty"` + LastRunState string `json:"lastRunState,omitempty" yaml:"lastRunState,omitempty"` + LastStarted string `json:"lastStarted,omitempty" yaml:"lastStarted,omitempty"` + Name string `json:"name,omitempty" yaml:"name,omitempty"` + NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"` + NextRun *int64 `json:"nextRun,omitempty" yaml:"nextRun,omitempty"` + NextStart string `json:"nextStart,omitempty" yaml:"nextStart,omitempty"` + OwnerReferences []OwnerReference `json:"ownerReferences,omitempty" yaml:"ownerReferences,omitempty"` + PipelineState string `json:"pipelineState,omitempty" yaml:"pipelineState,omitempty"` + ProjectId string `json:"projectId,omitempty" yaml:"projectId,omitempty"` + Removed string `json:"removed,omitempty" yaml:"removed,omitempty"` + SourceCodeCredential *SourceCodeCredential `json:"sourceCodeCredential,omitempty" yaml:"sourceCodeCredential,omitempty"` + Stages []Stage `json:"stages,omitempty" yaml:"stages,omitempty"` + State string `json:"state,omitempty" yaml:"state,omitempty"` + Templates map[string]string `json:"templates,omitempty" yaml:"templates,omitempty"` + Token string `json:"token,omitempty" yaml:"token,omitempty"` + Transitioning string `json:"transitioning,omitempty" yaml:"transitioning,omitempty"` + TransitioningMessage string `json:"transitioningMessage,omitempty" yaml:"transitioningMessage,omitempty"` + TriggerCronExpression string `json:"triggerCronExpression,omitempty" yaml:"triggerCronExpression,omitempty"` + TriggerCronTimezone string `json:"triggerCronTimezone,omitempty" yaml:"triggerCronTimezone,omitempty"` + TriggerWebhook bool `json:"triggerWebhook,omitempty" yaml:"triggerWebhook,omitempty"` + Uuid string `json:"uuid,omitempty" yaml:"uuid,omitempty"` + WebHookID string `json:"webhookId,omitempty" yaml:"webhookId,omitempty"` } type PipelineCollection struct { types.Collection diff --git a/client/management/v3/zz_generated_pipeline_status.go b/client/management/v3/zz_generated_pipeline_status.go index a4a0dd12..ed5e9cf6 100644 --- a/client/management/v3/zz_generated_pipeline_status.go +++ b/client/management/v3/zz_generated_pipeline_status.go @@ -1,24 +1,26 @@ package client const ( - PipelineStatusType = "pipelineStatus" - PipelineStatusFieldLastExecutionID = "lastExecutionId" - PipelineStatusFieldLastRunState = "lastRunState" - PipelineStatusFieldLastStarted = "lastStarted" - PipelineStatusFieldNextRun = "nextRun" - PipelineStatusFieldNextStart = "nextStart" - PipelineStatusFieldPipelineState = "pipelineState" - PipelineStatusFieldToken = "token" - PipelineStatusFieldWebHookID = "webhookId" + PipelineStatusType = "pipelineStatus" + PipelineStatusFieldLastExecutionID = "lastExecutionId" + PipelineStatusFieldLastRunState = "lastRunState" + PipelineStatusFieldLastStarted = "lastStarted" + PipelineStatusFieldNextRun = "nextRun" + PipelineStatusFieldNextStart = "nextStart" + PipelineStatusFieldPipelineState = "pipelineState" + PipelineStatusFieldSourceCodeCredential = "sourceCodeCredential" + PipelineStatusFieldToken = "token" + PipelineStatusFieldWebHookID = "webhookId" ) type PipelineStatus struct { - LastExecutionID string `json:"lastExecutionId,omitempty" yaml:"lastExecutionId,omitempty"` - LastRunState string `json:"lastRunState,omitempty" yaml:"lastRunState,omitempty"` - LastStarted string `json:"lastStarted,omitempty" yaml:"lastStarted,omitempty"` - NextRun *int64 `json:"nextRun,omitempty" yaml:"nextRun,omitempty"` - NextStart string `json:"nextStart,omitempty" yaml:"nextStart,omitempty"` - PipelineState string `json:"pipelineState,omitempty" yaml:"pipelineState,omitempty"` - Token string `json:"token,omitempty" yaml:"token,omitempty"` - WebHookID string `json:"webhookId,omitempty" yaml:"webhookId,omitempty"` + LastExecutionID string `json:"lastExecutionId,omitempty" yaml:"lastExecutionId,omitempty"` + LastRunState string `json:"lastRunState,omitempty" yaml:"lastRunState,omitempty"` + LastStarted string `json:"lastStarted,omitempty" yaml:"lastStarted,omitempty"` + NextRun *int64 `json:"nextRun,omitempty" yaml:"nextRun,omitempty"` + NextStart string `json:"nextStart,omitempty" yaml:"nextStart,omitempty"` + PipelineState string `json:"pipelineState,omitempty" yaml:"pipelineState,omitempty"` + SourceCodeCredential *SourceCodeCredential `json:"sourceCodeCredential,omitempty" yaml:"sourceCodeCredential,omitempty"` + Token string `json:"token,omitempty" yaml:"token,omitempty"` + WebHookID string `json:"webhookId,omitempty" yaml:"webhookId,omitempty"` }