update manifests

2023-10-18 01:09:50 +07:00 · 2023-10-18 01:09:50 +07:00 · 2fe06a633a
commit 2fe06a633a
parent b9afec7bf2
6 changed files with 86 additions and 101 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -11,8 +11,10 @@ services:
    working_dir: /root/services
    ports:
    - 6443:6443
-    - 3001:3006
-    - 3002:3007
+    - 8080:80
+    - 8443:443
+    # - 3001:3006
+    # - 3002:3007
    networks:
      k3s:
        ipv4_address: 192.168.221.11
@ -26,9 +28,9 @@ services:
    stdin_open: true # docker run -i
    tty: true        # docker run -t
    working_dir: /root/services
-    ports:
-    - 3003:3006
-    - 3004:3007
+    # ports:
+    # - 3003:3006
+    # - 3004:3007
    networks:
      k3s:
        ipv4_address: 192.168.221.12
@ -42,9 +44,9 @@ services:
    stdin_open: true # docker run -i
    tty: true        # docker run -t
    working_dir: /root/services
-    ports:
-    - 3005:3006
-    - 3006:3007
+    # ports:
+    # - 3005:3006
+    # - 3006:3007
    networks:
      k3s:
        ipv4_address: 192.168.221.13
@ -58,9 +60,9 @@ services:
    stdin_open: true # docker run -i
    tty: true        # docker run -t
    working_dir: /root/services
-    ports:
-    - 3007:3006
-    - 3008:3007
+    # ports:
+    # - 3007:3006
+    # - 3008:3007
    networks:
      k3s:
        ipv4_address: 192.168.221.14
--- a/services1/docker-compose.yml
+++ b/services1/docker-compose.yml
@ -26,7 +26,8 @@ services:
  master1:
    image: "rancher/k3s:${K3S_VERSION:-latest}"
    container_name: master1
-    command: server --node-name=master1 --flannel-backend=wireguard-native --flannel-external-ip --disable-network-policy --disable traefik --disable local-storage --disable-helm-controller --disable metrics-server --disable coredns --node-external-ip="${K3S_MASTER}"  --cluster-init --advertise-address ${K3S_MASTER} --tls-san ${K3S_MASTER} --tls-san ${K3S_MASTER2} --node-label "node-type=master" --node-label "node-name=master1" --node-label "k8s=egate" 
+    command: server --node-name=master1 --flannel-backend=wireguard-native --flannel-external-ip --node-external-ip="${K3S_MASTER}" --cluster-init --advertise-address ${K3S_MASTER} --tls-san ${K3S_MASTER} --tls-san ${K3S_MASTER2} --node-label "node-type=master" --node-label "node-name=master1" --node-label "k8s=egate" 
+# --disable-network-policy --disable traefik --disable local-storage --disable-helm-controller --disable metrics-server --disable coredns 
 # --kube-proxy-arg iptables-sync-period=2s --kube-proxy-arg masquerade-all=true
    tmpfs:
    - /run
@ -79,23 +80,23 @@ services:
      vv:
        ipv4_address: 172.25.0.35

-  nginx:
-    image: "nginx"
-    container_name: nginx
-    restart: always
-    ports:
-    - 3001:3001
-    - 3002:3002
-    - 3003:3003
-    - 3004:3004
-    - 3005:3005
-    - 3006:3006
-    - 3007:3007
-    volumes:
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    networks:
-      vv:
-        ipv4_address: 172.25.0.20
+  # nginx:
+  #   image: "nginx"
+  #   container_name: nginx
+  #   restart: always
+  #   ports:
+  #   - 3001:3001
+  #   - 3002:3002
+  #   - 3003:3003
+  #   - 3004:3004
+  #   - 3005:3005
+  #   - 3006:3006
+  #   - 3007:3007
+  #   volumes:
+  #     - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+  #   networks:
+  #     vv:
+  #       ipv4_address: 172.25.0.20

 networks:
  vv:
