remove adminPassword in profile

alibaba · Nov 2, 2023 · 66b18b4 · 66b18b4
1 parent cc082df
commit 66b18b4
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 10 deletions.
diff --git a/pkg/cmd/hgctl/helm/profile.go b/pkg/cmd/hgctl/helm/profile.go
@@ -83,17 +83,15 @@ func (p ProfileGlobal) Validate(install InstallMode) []error {
 }
 
 type ProfileConsole struct {
-	Port          uint32 `json:"port,omitempty"`
-	Replicas      uint32 `json:"replicas,omitempty"`
-	AdminPassword string `json:"adminPassword,omitempty"`
-	O11yEnabled   bool   `json:"o11YEnabled,omitempty"`
+	Port        uint32 `json:"port,omitempty"`
+	Replicas    uint32 `json:"replicas,omitempty"`
+	O11yEnabled bool   `json:"o11YEnabled,omitempty"`
 }
 
 func (p ProfileConsole) SetFlags(install InstallMode) ([]string, error) {
 	sets := make([]string, 0)
 	if install == InstallK8s || install == InstallLocalK8s {
 		sets = append(sets, fmt.Sprintf("higress-console.replicaCount=%d", p.Replicas))
-		sets = append(sets, fmt.Sprintf("higress-console.admin.password=%s", p.AdminPassword))
 		sets = append(sets, fmt.Sprintf("higress-console.o11y.enabled=%t", p.O11yEnabled))
 	}
 	return sets, nil

diff --git a/pkg/cmd/hgctl/installer/standalone_agent.go b/pkg/cmd/hgctl/installer/standalone_agent.go
@@ -77,7 +77,6 @@ func (a *Agent) profileArgs() []string {
 		fmt.Sprintf("--nacos-password=%s", a.profile.Storage.Password),
 		fmt.Sprintf("--nacos-username=%s", a.profile.Storage.Username),
 		fmt.Sprintf("--data-enc-key=%s", a.profile.Storage.DataEncKey),
-		fmt.Sprintf("--console-password=%s", a.profile.Console.AdminPassword),
 		fmt.Sprintf("--console-port=%d", a.profile.Console.Port),
 		fmt.Sprintf("--gateway-http-port=%d", a.profile.Gateway.HttpPort),
 		fmt.Sprintf("--gateway-https-port=%d", a.profile.Gateway.HttpsPort),

diff --git a/pkg/cmd/hgctl/manifests/profiles/_all.yaml b/pkg/cmd/hgctl/manifests/profiles/_all.yaml
@@ -9,7 +9,6 @@ global:
 console:
   port: 8080
   replicas: 1
-  adminPassword: admin
   o11yEnabled: false
 
 gateway:

diff --git a/pkg/cmd/hgctl/manifests/profiles/k8s.yaml b/pkg/cmd/hgctl/manifests/profiles/k8s.yaml
@@ -8,7 +8,6 @@ global:
 
 console:
   replicas: 1
-  adminPassword: admin
   o11yEnabled: false
 
 gateway:

diff --git a/pkg/cmd/hgctl/manifests/profiles/local-docker.yaml b/pkg/cmd/hgctl/manifests/profiles/local-docker.yaml
@@ -4,7 +4,6 @@ global:
 
 console:
   port: 8080
-  adminPassword: admin
 
 gateway:
   httpPort: 80

diff --git a/pkg/cmd/hgctl/manifests/profiles/local-k8s.yaml b/pkg/cmd/hgctl/manifests/profiles/local-k8s.yaml
@@ -8,7 +8,6 @@ global:
 
 console:
   replicas: 1
-  adminPassword: admin
   o11yEnabled: true
 
 gateway: