fix(installer): move lightweight-install position (#1821)

tkestack · Apr 1, 2022 · 0ead002 · 0ead002
1 parent 3e94139
commit 0ead002
Show file tree

Hide file tree

Showing 32 changed files with 6 additions and 4 deletions.
diff --git a/charts/bin/gen b/charts/bin/gen
diff --git a/charts/bin/customConfig.yaml → hack/lightweight-install/customConfig.yaml b/charts/bin/customConfig.yaml → hack/lightweight-install/customConfig.yaml
@@ -42,7 +42,7 @@ tke-auth:
     adminPassword: 
 tke-platform:
   # 必填 VIP，或者公网可访问的集群IP
-  publicIP:
+  publicIP: 172.18.0.2
   metricsServerImage: tkestack/metrics-server:v0.3.6
   addonResizerImage: tkestack/addon-resizer:1.8.11
   api:

diff --git a/charts/values/generateChartValues.go → ...-install/installer/generateChartValues.go b/charts/values/generateChartValues.go → ...-install/installer/generateChartValues.go
@@ -1,4 +1,4 @@
-package main
+package installer
 
 import (
 	"encoding/base64"

diff --git a/charts/values/struct.go → hack/lightweight-install/installer/struct.go b/charts/values/struct.go → hack/lightweight-install/installer/struct.go
@@ -1,4 +1,4 @@
-package main
+package installer
 
 type ClusterInfoPatch struct {
 	Data struct {

diff --git a/charts/bin/kindConfig.yaml → hack/lightweight-install/kindConfig.yaml b/charts/bin/kindConfig.yaml → hack/lightweight-install/kindConfig.yaml
diff --git a/charts/values/main.go → hack/lightweight-install/main.go b/charts/values/main.go → hack/lightweight-install/main.go
@@ -3,10 +3,12 @@ package main
 import (
 	"fmt"
 	"log"
+
+	"tkestack.io/tke/hack/lightweight-install/installer"
 )
 
 func main() {
-	if err := GenerateValueChart(); err != nil {
+	if err := installer.GenerateValueChart(); err != nil {
 		log.Fatalf("generate chart value yaml fail, error: %s", err.Error())
 	}
 	fmt.Printf("generate chart value yaml success!")

diff --git a/charts/tke-auth/.helmignore → .../lightweight-install/tke-auth/.helmignore b/charts/tke-auth/.helmignore → .../lightweight-install/tke-auth/.helmignore
diff --git a/charts/tke-auth/Chart.yaml → hack/lightweight-install/tke-auth/Chart.yaml b/charts/tke-auth/Chart.yaml → hack/lightweight-install/tke-auth/Chart.yaml
diff --git a/charts/tke-auth/templates/_helpers.tpl → ...t-install/tke-auth/templates/_helpers.tpl b/charts/tke-auth/templates/_helpers.tpl → ...t-install/tke-auth/templates/_helpers.tpl
diff --git a/charts/tke-auth/templates/certs-volumes.yaml → ...all/tke-auth/templates/certs-volumes.yaml b/charts/tke-auth/templates/certs-volumes.yaml → ...all/tke-auth/templates/certs-volumes.yaml
diff --git a/charts/tke-auth/templates/tke-auth-api.yaml → ...tall/tke-auth/templates/tke-auth-api.yaml b/charts/tke-auth/templates/tke-auth-api.yaml → ...tall/tke-auth/templates/tke-auth-api.yaml
diff --git a/...e-auth/templates/tke-auth-controller.yaml → ...e-auth/templates/tke-auth-controller.yaml b/...e-auth/templates/tke-auth-controller.yaml → ...e-auth/templates/tke-auth-controller.yaml
diff --git a/charts/tke-auth/values.yaml → .../lightweight-install/tke-auth/values.yaml b/charts/tke-auth/values.yaml → .../lightweight-install/tke-auth/values.yaml
diff --git a/charts/tke-gateway/.helmignore → ...ghtweight-install/tke-gateway/.helmignore b/charts/tke-gateway/.helmignore → ...ghtweight-install/tke-gateway/.helmignore
diff --git a/charts/tke-gateway/Chart.yaml → ...ightweight-install/tke-gateway/Chart.yaml b/charts/tke-gateway/Chart.yaml → ...ightweight-install/tke-gateway/Chart.yaml
diff --git a/charts/tke-gateway/templates/_helpers.tpl → ...nstall/tke-gateway/templates/_helpers.tpl b/charts/tke-gateway/templates/_helpers.tpl → ...nstall/tke-gateway/templates/_helpers.tpl
diff --git a/...ts/tke-gateway/templates/tke-gateway.yaml → ...ll/tke-gateway/templates/tke-gateway.yaml b/...ts/tke-gateway/templates/tke-gateway.yaml → ...ll/tke-gateway/templates/tke-gateway.yaml
diff --git a/charts/tke-gateway/values.yaml → ...ghtweight-install/tke-gateway/values.yaml b/charts/tke-gateway/values.yaml → ...ghtweight-install/tke-gateway/values.yaml
diff --git a/charts/tke-platform/.helmignore → ...htweight-install/tke-platform/.helmignore b/charts/tke-platform/.helmignore → ...htweight-install/tke-platform/.helmignore
diff --git a/charts/tke-platform/Chart.yaml → ...ghtweight-install/tke-platform/Chart.yaml b/charts/tke-platform/Chart.yaml → ...ghtweight-install/tke-platform/Chart.yaml
diff --git a/charts/tke-platform/templates/_helpers.tpl → ...stall/tke-platform/templates/_helpers.tpl b/charts/tke-platform/templates/_helpers.tpl → ...stall/tke-platform/templates/_helpers.tpl
diff --git a/...tes/csi-operator-manifests-configMap.yaml → ...tes/csi-operator-manifests-configMap.yaml b/...tes/csi-operator-manifests-configMap.yaml → ...tes/csi-operator-manifests-configMap.yaml
diff --git a/...-platform/templates/docker-configMap.yaml → ...-platform/templates/docker-configMap.yaml b/...-platform/templates/docker-configMap.yaml → ...-platform/templates/docker-configMap.yaml
diff --git a/...rm/templates/gpu-manifests-configMap.yaml → ...rm/templates/gpu-manifests-configMap.yaml b/...rm/templates/gpu-manifests-configMap.yaml → ...rm/templates/gpu-manifests-configMap.yaml
diff --git a/...lates/keepalived-manifests-configMap.yaml → ...lates/keepalived-manifests-configMap.yaml b/...lates/keepalived-manifests-configMap.yaml → ...lates/keepalived-manifests-configMap.yaml
diff --git a/...platform/templates/kubeadm-configMap.yaml → ...platform/templates/kubeadm-configMap.yaml b/...platform/templates/kubeadm-configMap.yaml → ...platform/templates/kubeadm-configMap.yaml
diff --git a/...platform/templates/kubelet-configMap.yaml → ...platform/templates/kubelet-configMap.yaml b/...platform/templates/kubelet-configMap.yaml → ...platform/templates/kubelet-configMap.yaml
diff --git a/...s/metrics-server-manifests-configMap.yaml → ...s/metrics-server-manifests-configMap.yaml b/...s/metrics-server-manifests-configMap.yaml → ...s/metrics-server-manifests-configMap.yaml
diff --git a/.../templates/provider-config-configMap.yaml → .../templates/provider-config-configMap.yaml b/.../templates/provider-config-configMap.yaml → .../templates/provider-config-configMap.yaml
diff --git a/...-platform/templates/tke-platform-api.yaml → ...-platform/templates/tke-platform-api.yaml b/...-platform/templates/tke-platform-api.yaml → ...-platform/templates/tke-platform-api.yaml
diff --git a/...rm/templates/tke-platform-controller.yaml → ...rm/templates/tke-platform-controller.yaml b/...rm/templates/tke-platform-controller.yaml → ...rm/templates/tke-platform-controller.yaml
diff --git a/charts/tke-platform/values.yaml → ...htweight-install/tke-platform/values.yaml b/charts/tke-platform/values.yaml → ...htweight-install/tke-platform/values.yaml