--- a/services1/output/kubeconfig.yaml
+++ b/services1/output/kubeconfig.yaml
@ -1,19 +0,0 @@
-apiVersion: v1
-clusters:
- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkakNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdGMyVnkKZG1WeUxXTmhRREUyT1RBeU1qRTBNVFl3SGhjTk1qTXdOekkwTVRjMU5qVTJXaGNOTXpNd056SXhNVGMxTmpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRjMlZ5ZG1WeUxXTmhRREUyT1RBeU1qRTBNVFl3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFSS1RER1d5ckNhMGE4Y2hxY0hDcVg4bjg3WXA0YTZuR05FaGZSYjBWYUQKV2hwcDVKSndaSVk1R2FVNy9CV1ptSmpvQUZ6YnRURWt2OHlVNHo0RUpkWDFvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVWh6MGJMdnFCSURlaFk4NmxaalcrCjRIb2dZVjh3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnUWxaRDFBUFhaUjE0SU0veE1YYUpUU0VOUTlHUS9YTEUKNDU5VGhCNXNkL0lDSUU3NUdGYUVuRWtleXEwOTR3THNjeFFHTmU0ZjhGVUpiM1pvdGNWZklZbVQKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://127.0.0.1:6443
-  name: default
-contexts:
- context:
-    cluster: default
-    user: default
-  name: default
-current-context: default
-kind: Config
-preferences: {}
-users:
- name: default
-  user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrVENDQVRlZ0F3SUJBZ0lJY0pTREhoQVVTMnd3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOamt3TWpJeE5ERTJNQjRYRFRJek1EY3lOREUzTlRZMU5sb1hEVEkwTURjeQpNekUzTlRZMU5sb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJMdGs0eWd4RHlUSVZWcTUKcnN2dThoRGVUeEpLMUxnR2FvblJVcWNwUG1tK0pRRU4yNC9lVGJSNFU4VTRoK3I0YzZMcjdGV0FCSjhDQmlZaAozNXo4L082alNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCUmRJa2gyL0RPalkraWxNYnFuMEhheDJJRmE2REFLQmdncWhrak9QUVFEQWdOSUFEQkYKQWlFQXIyaEMrenFhMExUM3NlZ1d6bkVhazUvMis0Z1lta3I2SlhBNW5GemZCQk1DSUhFNjJGS2krbXRNSytUOApLV0lGUmtMSG5KU3hDN1g1eUJrRSsreVpCZVpDCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkekNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUyT1RBeU1qRTBNVFl3SGhjTk1qTXdOekkwTVRjMU5qVTJXaGNOTXpNd056SXhNVGMxTmpVMgpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUyT1RBeU1qRTBNVFl3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFUTmxRRXZLaDdDRjJVU0JISkpyV01tTzNscTA4Y05CV3hFT2VwZDlTMEMKMGJ4dHNlMWRteDNqNDk1a1VkTFVMSDdXM0FJNjRSb2N3L3Zta1IyNGtnQ1BvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVVhTSklkdnd6bzJQb3BURzZwOUIyCnNkaUJXdWd3Q2dZSUtvWkl6ajBFQXdJRFNBQXdSUUlnUDREUjUyNzViWVYybWZ0dWpsVWN2WStMckxGRHJENzcKcC94ZEowbjVodU1DSVFDd3dEN0lUTGI0ZEhGMXlscEZRWEsvZ2VCWCtkWUJUNXY2STBIK05aV0FWdz09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-    client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUtmTnh5VVM2S3c4QmZqekdBM0dyb0FPNXBuODFOdDYrN3BVQ24wZ3YyK1dvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFdTJUaktERVBKTWhWV3JtdXkrN3lFTjVQRWtyVXVBWnFpZEZTcHlrK2FiNGxBUTNiajk1Tgp0SGhUeFRpSDZ2aHpvdXZzVllBRW53SUdKaUhmblB6ODdnPT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=
--- a/services2/docker-compose.yml
+++ b/services2/docker-compose.yml
@ -5,7 +5,8 @@ services:
  master2:
    image: "rancher/k3s:${K3S_VERSION:-latest}"
    container_name: master2
