Skip to content

Commit aa420f3

Browse files
authored
feat: add offline k8s observability compoment (#181)
1 parent 9e917eb commit aa420f3

File tree

7 files changed

+87
-20
lines changed

7 files changed

+87
-20
lines changed

.github/all-in-one/k8s/build.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,32 @@ cat image-list.sh
2222

2323
. ./image-list.sh
2424

25+
# pull univer service images
2526
for image in "${images[@]}"; do
2627
docker pull $image
2728
done
2829

30+
# pull observability images
31+
for image in "${observability_images[@]}"; do
32+
docker pull $image
33+
done
34+
2935
docker save "${images[@]}" | gzip > univer-image.tar.gz
3036

37+
docker save "${observability_images[@]}" | gzip > observability-image.tar.gz
38+
3139
helm pull oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts/univer-stack --destination .
3240

41+
helm pull oci://univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/helm-charts/univer-observability --destination .
42+
3343
chart=$(ls univer-stack-*.tgz | head -n 1)
3444
version=$(echo "$chart" | sed -n 's/univer-stack-\(.*\).tgz/\1/p')
3545

36-
tar -cvf k8s-all-in-one.${version}.tar univer-image.tar.gz $chart image-list.sh install.sh load-image.sh uninstall.sh
46+
tar -cvf k8s-all-in-one.${version}.tar \
47+
univer-image.tar.gz \
48+
$chart \
49+
univer-observability-*.tgz \
50+
image-list.sh load-image.sh
3751

3852
echo "ALLINONE_PATH=$(echo $PWD/k8s-all-in-one.${version}.tar)" >> $GITHUB_ENV
3953
echo "ALLINONE_TAR=$(echo k8s-all-in-one.${version}.tar)" >> $GITHUB_ENV

.github/all-in-one/k8s/image-list.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,16 @@ images=(
1919
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/install-cni:1.20.1"
2020
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/pilot:1.20.1"
2121
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/proxyv2:1.20.1"
22+
)
23+
24+
observability_images=(
25+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/prometheus:2.49.1-debian-11-r0"
26+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/node-exporter:1.7.0"
27+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/kube-state-metrics:2.10.1-debian-11-r6"
28+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/kubernetes-event-exporter:1.6.1-debian-11-r6"
29+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/loki:2.9.10"
30+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/promtail:2.9.0"
31+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/grafana:10.2.2-dev"
32+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/busybox:1.31.1"
33+
"univer-acr-registry.cn-shenzhen.cr.aliyuncs.com/release/grafana-sidecar:1.19.2"
2234
)

.github/all-in-one/k8s/install.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/all-in-one/k8s/load-image.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,20 @@ for image in "${images[@]}"; do
4444
docker push $REGISTRY/$IMAGE_NAMESPACE/$(basename $image)
4545
done
4646

47+
docker load -i observability-image.tar.gz
48+
49+
for image in "${observability_images[@]}"; do
50+
docker tag $image $REGISTRY/$IMAGE_NAMESPACE/$(basename $image)
51+
docker push $REGISTRY/$IMAGE_NAMESPACE/$(basename $image)
52+
done
53+
4754
SED="sed -i"
4855
if [ "$(uname)" == "Darwin" ]; then
4956
SED="sed -i \"\""
5057
fi
5158

5259
$SED -e 's#${REGISTRY}#'${REGISTRY}'#' values.yaml
53-
$SED -e 's#${IMAGE_NAMESPACE}#'${IMAGE_NAMESPACE}'#' values.yaml
60+
$SED -e 's#${IMAGE_NAMESPACE}#'${IMAGE_NAMESPACE}'#' values.yaml
61+
62+
$SED -e 's#${REGISTRY}#'${REGISTRY}'#' values-observability.yaml
63+
$SED -e 's#${IMAGE_NAMESPACE}#'${IMAGE_NAMESPACE}'#' values-observability.yaml

.github/all-in-one/k8s/uninstall.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
prometheus:
2+
server:
3+
image:
4+
registry: ${REGISTRY}
5+
repository: ${IMAGE_NAMESPACE}/prometheus
6+
7+
8+
node-exporter:
9+
image:
10+
registry: ${REGISTRY}
11+
repository: ${IMAGE_NAMESPACE}/node-exporter
12+
13+
14+
kube-state-metrics:
15+
image:
16+
registry: ${REGISTRY}
17+
repository: ${IMAGE_NAMESPACE}/kube-state-metrics
18+
19+
20+
kubernetes-event-exporter:
21+
image:
22+
registry: ${REGISTRY}
23+
repository: ${IMAGE_NAMESPACE}/kubernetes-event-exporter
24+
25+
26+
loki:
27+
image:
28+
repository: ${REGISTRY}/${IMAGE_NAMESPACE}/loki
29+
30+
31+
promtail:
32+
image:
33+
registry: ${REGISTRY}
34+
repository: ${IMAGE_NAMESPACE}/promtail
35+
configmap:
36+
enabled: true
37+
38+
39+
grafana:
40+
image:
41+
repository: ${REGISTRY}/${IMAGE_NAMESPACE}/grafana
42+
initChownData:
43+
image:
44+
repository: ${REGISTRY}/${IMAGE_NAMESPACE}/busybox
45+
tag: "1.31.1"
46+
sidecar:
47+
image:
48+
repository: ${REGISTRY}/${IMAGE_NAMESPACE}/grafana-sidecar

.github/workflows/update.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
mv tmp/charts/univer-stack charts/
3333
mv tmp/charts/universer charts/
3434
mv tmp/charts/worker charts/
35+
mv tmp/charts/univer-observability charts/
3536
rm -rf tmp
3637
COMMIT_MESSAGE: 'chore: update repository'
3738
COMMIT_NAME: 'GitHub Actions'

0 commit comments

Comments
 (0)