From d04a97d4f08b0229e620a19f48d99fe2637550cf Mon Sep 17 00:00:00 2001 From: shanewxy <592491808@qq.com> Date: Thu, 26 Dec 2019 18:30:31 +0800 Subject: [PATCH 1/2] Add redeploy to workload api --- apis/project.cattle.io/v3/schema/schema.go | 25 ++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/apis/project.cattle.io/v3/schema/schema.go b/apis/project.cattle.io/v3/schema/schema.go index bfc3b6de..e856c198 100644 --- a/apis/project.cattle.io/v3/schema/schema.go +++ b/apis/project.cattle.io/v3/schema/schema.go @@ -123,8 +123,9 @@ func workloadTypes(schemas *types.Schemas) *types.Schemas { "rollback": { Input: "rollbackRevision", }, - "pause": {}, - "resume": {}, + "pause": {}, + "resume": {}, + "redeploy": {}, } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" @@ -182,6 +183,9 @@ func statefulSetTypes(schemas *types.Schemas) *types.Schemas { MustImport(&Version, k8sappv1.StatefulSetSpec{}, statefulSetConfigOverride{}). MustImportAndCustomize(&Version, k8sappv1.StatefulSet{}, func(schema *types.Schema) { schema.BaseType = "workload" + schema.ResourceActions = map[string]types.Action{ + "redeploy": {}, + } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" field.Nullable = false @@ -218,6 +222,9 @@ func replicaSetTypes(schemas *types.Schemas) *types.Schemas { MustImport(&Version, appsv1.ReplicaSetSpec{}, replicaSetConfigOverride{}). MustImportAndCustomize(&Version, appsv1.ReplicaSet{}, func(schema *types.Schema) { schema.BaseType = "workload" + schema.ResourceActions = map[string]types.Action{ + "redeploy": {}, + } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" field.Nullable = false @@ -256,6 +263,9 @@ func replicationControllerTypes(schemas *types.Schemas) *types.Schemas { schema.BaseType = "workload" schema.CollectionMethods = []string{http.MethodGet} schema.ResourceMethods = []string{http.MethodGet} + schema.ResourceActions = map[string]types.Action{ + "redeploy": {}, + } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" field.Nullable = false @@ -302,6 +312,9 @@ func daemonSetTypes(schemas *types.Schemas) *types.Schemas { MustImport(&Version, k8sappv1.DaemonSetSpec{}, daemonSetOverride{}). MustImportAndCustomize(&Version, k8sappv1.DaemonSet{}, func(schema *types.Schema) { schema.BaseType = "workload" + schema.ResourceActions = map[string]types.Action{ + "redeploy": {}, + } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" field.Nullable = false @@ -408,6 +421,9 @@ func cronJobTypes(schemas *types.Schemas) *types.Schemas { MustImport(&Version, batchv1beta1.JobTemplateSpec{}). MustImportAndCustomize(&Version, batchv1beta1.CronJob{}, func(schema *types.Schema) { schema.BaseType = "workload" + schema.ResourceActions = map[string]types.Action{ + "redeploy": {}, + } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" field.Nullable = false @@ -469,8 +485,9 @@ func deploymentTypes(schemas *types.Schemas) *types.Schemas { "rollback": { Input: "deploymentRollbackInput", }, - "pause": {}, - "resume": {}, + "pause": {}, + "resume": {}, + "redeploy": {}, } schema.MustCustomizeField("name", func(field types.Field) types.Field { field.Type = "dnsLabelRestricted" From bca5856476fac20944d4a2f55bbd574d6a13b63c Mon Sep 17 00:00:00 2001 From: shanewxy <592491808@qq.com> Date: Thu, 6 Feb 2020 12:22:10 +0800 Subject: [PATCH 2/2] go generate --- client/project/v3/zz_generated_cron_job.go | 7 +++++++ client/project/v3/zz_generated_daemon_set.go | 7 +++++++ client/project/v3/zz_generated_deployment.go | 7 +++++++ client/project/v3/zz_generated_replica_set.go | 7 +++++++ client/project/v3/zz_generated_replication_controller.go | 7 +++++++ client/project/v3/zz_generated_stateful_set.go | 7 +++++++ client/project/v3/zz_generated_workload.go | 7 +++++++ 7 files changed, 49 insertions(+) diff --git a/client/project/v3/zz_generated_cron_job.go b/client/project/v3/zz_generated_cron_job.go index ab5cbdb6..c1aa41cc 100644 --- a/client/project/v3/zz_generated_cron_job.go +++ b/client/project/v3/zz_generated_cron_job.go @@ -137,6 +137,8 @@ type CronJobOperations interface { Replace(existing *CronJob) (*CronJob, error) ByID(id string) (*CronJob, error) Delete(container *CronJob) error + + ActionRedeploy(resource *CronJob) error } func newCronJobClient(apiClient *Client) *CronJobClient { @@ -189,3 +191,8 @@ func (c *CronJobClient) ByID(id string) (*CronJob, error) { func (c *CronJobClient) Delete(container *CronJob) error { return c.apiClient.Ops.DoResourceDelete(CronJobType, &container.Resource) } + +func (c *CronJobClient) ActionRedeploy(resource *CronJob) error { + err := c.apiClient.Ops.DoAction(CronJobType, "redeploy", &resource.Resource, nil, nil) + return err +} diff --git a/client/project/v3/zz_generated_daemon_set.go b/client/project/v3/zz_generated_daemon_set.go index 2dbef022..8495401d 100644 --- a/client/project/v3/zz_generated_daemon_set.go +++ b/client/project/v3/zz_generated_daemon_set.go @@ -135,6 +135,8 @@ type DaemonSetOperations interface { Replace(existing *DaemonSet) (*DaemonSet, error) ByID(id string) (*DaemonSet, error) Delete(container *DaemonSet) error + + ActionRedeploy(resource *DaemonSet) error } func newDaemonSetClient(apiClient *Client) *DaemonSetClient { @@ -187,3 +189,8 @@ func (c *DaemonSetClient) ByID(id string) (*DaemonSet, error) { func (c *DaemonSetClient) Delete(container *DaemonSet) error { return c.apiClient.Ops.DoResourceDelete(DaemonSetType, &container.Resource) } + +func (c *DaemonSetClient) ActionRedeploy(resource *DaemonSet) error { + err := c.apiClient.Ops.DoAction(DaemonSetType, "redeploy", &resource.Resource, nil, nil) + return err +} diff --git a/client/project/v3/zz_generated_deployment.go b/client/project/v3/zz_generated_deployment.go index 9b26a64a..dad7706f 100644 --- a/client/project/v3/zz_generated_deployment.go +++ b/client/project/v3/zz_generated_deployment.go @@ -142,6 +142,8 @@ type DeploymentOperations interface { ActionPause(resource *Deployment) error + ActionRedeploy(resource *Deployment) error + ActionResume(resource *Deployment) error ActionRollback(resource *Deployment, input *DeploymentRollbackInput) error @@ -203,6 +205,11 @@ func (c *DeploymentClient) ActionPause(resource *Deployment) error { return err } +func (c *DeploymentClient) ActionRedeploy(resource *Deployment) error { + err := c.apiClient.Ops.DoAction(DeploymentType, "redeploy", &resource.Resource, nil, nil) + return err +} + func (c *DeploymentClient) ActionResume(resource *Deployment) error { err := c.apiClient.Ops.DoAction(DeploymentType, "resume", &resource.Resource, nil, nil) return err diff --git a/client/project/v3/zz_generated_replica_set.go b/client/project/v3/zz_generated_replica_set.go index 92254d2f..a42a123a 100644 --- a/client/project/v3/zz_generated_replica_set.go +++ b/client/project/v3/zz_generated_replica_set.go @@ -137,6 +137,8 @@ type ReplicaSetOperations interface { Replace(existing *ReplicaSet) (*ReplicaSet, error) ByID(id string) (*ReplicaSet, error) Delete(container *ReplicaSet) error + + ActionRedeploy(resource *ReplicaSet) error } func newReplicaSetClient(apiClient *Client) *ReplicaSetClient { @@ -189,3 +191,8 @@ func (c *ReplicaSetClient) ByID(id string) (*ReplicaSet, error) { func (c *ReplicaSetClient) Delete(container *ReplicaSet) error { return c.apiClient.Ops.DoResourceDelete(ReplicaSetType, &container.Resource) } + +func (c *ReplicaSetClient) ActionRedeploy(resource *ReplicaSet) error { + err := c.apiClient.Ops.DoAction(ReplicaSetType, "redeploy", &resource.Resource, nil, nil) + return err +} diff --git a/client/project/v3/zz_generated_replication_controller.go b/client/project/v3/zz_generated_replication_controller.go index 5f4b45a5..1c4556f1 100644 --- a/client/project/v3/zz_generated_replication_controller.go +++ b/client/project/v3/zz_generated_replication_controller.go @@ -137,6 +137,8 @@ type ReplicationControllerOperations interface { Replace(existing *ReplicationController) (*ReplicationController, error) ByID(id string) (*ReplicationController, error) Delete(container *ReplicationController) error + + ActionRedeploy(resource *ReplicationController) error } func newReplicationControllerClient(apiClient *Client) *ReplicationControllerClient { @@ -189,3 +191,8 @@ func (c *ReplicationControllerClient) ByID(id string) (*ReplicationController, e func (c *ReplicationControllerClient) Delete(container *ReplicationController) error { return c.apiClient.Ops.DoResourceDelete(ReplicationControllerType, &container.Resource) } + +func (c *ReplicationControllerClient) ActionRedeploy(resource *ReplicationController) error { + err := c.apiClient.Ops.DoAction(ReplicationControllerType, "redeploy", &resource.Resource, nil, nil) + return err +} diff --git a/client/project/v3/zz_generated_stateful_set.go b/client/project/v3/zz_generated_stateful_set.go index 30d24261..46ee6096 100644 --- a/client/project/v3/zz_generated_stateful_set.go +++ b/client/project/v3/zz_generated_stateful_set.go @@ -137,6 +137,8 @@ type StatefulSetOperations interface { Replace(existing *StatefulSet) (*StatefulSet, error) ByID(id string) (*StatefulSet, error) Delete(container *StatefulSet) error + + ActionRedeploy(resource *StatefulSet) error } func newStatefulSetClient(apiClient *Client) *StatefulSetClient { @@ -189,3 +191,8 @@ func (c *StatefulSetClient) ByID(id string) (*StatefulSet, error) { func (c *StatefulSetClient) Delete(container *StatefulSet) error { return c.apiClient.Ops.DoResourceDelete(StatefulSetType, &container.Resource) } + +func (c *StatefulSetClient) ActionRedeploy(resource *StatefulSet) error { + err := c.apiClient.Ops.DoAction(StatefulSetType, "redeploy", &resource.Resource, nil, nil) + return err +} diff --git a/client/project/v3/zz_generated_workload.go b/client/project/v3/zz_generated_workload.go index b5197165..b30282a6 100644 --- a/client/project/v3/zz_generated_workload.go +++ b/client/project/v3/zz_generated_workload.go @@ -168,6 +168,8 @@ type WorkloadOperations interface { ActionPause(resource *Workload) error + ActionRedeploy(resource *Workload) error + ActionResume(resource *Workload) error ActionRollback(resource *Workload, input *RollbackRevision) error @@ -229,6 +231,11 @@ func (c *WorkloadClient) ActionPause(resource *Workload) error { return err } +func (c *WorkloadClient) ActionRedeploy(resource *Workload) error { + err := c.apiClient.Ops.DoAction(WorkloadType, "redeploy", &resource.Resource, nil, nil) + return err +} + func (c *WorkloadClient) ActionResume(resource *Workload) error { err := c.apiClient.Ops.DoAction(WorkloadType, "resume", &resource.Resource, nil, nil) return err