.gitea/workflows/docker.yaml

@@ -14,9 +14,9 @@ jobs:
       - name: Log in to Docker Hub
         uses: https://git.martin98.com/actions/login-action.git@v3
         with:
-          registry: ${{ vars.GIT_IMAGE_URL }}
-          username: ${{ vars.GIT_IMAGE_USERNAME }}
-          password: ${{ vars.GIT_IMAGE_PASSWORD }}
+          registry: ${{ vars.DOCKER_HUB }}
+          username: ${{ vars.DOCKER_USERNAME }}
+          password: ${{ vars.DOCKER_PASSWORD }}
 
       - name: Build and push
         uses: https://git.martin98.com/actions/build-push-action.git@v4
@@ -25,5 +25,5 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: |
-            git.martin98.com/martinfarm/init:latest
-            git.martin98.com/martinfarm/init:${{ github.sha }}
+            docker.martin98.com/martin_farm/init:latest
+            docker.martin98.com/martin_farm/init:${{ github.sha }}

README_k8s.md

@@ -1,9 +1,3 @@
-## k3s
-> https://docs.k3s.io/zh/quick-start
-```bash
-curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -
-```
-
 ## k8s 快速部署
 ```bash
 # 网段配置

init-apt.sh

@@ -45,6 +45,8 @@ else
 fi
 
 # fix vim 粘贴
-if ! grep -q "set pastetoggle=" ~/.vimrc; then
+if pidof vim >/dev/null 2>&1; then
+  if ! grep -q "set pastetoggle=" ~/.vimrc; then
       echo "set pastetoggle=" >> ~/.vimrc
+  fi
 fi

init-docker.sh

@@ -27,19 +27,18 @@ else
   echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $release stable" > /etc/apt/sources.list.d/docker.list
 
   curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/docker-install.sh | sh
-fi
-
-cat > /etc/docker/daemon.json <<EOF
+  cat > /etc/docker/daemon.json <<EOF
 {
     "registry-mirrors": [
         "https://docker.martin98.com",
-        "https://docker.mirrors.martin98.com",
         "https://registry-docker.martin98.com",
+		    "https://registry-dockerhub.hk.martin98.com"
     ]
 }
 EOF
-if pidof systemd >/dev/null 2>&1; then
+  if pidof systemd >/dev/null 2>&1; then
       systemctl restart docker
-else
+  else
       echo "systemctl 不存在，跳过 docker 重启。"
+  fi
 fi

init-git.sh

@@ -5,7 +5,7 @@ if command -v git > /dev/null 2>&1; then
     echo "git 已安装，正在配置镜像源..."
     # 曾经设置过的强制取消
     git config --global --unset url."https://git-proxy.hk.martin98.com/".insteadOf
-    git config --global url."https://git.mirrors.martin98.com/https://github.com/".insteadOf "https://github.com/"
+    git config --global url."https://git-proxy.hk.martin98.com/https://github.com/".insteadOf "https://github.com/"
     echo "镜像源配置完成。"
 else
     echo "git 不存在，跳过..."

init-k3s.sh

@@ -1,107 +0,0 @@
-#!/bin/bash
-
-curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/init-apt.sh | bash
-
-current_ip=$(hostname -I | awk '{print $1}')
-
-# 镜像加速
-mkdir /etc/rancher/k3s -p
-
-cat <<EOF > /etc/rancher/k3s/registries.yaml
-mirrors:
-  docker.io:
-    endpoint:
-      - https://docker.martin98.com
-  registry-1.docker.io:
-    endpoint:
-      - https://docker.martin98.com
-  registry.k8s.io:
-    endpoint:
-      - https://docker.martin98.com
-  k8s.gcr.io:
-    endpoint:
-      - https://docker.martin98.com
-  gcr.io:
-    endpoint:
-      - https://docker.martin98.com
-  ghcr.io:
-    endpoint:
-      - https://docker.martin98.com
-  quay.io:
-    endpoint:
-      - https://docker.martin98.com
-EOF
-
-# systemctl restart k3s
-
-# 安装 keepalived
-apt install -y keepalived
-
-# 检查是否为 Master-01
-if [ "$current_ip" == "$master" ]; then
-    state=MASTER
-    priority=100
-else
-    state=BACKUP
-    priority=100
-fi
-
-# 初始化 VIP
-mkdir /etc/keepalived
-cat <<EOF | sudo tee /etc/keepalived/keepalived.conf
-vrrp_instance VI_1 {
-    state $state
-    interface eth0
-    virtual_router_id 51
-    priority $priority
-    advert_int 1
-    virtual_ipaddress {
-        $vip
-    }
-}
-EOF
-
-sudo systemctl restart keepalived
-systemctl status keepalived &
-
-
-
-# 检查是否为 Master-01
-if [ "$current_ip" == "$master" ]; then
-    # 开始部署
-    curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -s - server \
-        --cluster-init \
-        --cluster-cidr $pod_subnet \
-        --service-cidr $service_subnet \
-        --node-external-ip=$vip_ip \
-
-
-    TOKEN=$(cat /var/lib/rancher/k3s/server/node-token)
-    cat <<EOF
-------------------------------------------------------------------------------------
-初始化 master VIP[$state] $current_ip 成功
-
-export pod_subnet=$pod_subnet
-export service_subnet=$service_subnet
-export vip_ip=$vip_ip
-export vip=$vip_ip/16
-export master=$master
-export TOKEN=$TOKEN
-curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/init-k3s.sh | bash
-
-------------------------------------------------------------------------------------
-EOF
-
-else
-    curl -sfL https://rancher-mirror.rancher.cn/k3s/k3s-install.sh | INSTALL_K3S_MIRROR=cn sh -s - server \
-      --cluster-cidr $pod_subnet \
-      --service-cidr $service_subnet \
-      --node-external-ip=$vip_ip \
-      --token $TOKEN \
-      --server https://$master:6443
-    watch kubectl get nodes
-fi
-
-
-
-