-    command: server --node-name=master2 --flannel-backend=wireguard-native --flannel-external-ip --disable-network-policy --disable traefik --disable local-storage --disable-helm-controller --disable metrics-server --disable coredns --node-external-ip="${K3S_MASTER2}" --advertise-address ${K3S_MASTER} --tls-san ${K3S_MASTER} --tls-san ${K3S_MASTER2} --node-label "node-type=master" --node-label "node-name=master2" --node-label "k8s=egate"
+    command: server --node-name=master2 --flannel-backend=wireguard-native --flannel-external-ip --node-external-ip="${K3S_MASTER2}" --advertise-address ${K3S_MASTER} --tls-san ${K3S_MASTER} --tls-san ${K3S_MASTER2} --node-label "node-type=master" --node-label "node-name=master2" --node-label "k8s=egate"
+# --disable-network-policy --disable traefik --disable local-storage --disable-helm-controller --disable metrics-server --disable coredns 
    tmpfs:
    - /run
    - /var/run
@ -55,23 +56,23 @@ services:
      vv:
        ipv4_address: 172.25.0.37

-  nginx:
-    image: "nginx"
-    container_name: nginx
-    restart: always
-    ports:
-    - 3001:3001
-    - 3002:3002
-    - 3003:3003
-    - 3004:3004
-    - 3005:3005
-    - 3006:3006
-    - 3007:3007
-    volumes:
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    networks:
-      vv:
-        ipv4_address: 172.25.0.20
+  # nginx:
+  #   image: "nginx"
+  #   container_name: nginx
+  #   restart: always
+  #   ports:
+  #   - 3001:3001
+  #   - 3002:3002
+  #   - 3003:3003
+  #   - 3004:3004
+  #   - 3005:3005
+  #   - 3006:3006
+  #   - 3007:3007
+  #   volumes:
+  #     - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+  #   networks:
+  #     vv:
+  #       ipv4_address: 172.25.0.20

 networks:
  vv:
--- a/services3/docker-compose.yml
+++ b/services3/docker-compose.yml
@ -29,23 +29,23 @@ services:
      vv:
        ipv4_address: 172.25.0.38

-  nginx:
-    image: "nginx"
-    container_name: nginx
-    restart: always
-    ports:
-    - 3001:3001
-    - 3002:3002
-    - 3003:3003
-    - 3004:3004
-    - 3005:3005
-    - 3006:3006
-    - 3007:3007
-    volumes:
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    networks:
-      vv:
-        ipv4_address: 172.25.0.20
+  # nginx:
+  #   image: "nginx"
+  #   container_name: nginx
+  #   restart: always
+  #   ports:
+  #   - 3001:3001
+  #   - 3002:3002
+  #   - 3003:3003
+  #   - 3004:3004
+  #   - 3005:3005
+  #   - 3006:3006
+  #   - 3007:3007
+  #   volumes:
+  #     - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+  #   networks:
+  #     vv:
+  #       ipv4_address: 172.25.0.20

 networks:
  vv:
--- a/services4/docker-compose.yml
+++ b/services4/docker-compose.yml
@ -29,23 +29,23 @@ services:
      vv:
        ipv4_address: 172.25.0.39

-  nginx:
-    image: "nginx"
-    container_name: nginx
-    restart: always
-    ports:
-    - 3001:3001
-    - 3002:3002
-    - 3003:3003
-    - 3004:3004
-    - 3005:3005
-    - 3006:3006
-    - 3007:3007
-    volumes:
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-    networks:
-      vv:
-        ipv4_address: 172.25.0.20
+  # nginx:
+  #   image: "nginx"
+  #   container_name: nginx
+  #   restart: always
+  #   ports:
+  #   - 3001:3001
+  #   - 3002:3002
+  #   - 3003:3003
+  #   - 3004:3004
+  #   - 3005:3005
+  #   - 3006:3006
+  #   - 3007:3007
+  #   volumes:
+  #     - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+  #   networks:
+  #     vv:
+  #       ipv4_address: 172.25.0.20

 networks:
  vv: