Skip to content

Commit 89d2c06

Browse files
committed
feat
1 parent 335978a commit 89d2c06

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

charts/juck-site/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.0.1
18+
version: 0.0.2
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to

k3s/setup-master.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ chmod +x ./k3s
44
sudo mkdir -p /var/lib/rancher/k3s/agent/images/
55
# gzip -dk file.gz
66
sudo mkdir -p /etc/rancher/k3s/
7-
sudo \cp -f registries.yaml /etc/rancher/k3s/registries.yaml
7+
# sudo \cp -f registries.yaml /etc/rancher/k3s/registries.yaml
88
sudo \cp -f ./k3s-airgap-images-amd64.tar /var/lib/rancher/k3s/agent/images/
99
sudo \cp -f k3s /usr/local/bin/k3s
1010

1111
# <Tailscale网卡对应的IP>
1212
TAILSCALE_IP=${MASTER_TAILSCALE_IP}
1313
# <API Server额外的监听地址>
1414
EXPOSE_IP=${MASTER_EXPOSE_IP}
15-
# 这里指定了POD CIDR和 Service CIDR,可以不配置,仅需要保证和内网网段不冲突且互相不冲突即可
16-
INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_EXEC="server --disable servicelb,traefik,local-storage --datastore-endpoint=mysql://${MYSQL_USER}:${MYSQL_PASS}@tcp(${MYSQL_HOST}:3306)/k3s_tx --node-ip $TAILSCALE_IP --advertise-address $TAILSCALE_IP --node-external-ip $TAILSCALE_IP --tls-san $EXPOSE_IP --flannel-iface tailscale0 --cluster-cidr 10.42.0.0/16 --service-cidr 10.43.0.0/16 --kubelet-arg kube-reserved=cpu=100m,memory=100Mi system-reserved=cpu=200m,memory=200Mi --kube-proxy-arg proxy-mode=ipvs masquerade-all=true metrics-bind-address=0.0.0.0" ./install.sh
15+
# 这里指定了POD CIDR和 Service CIDR,可以不配置,仅需要保证和内网网段不冲突且互相不冲突即可 --cluster-cidr 10.42.0.0/16 --service-cidr 10.43.0.0/16
16+
# K3S_TOKEN=${MY_K3S_TOKEN}
17+
INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_EXEC="server --disable servicelb,traefik,local-storage --datastore-endpoint=mysql://${MYSQL_USER}:${MYSQL_PASS}@tcp(${MYSQL_HOST}:3306)/k3s_tx --node-ip $TAILSCALE_IP --advertise-address $TAILSCALE_IP --node-external-ip $TAILSCALE_IP --tls-san $EXPOSE_IP --flannel-iface tailscale0 --kubelet-arg kube-reserved=cpu=100m,memory=100Mi system-reserved=cpu=200m,memory=200Mi --kube-proxy-arg proxy-mode=ipvs masquerade-all=true metrics-bind-address=0.0.0.0" ./install.sh
1718
echo "export KUBECONFIG=/etc/rancher/k3s/k3s.yaml" >> /etc/profile
1819
source /etc/profile

0 commit comments

Comments
 (0)