feat

JuckZ · Dec 1, 2022 · 89d2c06 · 89d2c06
1 parent 335978a
commit 89d2c06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/charts/juck-site/Chart.yaml b/charts/juck-site/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.1
+version: 0.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/k3s/setup-master.sh b/k3s/setup-master.sh
@@ -4,15 +4,16 @@ chmod +x ./k3s
 sudo mkdir -p /var/lib/rancher/k3s/agent/images/
 # gzip -dk file.gz
 sudo mkdir -p /etc/rancher/k3s/
-sudo \cp -f registries.yaml /etc/rancher/k3s/registries.yaml
+# sudo \cp -f registries.yaml /etc/rancher/k3s/registries.yaml
 sudo \cp -f ./k3s-airgap-images-amd64.tar /var/lib/rancher/k3s/agent/images/
 sudo \cp -f k3s /usr/local/bin/k3s
 
 # <Tailscale网卡对应的IP>
 TAILSCALE_IP=${MASTER_TAILSCALE_IP}
 # <API Server额外的监听地址>
 EXPOSE_IP=${MASTER_EXPOSE_IP}
-# 这里指定了POD CIDR和 Service CIDR，可以不配置，仅需要保证和内网网段不冲突且互相不冲突即可
-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
+# 这里指定了POD CIDR和 Service CIDR，可以不配置，仅需要保证和内网网段不冲突且互相不冲突即可 --cluster-cidr 10.42.0.0/16 --service-cidr 10.43.0.0/16
+# K3S_TOKEN=${MY_K3S_TOKEN}
+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
 echo "export KUBECONFIG=/etc/rancher/k3s/k3s.yaml" >> /etc/profile
 source /etc/profile