From 243041625befc0a3f4d3495be341d0a47885fb82 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Wed, 22 May 2024 16:11:58 +0800
Subject: [PATCH] Update k8s resource file.

---
 .../{dign-client.yml => dign-client.yaml}     | 17 ++++++-----
 .../{dign-server.yml => dign-server.yaml}     | 30 ++++++++++++++-----
 2 files changed, 32 insertions(+), 15 deletions(-)
 rename k8s-resource/{dign-client.yml => dign-client.yaml} (85%)
 rename k8s-resource/{dign-server.yml => dign-server.yaml} (80%)

diff --git a/k8s-resource/dign-client.yml b/k8s-resource/dign-client.yaml
similarity index 85%
rename from k8s-resource/dign-client.yml
rename to k8s-resource/dign-client.yaml
index b2e9bf3..dae8b62 100644
--- a/k8s-resource/dign-client.yml
+++ b/k8s-resource/dign-client.yaml
@@ -2,13 +2,13 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: macvlan-client
+  namespace: tsg-os-system
+  name: br-dign-client
 spec:
   config: '{
             "cniVersion": "0.3.0",
-            "type": "macvlan",
-            "master": "ens4f1",
-            "mode": "bridge",
+            "type": "bridge",
+            "bridge": "br_dign_c",
             "ipam": {
                 "type": "host-local",
                 "ranges": [
@@ -23,14 +23,14 @@ spec:
         }'
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: DaemonSet
 metadata:
+  namespace: tsg-os-system
   name: dign-client
   labels:
     app: dign-client
 
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: dign-client
@@ -39,7 +39,7 @@ spec:
       labels:
         app: dign-client
       annotations:
-        k8s.v1.cni.cncf.io/networks: macvlan-client
+        k8s.v1.cni.cncf.io/networks: br-dign-client
     spec:
       containers:
       - name: dign-client
@@ -74,5 +74,8 @@ spec:
       - name: config-path
         hostPath:
           path: /opt/tsg/tsg-diagnose/etc
+      - name: service-function-config-path
+        hostPath:
+          path: /opt/tsg/tsg-diagnose/etc
 ---
 
diff --git a/k8s-resource/dign-server.yml b/k8s-resource/dign-server.yaml
similarity index 80%
rename from k8s-resource/dign-server.yml
rename to k8s-resource/dign-server.yaml
index e5da270..f65d1d6 100644
--- a/k8s-resource/dign-server.yml
+++ b/k8s-resource/dign-server.yaml
@@ -2,13 +2,13 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: macvlan-server
+  namespace: tsg-os-system
+  name: br-dign-server
 spec:
   config: '{
             "cniVersion": "0.3.0",
-            "type": "macvlan",
-            "master": "ens4f0",
-            "mode": "bridge",
+            "type": "bridge",
+            "bridge": "br_dign_s",
             "ipam": {
                 "type": "host-local",
                 "ranges": [
@@ -23,14 +23,14 @@ spec:
         }'
 ---
 apiVersion: apps/v1
-kind: Deployment
+kind: DaemonSet
 metadata:
+  namespace: tsg-os-system
   name: dign-server
   labels:
     app: dign-server
 
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: dign-server
@@ -39,7 +39,7 @@ spec:
       labels:
         app: dign-server
       annotations:
-        k8s.v1.cni.cncf.io/networks: macvlan-server
+        k8s.v1.cni.cncf.io/networks: br-dign-server
 
     spec:
       containers:
@@ -49,6 +49,13 @@ spec:
         command: ["/bin/sh", "-c", "echo 66.66.66.66  www.1testanswer-cname.com >> /etc/hosts; webproc --config /etc/dnsmasq.conf -- dnsmasq --no-daemon"]
         securityContext:
           privileged: true
+        livenessProbe:
+          exec:
+            command:
+            - ifconfig
+            - net1
+          initialDelaySeconds: 5
+          periodSeconds: 5
         volumeMounts:
         - name: localtime-node
           mountPath: /etc/localtime
@@ -64,6 +71,13 @@ spec:
         command: ["/bin/bash", "-c", "make inside-docker;nginx;tail -f /dev/null"]
         securityContext:
           privileged: true
+        livenessProbe:
+          exec:
+            command:
+            - ifconfig
+            - net1
+          initialDelaySeconds: 5
+          periodSeconds: 5
         volumeMounts:
         - name: localtime-node
           mountPath: /etc/localtime
@@ -79,7 +93,7 @@ spec:
       - name: tsg-dign-init
         image: "dign-server-dns:latest"
         imagePullPolicy: Never
-        command: ["/bin/sh","-c","i=1;while [ \"$i\" -le 32 ]; do ip_suffix=$(( i + 100 ));ifconfig net1:$i 192.0.2.$ip_suffix;i=$(( i + 1 ));done;"]
+        command: ["/bin/sh","-c","i=1;while [ \"$i\" -le 64 ]; do ip_suffix=$(( i + 100 ));ifconfig net1:$i 192.0.2.$ip_suffix;i=$(( i + 1 ));done;"]
         securityContext:
           privileged: true