feat: Upgrade to Higress 1.3.0 (#44)

- Remove -p/--console-password parameters since Higress Console now provides an admin initialization workflow.

Author: CH3CHO

README.md

@@ -69,10 +69,6 @@ docker compose
 
     用于加密敏感配置数据的密钥。长度必须为 32 个字符。若未设置，Higress 将自动生成一个随机的密钥。若需集群部署，此项必须设置。
 
-  * -p, --console-password=CONSOLE-PASSWORD
-
-    后续用户访问 Higress Console 的密码（用户名固定为 `admin`）。若未设置，Higress 将自动生成一个随机的密码。
-
   * --nacos-port=NACOS-PORT
 
     内置 NACOS 服务在服务器本地监听的端口。默认值为 8848。

bin/configure.sh

@@ -124,17 +124,6 @@ parseArgs() {
       MODE="params"
       shift
       ;;
-    -p)
-      HIGRESS_CONSOLE_PASSWORD="$2"
-      MODE="params"
-      shift
-      shift
-      ;;
-    --console-password=*)
-      HIGRESS_CONSOLE_PASSWORD="${1#*=}"
-      MODE="params"
-      shift
-      ;;
     --s)
       CONFIG_STORAGE="$2"
       MODE="params"
@@ -234,7 +223,6 @@ resetEnv() {
   NACOS_USERNAME=""
   NACOS_PASSWORD=""
   NACOS_DATA_ENC_KEY=""
-  HIGRESS_CONSOLE_PASSWORD=""
 
   NACOS_HTTP_PORT=$DEFAULT_NACOS_HTTP_PORT
   NACOS_GRPC_PORT=$(($DEFAULT_NACOS_HTTP_PORT + 1000))
@@ -358,9 +346,7 @@ configurePortsByArgs() {
 }
 
 configureConsoleByArgs() {
-  if [ -z "$HIGRESS_CONSOLE_PASSWORD" ]; then
-    HIGRESS_CONSOLE_PASSWORD=$(cat /dev/urandom | head -n 10 | md5sum | head -c32)
-  fi
+  :
 }
 
 configureStorage() {
@@ -485,10 +471,8 @@ configureFileStorage() {
 }
 
 configureConsole() {
-  echo "==== Configure Higress Console ===="
-  echo "Username: admin"
-  readNonEmptySecret "Please set password: "
-  HIGRESS_CONSOLE_PASSWORD=$input
+  # echo "==== Configure Higress Console ===="
+  :
 }
 
 configurePorts() {
@@ -586,10 +570,6 @@ outputWelcomeMessage() {
   echo "  View Logs: $ROOT/bin/logs.sh"
   echo "  Re-configure: $ROOT/bin/configure.sh -r"
   echo ""
-  echo "Note:"
-  echo " Higress Console Username: admin"
-  echo " Higress Console Password: ${HIGRESS_CONSOLE_PASSWORD}"
-  echo ""
   echo "Happy Higressing!"
 }
 
@@ -617,7 +597,6 @@ HIGRESS_CONTROLLER_TAG='${HIGRESS_CONTROLLER_TAG}'
 HIGRESS_PILOT_TAG='${HIGRESS_PILOT_TAG}'
 HIGRESS_GATEWAY_TAG='${HIGRESS_GATEWAY_TAG}'
 HIGRESS_CONSOLE_TAG='${HIGRESS_CONSOLE_TAG}'
-HIGRESS_CONSOLE_PASSWORD='${HIGRESS_CONSOLE_PASSWORD}'
 NACOS_HTTP_PORT='${NACOS_HTTP_PORT}'
 NACOS_GRPC_PORT='${NACOS_GRPC_PORT}'
 GATEWAY_HTTP_PORT='${GATEWAY_HTTP_PORT}'

compose/.env

@@ -9,11 +9,10 @@ NACOS_DATA_ENC_KEY='0123456789abcdef0123456789abcdef'
 NACOS_SERVER_TAG='v2.2.3'
 HIGRESS_RUNNER_TAG='0.0.3'
 HIGRESS_API_SERVER_TAG='0.0.10'
-HIGRESS_CONTROLLER_TAG='1.2.0'
-HIGRESS_PILOT_TAG='1.2.0'
-HIGRESS_GATEWAY_TAG='1.2.0'
-HIGRESS_CONSOLE_TAG='1.2.0'
-HIGRESS_CONSOLE_PASSWORD='admin'
+HIGRESS_CONTROLLER_TAG='1.3.0'
+HIGRESS_PILOT_TAG='1.3.0'
+HIGRESS_GATEWAY_TAG='1.3.0'
+HIGRESS_CONSOLE_TAG='1.3.0'
 NACOS_HTTP_PORT='8848'
 NACOS_GRPC_PORT='9848'
 GATEWAY_HTTP_PORT='80'

compose/docker-compose.yml

@@ -36,7 +36,6 @@ services:
       - NACOS_USERNAME
       - NACOS_PASSWORD
       - NACOS_DATA_ENC_KEY
-      - HIGRESS_CONSOLE_PASSWORD
     networks:
       - higress-net
     volumes:

compose/scripts/init.sh

@@ -439,12 +439,6 @@ EOF
 initializeConsole() {
   echo "Initializing console configurations..."
 
-  LOGIN_PROMPT=""
-  if [ -z "$HIGRESS_CONSOLE_PASSWORD" ]; then
-    HIGRESS_CONSOLE_PASSWORD="admin"
-    LOGIN_PROMPT="Username: admin  Default Password: admin"
-  fi
-
   read -r -d '' content << EOF
 apiVersion: v1 
 kind: ConfigMap
@@ -454,16 +448,12 @@ metadata:
   namespace: higress-system
 data:
   mode: standalone
-  login.prompt: "$LOGIN_PROMPT"
 EOF
   publishConfig "higress-system" "configmaps" "higress-console" "$content"
 
   read -r -d '' content << EOF
 apiVersion: v1
 data:
-  adminDisplayName: QWRtaW4=
-  adminPassword: $(echo -n "$HIGRESS_CONSOLE_PASSWORD" | base64 -w 0)
-  adminUsername: YWRtaW4=
   iv: $(cat /dev/urandom | tr -dc '[:graph:]' | fold -w 16 | head -n 1 | tr -d '\n' | base64 -w 0)
   key: $(cat /dev/urandom | tr -dc '[:graph:]' | fold -w 32 | head -n 1 | tr -d '\n' | base64 -w 0)
 kind: Secret

src/get-higress.sh

@@ -97,9 +97,6 @@ outputUsage() {
  -k, --data-enc-key=KEY     the key used to encrypt sensitive configurations
                             MUST contain 32 characters
                             A random key will be generated if unspecified
- -p, --console-password=CONSOLE-PASSWORD
-                            the password to be used to visit Higress Console
-                            default to "admin" if unspecified
      --nacos-port=NACOS-PORT
                             the HTTP port used to access the built-in Nacos
                             default to 8848 if unspecified

test/configure/cases/args-builtin-full.inc

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-CONFIGURE_ARGS="--use-builtin-nacos --data-enc-key=2b9841c866544379bb88ebee3021e341 --nacos-ns=higress-test --console-password=helloworld --nacos-port=30001 --gateway-http-port=30002 --gateway-https-port=30003 --gateway-metrics-port=30004 --console-port=30005"
+CONFIGURE_ARGS="--use-builtin-nacos --data-enc-key=2b9841c866544379bb88ebee3021e341 --nacos-ns=higress-test --nacos-port=30001 --gateway-http-port=30002 --gateway-https-port=30003 --gateway-metrics-port=30004 --console-port=30005"
 
 CONFIGURE_INPUT=""
 
@@ -24,7 +24,6 @@ declare -A EXPECTED_ENVS=(
   ["NACOS_NS"]='higress-test'
   ["NACOS_USERNAME"]=''
   ["NACOS_PASSWORD"]=''
-  ["HIGRESS_CONSOLE_PASSWORD"]='helloworld'
   ["NACOS_DATA_ENC_KEY"]='2b9841c866544379bb88ebee3021e341'
   ["NACOS_HTTP_PORT"]='30001'
   ["NACOS_GRPC_PORT"]='31001'

test/configure/cases/args-builtin-with-console-password-short.inc

@@ -24,7 +24,6 @@ declare -A EXPECTED_ENVS=(
   ["NACOS_NS"]='higress-system'
   ["NACOS_USERNAME"]=''
   ["NACOS_PASSWORD"]=''
-  ["HIGRESS_CONSOLE_PASSWORD"]='helloworld'
   ["NACOS_HTTP_PORT"]='8848'
   ["NACOS_GRPC_PORT"]='9848'
   ["GATEWAY_HTTP_PORT"]='80'

test/configure/cases/args-builtin-with-console-password.inc

@@ -24,7 +24,6 @@ declare -A EXPECTED_ENVS=(
   ["NACOS_NS"]='higress-system'
   ["NACOS_USERNAME"]=''
   ["NACOS_PASSWORD"]=''
-  ["HIGRESS_CONSOLE_PASSWORD"]='helloworld'
   ["NACOS_HTTP_PORT"]='8848'
   ["NACOS_GRPC_PORT"]='9848'
   ["GATEWAY_HTTP_PORT"]='80'

test/configure/cases/args-external-full.inc

@@ -27,7 +27,6 @@ declare -A EXPECTED_ENVS=(
   ["NACOS_NS"]='higress-test'
   ["NACOS_USERNAME"]='nacos'
   ["NACOS_PASSWORD"]='nacos'
-  ["HIGRESS_CONSOLE_PASSWORD"]='helloworld'
   ["NACOS_DATA_ENC_KEY"]='2b9841c866544379bb88ebee3021e341'
   ["NACOS_HTTP_PORT"]='8848'
   ["NACOS_GRPC_PORT"]='9848'