Skip to content

Commit aa57667

Browse files
committed
feat: Improve all-in-one docker configurations
1. Support adding a default ingress for console. 2. Enable the process health check during start-up in supervisord. 3. Unify the resourceVersion and creationTimestamp values used by all default configs.
1 parent b5b16d0 commit aa57667

File tree

11 files changed

+45
-10
lines changed

11 files changed

+45
-10
lines changed

Diff for: all-in-one/config/configmaps/higress-console.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ metadata:
88
higress.io/resource-definer: higress
99
name: higress-console
1010
namespace: higress-system
11-
resourceVersion: "2"
11+
creationTimestamp: "2000-01-01T00:00:00Z"
12+
resourceVersion: "1"

Diff for: all-in-one/config/gatewayclasses/higress-gateway.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1
22
kind: GatewayClass
33
metadata:
44
name: higress-gateway
5+
creationTimestamp: "2000-01-01T00:00:00Z"
56
resourceVersion: "1"
67
spec:
78
controllerName: higress.io/gateway-controller

Diff for: all-in-one/config/gateways/higress-gateway.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: Gateway
33
metadata:
44
name: higress-gateway
55
namespace: higress-system
6+
creationTimestamp: "2000-01-01T00:00:00Z"
67
resourceVersion: "1"
78
spec:
89
gatewayClassName: higress-gateway

Diff for: all-in-one/config/ingresses/higress-console.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apiVersion: networking.k8s.io/v1
2+
kind: Ingress
3+
metadata:
4+
name: higress-console
5+
namespace: higress-system
6+
creationTimestamp: "2000-01-01T00:00:00Z"
7+
resourceVersion: "1"
8+
annotations:
9+
higress.io/destination: higress-console.static
10+
higress.io/ignore-path-case: "false"
11+
spec:
12+
rules:
13+
- http:
14+
paths:
15+
- backend:
16+
resource:
17+
apiGroup: networking.higress.io
18+
kind: McpBridge
19+
name: default
20+
path: /
21+
pathType: Prefix

Diff for: all-in-one/config/mcpbridges/default.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ kind: McpBridge
33
metadata:
44
name: default
55
namespace: higress-system
6+
creationTimestamp: "2000-01-01T00:00:00Z"
67
resourceVersion: "1"
7-
spec: {}
8+
spec:
9+
registries:
10+
- domain: 127.0.0.1:8080
11+
name: higress-console
12+
port: 80
13+
type: static
814
status: {}

Diff for: all-in-one/config/secrets/higress-console.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
apiVersion: v1
2-
data:
3-
iv: YEped3MzSWxQcFdXakBBdw==
4-
key: MSNhdG99PiMpMCRJUl0ya3xWQHR5aGc+TUB0YnxDb3o=
2+
data: {}
53
kind: Secret
64
metadata:
75
name: higress-console
86
namespace: higress-system
7+
creationTimestamp: "2000-01-01T00:00:00Z"
98
resourceVersion: "1"
109
type: Opaque

Diff for: all-in-one/config/services/higress-gateway.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
higress: higress-system-higress-gateway
66
name: higress-gateway
77
namespace: higress-system
8+
creationTimestamp: "2000-01-01T00:00:00Z"
89
resourceVersion: "1"
910
spec:
1011
ports:

Diff for: all-in-one/scripts/start-apiserver.sh

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ source $ROOT/base.sh
77

88
set -e
99

10+
if [ "$ENABLE_CONSOLE_ROUTE" != "1" ]; then
11+
sudo rm /opt/data/defaultConfig/ingresses/higress-console.yaml
12+
fi
1013
cp -rn /opt/data/defaultConfig/* /data
1114

1215
apiserver --bind-address 127.0.0.1 --secure-port 8443 --storage file --file-root-dir /data --cert-dir /tmp

Diff for: all-in-one/scripts/start-console.sh

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ source $ROOT/base.sh
77

88
if [ "$MODE" != "console" -a "$MODE" != "full" ]; then
99
echo "Console won't run in mode $MODE."
10+
sleep 2
1011
exit 0
1112
fi
1213

Diff for: all-in-one/scripts/start-gateway.sh

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ source $ROOT/base.sh
77

88
if [ "$MODE" != "gateway" -a "$MODE" != "full" ]; then
99
echo "Gateway won't run in mode $MODE."
10+
sleep 2
1011
exit 0
1112
fi
1213

Diff for: all-in-one/supervisord/supervisord.conf

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ command=bash /usr/local/bin/start-apiserver.sh
1313
priority=0
1414
autostart=true
1515
autorestart=unexpected
16-
startsecs=0
16+
startsecs=1
1717
stdout_logfile=/var/log/higress/apiserver.log
1818
stdout_logfile_maxbytes=10MB
1919
redirect_stderr=true
@@ -24,7 +24,7 @@ command=bash /usr/local/bin/start-controller.sh
2424
priority=100
2525
autostart=true
2626
autorestart=unexpected
27-
startsecs=0
27+
startsecs=1
2828
stdout_logfile=/var/log/higress/controller.log
2929
stdout_logfile_maxbytes=10MB
3030
redirect_stderr=true
@@ -35,7 +35,7 @@ command=bash /usr/local/bin/start-pilot.sh
3535
priority=200
3636
autostart=true
3737
autorestart=unexpected
38-
startsecs=0
38+
startsecs=1
3939
stdout_logfile=/var/log/higress/pilot.log
4040
stdout_logfile_maxbytes=10MB
4141
redirect_stderr=true
@@ -46,7 +46,7 @@ command=bash /usr/local/bin/start-gateway.sh
4646
priority=300
4747
autostart=true
4848
autorestart=unexpected
49-
startsecs=0
49+
startsecs=1
5050
stdout_logfile=/var/log/higress/gateway.log
5151
stdout_logfile_maxbytes=10MB
5252
redirect_stderr=true
@@ -57,7 +57,7 @@ command=bash /usr/local/bin/start-console.sh
5757
priority=900
5858
autostart=true
5959
autorestart=unexpected
60-
startsecs=0
60+
startsecs=1
6161
stdout_logfile=/var/log/higress/console.log
6262
stdout_logfile_maxbytes=10MB
6363
redirect_stderr=true

0 commit comments

Comments
 (0)