refactor(autok3s): remove octopus ui

Signed-off-by: Jason-ZW <zhenyang@rancher.com>
cnrancher · Oct 14, 2020 · 17beffe · 17beffe
1 parent efb10d1
commit 17beffe
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -171,20 +171,14 @@ func InitK3sCluster(cluster *types.Cluster) error {
 
 	logrus.Infof("[%s] deploying additional manifests\n", cluster.Provider)
 
-	// deploy additional UI manifests. e.g. (none/dashboard/octopus-ui).
+	// deploy additional UI manifests. e.g. (none/dashboard).
 	switch cluster.UI {
 	case "dashboard":
 		if _, err := execute(&hosts.Host{Node: cluster.MasterNodes[0]}, false,
 			[]string{fmt.Sprintf(deployUICommand, base64.StdEncoding.EncodeToString(
 				[]byte(fmt.Sprintf(dashboardTmpl, cluster.Repo))), common.K3sManifestsDir)}); err != nil {
 			return err
 		}
-	case "octopus-ui":
-		if _, err := execute(&hosts.Host{Node: cluster.MasterNodes[0]}, false,
-			[]string{fmt.Sprintf(deployUICommand, base64.StdEncoding.EncodeToString(
-				[]byte(octopusTmpl)), common.K3sManifestsDir)}); err != nil {
-			return err
-		}
 	}
 
 	logrus.Infof("[%s] successfully deployed additional manifests\n", cluster.Provider)

diff --git a/pkg/cluster/template.go b/pkg/cluster/template.go
@@ -16,19 +16,3 @@ spec:
       externalPort: 8999
       internalPort: 8999
 `
-
-const octopusTmpl = `
-apiVersion: helm.cattle.io/v1
-kind: HelmChart
-metadata:
-  name: octopus-ui
-  namespace: kube-system
-spec:
-  chart: octopus-ui
-  repo: http://charts.cnrancher.com/octopus
-  targetNamespace: octopus-system
-  valuesContent: |-
-    service:
-      type: LoadBalancer
-      port: 8999
-`
diff --git a/pkg/providers/alibaba/flag.go b/pkg/providers/alibaba/flag.go
@@ -19,7 +19,7 @@ func (p *Alibaba) GetCreateFlags(cmd *cobra.Command) *pflag.FlagSet {
 			Name:     "ui",
 			P:        &p.UI,
 			V:        p.UI,
-			Usage:    "Specify K3s UI. e.g.(none/dashboard/octopus-ui)",
+			Usage:    "Specify K3s UI. e.g.(none/dashboard)",
 			Required: true,
 		},
 		{

diff --git a/pkg/providers/native/flag.go b/pkg/providers/native/flag.go
@@ -16,7 +16,7 @@ func (p *Native) GetCreateFlags(cmd *cobra.Command) *pflag.FlagSet {
 			Name:     "ui",
 			P:        &p.UI,
 			V:        p.UI,
-			Usage:    "Specify K3s UI. e.g.(none/dashboard/octopus-ui)",
+			Usage:    "Specify K3s UI. e.g.(none/dashboard)",
 			Required: true,
 		},
 		{