From 95e1d48003517a55abc7c4e65237482d3c54687f Mon Sep 17 00:00:00 2001 From: abearxiong Date: Thu, 27 Nov 2025 01:35:58 +0800 Subject: [PATCH] update --- k8s/xiongxiao.me/apps/chat.yaml | 45 +++++++++++++++++++ k8s/xiongxiao.me/config/registry.md | 2 + k8s/xiongxiao.me/docs/06-traefik-ssl.md | 18 ++++++++ k8s/xiongxiao.me/docs/09-ipv6-dualstack.md | 13 +++++- .../ingress/apps-ingressroute.yaml | 18 -------- .../services/external-services.yaml | 26 ----------- 6 files changed, 77 insertions(+), 45 deletions(-) create mode 100644 k8s/xiongxiao.me/apps/chat.yaml diff --git a/k8s/xiongxiao.me/apps/chat.yaml b/k8s/xiongxiao.me/apps/chat.yaml new file mode 100644 index 0000000..ad37898 --- /dev/null +++ b/k8s/xiongxiao.me/apps/chat.yaml @@ -0,0 +1,45 @@ +--- +# Chat - chat.xiongxiao.me (支持 WebSocket) +apiVersion: traefik.io/v1alpha1 +kind: IngressRoute +metadata: + name: chat-https + namespace: default +spec: + entryPoints: + - websecure + routes: + - match: Host(`chat.xiongxiao.me`) + kind: Rule + services: + - name: chat-external + port: 3000 + tls: + certResolver: letsencrypt + +--- +# Chat 服务 (端口 3000, 本地) +apiVersion: v1 +kind: Service +metadata: + name: chat-external + namespace: default +spec: + type: ClusterIP + ports: + - port: 3000 + targetPort: 3000 + protocol: TCP + name: http +--- +apiVersion: v1 +kind: Endpoints +metadata: + name: chat-external + namespace: default +subsets: +- addresses: + - ip: 121.4.112.18 + ports: + - port: 3000 + name: http diff --git a/k8s/xiongxiao.me/config/registry.md b/k8s/xiongxiao.me/config/registry.md index 3a8a9a5..3b5767d 100644 --- a/k8s/xiongxiao.me/config/registry.md +++ b/k8s/xiongxiao.me/config/registry.md @@ -88,6 +88,7 @@ sudo ctr -n k8s.io images tag docker.m.daocloud.io/rancher/mirrored-pause:3.6 do sudo ctr -n k8s.io images delete docker.m.daocloud.io/rancher/mirrored-pause:3.6 + # 查看镜像 sudo ctr -n k8s.io images ls | grep pause ``` @@ -109,3 +110,4 @@ sudo ctr -n k8s.io images tag k8s.m.daocloud.io/cluster-api/cluster-api-controll sudo ctr -n k8s.io images delete k8s.m.daocloud.io/cluster-api/cluster-api-controller:v1.10.6 ``` + diff --git a/k8s/xiongxiao.me/docs/06-traefik-ssl.md b/k8s/xiongxiao.me/docs/06-traefik-ssl.md index 69bb407..a25b19f 100644 --- a/k8s/xiongxiao.me/docs/06-traefik-ssl.md +++ b/k8s/xiongxiao.me/docs/06-traefik-ssl.md @@ -174,3 +174,21 @@ tls: - [Traefik 官方文档 - Let's Encrypt](https://doc.traefik.io/traefik/https/acme/) - [Let's Encrypt 速率限制](https://letsencrypt.org/docs/rate-limits/) - [ACME HTTP Challenge](https://letsencrypt.org/docs/challenge-types/#http-01-challenge) + + + +## 禁用默认的traefik + +```bash +vim /etc/rancher/k3s/config.yaml +# 添加以下内容禁用默认traefik +disable: traefik +# 重启k3s服务 +systemctl restart k3s + +# 删除默认traefik相关资源 +kubectl delete job -n kube-system helm-install-traefik helm-install-traefik-crd + +# 安装 Traefik CRD +kubectl apply -f https://raw.githubusercontent.com/traefik/traefik/v3.0/docs/content/reference/dynamic-configuration/kubernetes-crd-definition-v1.yml +``` \ No newline at end of file diff --git a/k8s/xiongxiao.me/docs/09-ipv6-dualstack.md b/k8s/xiongxiao.me/docs/09-ipv6-dualstack.md index 17d5d0b..f11c018 100644 --- a/k8s/xiongxiao.me/docs/09-ipv6-dualstack.md +++ b/k8s/xiongxiao.me/docs/09-ipv6-dualstack.md @@ -29,4 +29,15 @@ tls-san: - "121.4.112.18" # 你的公网 IP ``` -systemctl restart k3s \ No newline at end of file +systemctl restart k3s + + +```sh + +vim /etc/systemd/system/k3s.service + +sudo systemctl daemon-reload +sudo systemctl start k3s + +kubectl get nodes -o wide +``` \ No newline at end of file diff --git a/k8s/xiongxiao.me/ingress/apps-ingressroute.yaml b/k8s/xiongxiao.me/ingress/apps-ingressroute.yaml index 36789cf..06d3959 100644 --- a/k8s/xiongxiao.me/ingress/apps-ingressroute.yaml +++ b/k8s/xiongxiao.me/ingress/apps-ingressroute.yaml @@ -23,24 +23,6 @@ spec: tls: certResolver: letsencrypt --- -# Chat - chat.xiongxiao.me (支持 WebSocket) -apiVersion: traefik.io/v1alpha1 -kind: IngressRoute -metadata: - name: chat-https - namespace: default -spec: - entryPoints: - - websecure - routes: - - match: Host(`chat.xiongxiao.me`) - kind: Rule - services: - - name: chat-external - port: 3000 - tls: - certResolver: letsencrypt ---- # Kevisual - kevisual.xiongxiao.me (支持 WebSocket) apiVersion: traefik.io/v1alpha1 kind: IngressRoute diff --git a/k8s/xiongxiao.me/services/external-services.yaml b/k8s/xiongxiao.me/services/external-services.yaml index 9b8d630..f0a3de1 100644 --- a/k8s/xiongxiao.me/services/external-services.yaml +++ b/k8s/xiongxiao.me/services/external-services.yaml @@ -31,32 +31,6 @@ subsets: - port: 3111 name: http --- -# Chat 服务 (端口 3000, 本地) -apiVersion: v1 -kind: Service -metadata: - name: chat-external - namespace: default -spec: - type: ClusterIP - ports: - - port: 3000 - targetPort: 3000 - protocol: TCP - name: http ---- -apiVersion: v1 -kind: Endpoints -metadata: - name: chat-external - namespace: default -subsets: -- addresses: - - ip: 121.4.112.18 - ports: - - port: 3000 - name: http ---- # Kevisual 服务 (端口 3005, 本地) apiVersion: v1 kind: Service