瀏覽代碼

adding yemplates

afeiszli 4 年之前
父節點
當前提交
38eb68995a
共有 4 個文件被更改,包括 13 次插入58 次删除
  1. 1 1
      docs/quick-start.rst
  2. 3 3
      kube/netclient-daemonset.yaml
  3. 4 4
      kube/netmaker-template-udp.yaml
  4. 5 50
      kube/netmaker-template.yaml

+ 1 - 1
docs/quick-start.rst

@@ -103,7 +103,7 @@ Make sure firewall settings are appropriate for Netmaker. You need ports 53 and
 
 .. code-block::
 
-  sudo ufw allow proto tcp from any to any port 443 && sudo ufw allow dns
+  sudo ufw allow proto tcp from any to any port 443 && sudo ufw allow 53/udp
 
 **Based on your cloud provider, you may also need to set inbound security rules for your server. This will be dependent on your cloud provider. Be sure to check before moving on:**
   - allow 443/tcp from all

+ 3 - 3
kube/netclient-daemonset.yaml

@@ -17,13 +17,13 @@ spec:
       hostNetwork: true
       containers:
       - name: netclient
-        image: gravitl/netclient:v0.7
+        image: gravitl/netclient:v0.7.2
         command: ['bash', '-c', "netclient checkin -n $NETWORK; sleep $SLEEP"]
         env:
         - name: ACCESS_TOKEN
           value: "XXXX"
         - name: NETWORK
-          value: "default"
+          value: "YYYY"
         - name: SLEEP
           value: 30
         volumeMounts:
@@ -35,7 +35,7 @@ spec:
           privileged: true
       initContainers:
       - name: netclient-join
-        image: gravitl/netclient:v0.7
+        image: gravitl/netclient:v0.7.2
         command: ['bash', '-c', "netclient join -t $ACCESS_TOKEN --daemon off"]
         env:
         - name: ACCESS_TOKEN

+ 4 - 4
kube/netmaker-template-udp.yaml

@@ -55,9 +55,9 @@ spec:
           privileged: true
         env:
         - name: SERVER_API_CONN_STRING
-          value: "api.netmaker.goallclouds.com:80"
+          value: "api.NETMAKER_BASE_DOMAIN:443"
         - name: SERVER_GRPC_CONN_STRING
-          value: "grpc.netmaker.goallclouds.com:80"
+          value: "grpc.NETMAKER_BASE_DOMAIN:443"
         - name: COREDNS_ADDR
           value: "10.152.183.53"
         - name: POD_IP
@@ -67,9 +67,9 @@ spec:
         - name: GRPC_SSL
           value: "on"
         - name: SERVER_HTTP_HOST
-          value: "api.netmaker.goallclouds.com:443"
+          value: "api.NETMAKER_BASE_DOMAIN:443"
         - name: SERVER_GRPC_HOST
-          value: "grpc.netmaker.goallclouds.com:443"
+          value: "grpc.NETMAKER_BASE_DOMAIN:443"
         - name: API_PORT
           value: "8081"
         - name: GRPC_PORT

+ 5 - 50
kube/netmaker-template.yaml

@@ -17,8 +17,6 @@ metadata:
   labels:
     app: netmaker-backend
 spec:
-  nodeSelector:
-    netmaker-server: true
   selector:
     matchLabels:
       app: netmaker-backend
@@ -36,28 +34,13 @@ spec:
         imagePullPolicy: Always
         ports:
         - containerPort: 8081
-        volumeMounts:
-        - name: nm-pvc
-          mountPath: /root/config/dnsconfig
-        - mountPath: /etc/netclient
-          name: etc-netclient
-        - mountPath: /usr/bin/wg
-          name: wg
-        - mountPath: /var/run/dbus/system_bus_socket
-          name: systemd-bus-socket
-        - mountPath: /sys/fs/cgroup
-          name: cgroup
-        - mountPath: /run/systemd/system
-          name: run-systemd
-        - mountPath: /etc/systemd/system
-          name: etc-systemd
         securityContext:
           privileged: true
         env:
         - name: SERVER_API_CONN_STRING
-          value: "api.netmaker.goallclouds.com:80"
+          value: "api.NETMAKER_BASE_DOMAIN:443"
         - name: SERVER_GRPC_CONN_STRING
-          value: "grpc.netmaker.goallclouds.com:80"
+          value: "grpc.NETMAKER_BASE_DOMAIN:443"
         - name: COREDNS_ADDR
           value: "10.152.183.53"
         - name: POD_IP
@@ -67,13 +50,13 @@ spec:
         - name: GRPC_SSL
           value: "on"
         - name: SERVER_HTTP_HOST
-          value: "api.netmaker.goallclouds.com:443"
+          value: "api.NETMAKER_BASE_DOMAIN"
         - name: SERVER_GRPC_HOST
-          value: "grpc.netmaker.goallclouds.com:443"
+          value: "grpc.NETMAKER_BASE_DOMAIN"
         - name: API_PORT
           value: "8081"
         - name: GRPC_PORT
-          value: "443"
+          value: "80"
         - name: CLIENT_MODE
           value: "off"
         - name: MASTER_KEY
@@ -97,34 +80,6 @@ spec:
       - name: nm-pvc
         persistentVolumeClaim:
           claimName: nm-pvc
-      - hostPath:
-          path: /etc/netclient
-          type: DirectoryOrCreate
-        name: etc-netclient
-      - hostPath:
-          path: /usr/bin/wg
-          type: File
-        name: wg
-      - hostPath:
-          path: /usr/bin/resolvectl
-          type: File
-        name: resolvectl
-      - hostPath:
-          path: /var/run/dbus/system_bus_socket
-          type: ""
-        name: systemd-bus-socket
-      - hostPath:
-          path: /etc/systemd/system
-          type: ""
-        name: etc-systemd
-      - hostPath:
-          path: /run/systemd/system
-          type: ""
-        name: run-systemd
-      - hostPath:
-          path: /sys/fs/cgroup
-          type: ""
-        name: cgroup
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim