From bec38d9a16ea552d16836bab95f03c839bcfa254 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Wed, 16 Nov 2022 10:12:54 +0800 Subject: [PATCH] feat(climc): k8s cluster force deploy (#15372) --- cmd/climc/shell/k8s/clusters.go | 2 +- pkg/mcclient/options/k8s/cluster.go | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/cmd/climc/shell/k8s/clusters.go b/cmd/climc/shell/k8s/clusters.go index ed9fe6bd8e..259d6f97e7 100644 --- a/cmd/climc/shell/k8s/clusters.go +++ b/cmd/climc/shell/k8s/clusters.go @@ -43,7 +43,7 @@ func initKubeCluster() { cmd.Create(new(o.K8SClusterCreateOptions)) cmd.Perform("sync", new(o.ClusterSyncOptions)) cmd.Perform("syncstatus", new(o.IdentOptions)) - cmd.Perform("deploy", new(o.IdentOptions)) + cmd.Perform("deploy", new(o.ClusterDeployOptions)) cmd.Get("components-status", new(o.IdentOptions)) cmd.Get("api-resources", new(o.IdentOptions)) cmd.Get("cluster-users", new(o.IdentOptions)) diff --git a/pkg/mcclient/options/k8s/cluster.go b/pkg/mcclient/options/k8s/cluster.go index 2625406b1b..613ffcb7b9 100644 --- a/pkg/mcclient/options/k8s/cluster.go +++ b/pkg/mcclient/options/k8s/cluster.go @@ -284,6 +284,19 @@ func (o ClusterSyncOptions) Params() (jsonutils.JSONObject, error) { return param, nil } +type ClusterDeployOptions struct { + IdentOptions + Force bool `help:"force deploy"` +} + +func (o ClusterDeployOptions) Params() (jsonutils.JSONObject, error) { + param := jsonutils.NewDict() + if o.Force { + param.Add(jsonutils.JSONTrue, "force") + } + return param, nil +} + type ClusterK8sVersions struct { PROVIDER string `help:"cluster provider" choices:"system|onecloud"` }