fix k8s deploymen

devops-utils-tools · Sep 29, 2022 · 4d9c89b · 4d9c89b
1 parent e4df2e6
commit 4d9c89b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Jxwaf docker
 
-#### jxwaf-server/ Jxwaf-manage DockerFile 
-#### jxwaf-node/ Jxwaf-node DockerFile
+#### jxwaf-server/ Jxwaf-manage DockerFile "bash build.sh RC3"
+#### jxwaf-node/ Jxwaf-node DockerFile  "bash build.sh 2022-RC3"
 #### api/ api记录 User_Cookice登陆后自行抓取
 #### k8s/ k8s 部署yanl文件
 #### 相关源码包

diff --git a/jxwaf-server/Entrypoint.sh b/jxwaf-server/Entrypoint.sh
@@ -11,11 +11,7 @@ echo ----------------------------------------------- init db -------------------
     show tables; \
     " 2>/dev/null
 echo -------------------------------------------------------------------------------------------------------
-
 }
-/usr/local/mysql-client/bin/mysql -u${DB_USER} -h${DB_HOST} -P ${DB_PORT} --password="${DB_PASS}" -e "\
-    use ${DB_NAME};show tables;\
-    "&>/dev/null ||mysql_db_init
 
 #jxwaf config
 jxwafconfig(){
@@ -70,7 +66,7 @@ $(if [[ "${DB_ENGINE:-"sqlite3"}" != "mysql" ]];then
     echo "   'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),"
     echo "    }"
     echo "}"
-else 
+else
     echo "DATABASES = {"
     echo "    'default': {"
     echo "        'ENGINE': 'django.db.backends.mysql',"
@@ -113,12 +109,32 @@ rm -rf /tmp/chowndir &>/dev/null
 
 #init server
 if [ ! -e "/opt/jxwaf-server/.init" ];then
-   cp -a /usr/local/jxwaf-server /opt/
-   cd /opt/jxwaf-server
-   jxwafconfig
-   python2 manage.py makemigrations
-   python2 manage.py migrate
-   touch /opt/jxwaf-server/.init
+    cp -a /usr/local/jxwaf-server /opt/
+    cd /opt/jxwaf-server
+    jxwafconfig
+    touch /opt/jxwaf-server/.init
+
+    #初始化数据库
+    if [[ "${DB_ENGINE:-"sqlite3"}" == "mysql" ]];then
+        #mysql初始化
+        #判断用户是否存在 没有存在初始化mysql数据库
+        export User_Count=$(/usr/local/mysql-client/bin/mysql -u${DB_USER} -h${DB_HOST} -P ${DB_PORT} --skip-column-names --silent --raw  --password="${DB_PASS}" -e "\
+            SELECT COUNT(*) FROM ${DB_NAME}.server_jxwaf_user;\
+            " 2>/dev/null)
+        if [ "${User_Count}" -lt 1 ];then
+            echo "mysql db init"
+            mysql_db_init;
+            python2 manage.py makemigrations
+            python2 manage.py migrate
+        fi
+    else
+        #sqlite3 初始化
+        echo "sqlite3 db init"
+        python2 manage.py makemigrations
+        python2 manage.py migrate
+    fi
+
+
 fi
 
 #start

diff --git a/k8s/jxwafnode.yaml b/k8s/jxwafnode.yaml
@@ -5,20 +5,22 @@ metadata:
   labels:
     app.kubernetes.io/name: jxwafnode
 spec:
+  replicas: 3
   selector:
     matchLabels:
       app.kubernetes.io/name: jxwafnode
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
         app.kubernetes.io/name: jxwafnode
     spec:
       hostNetwork: true
-      replicas: 3
       containers:
         - name: jxwafnode
-          image: hub.wusong.com/library/devopsutilstools/jxwaf-node:v2022
-          imagePullPolicy: IfNotPresent
+          image: hub.wusong.com/library/devopsutilstools/jxwaf-node:2022-RC3
+          imagePullPolicy: Always
           ports:
             - name: http
               containerPort: 80
@@ -34,14 +36,22 @@ spec:
               port: 443
           env:
             - name: ENV_INIT
-              value: "--api_key=4c9f506d-303a-40eb-a9a1-16f8253f0aae --api_password=3ee36ee9-2dd0-4d9b-84c7-f5dc5032dcaa --waf_server=http://192.168.25.105:36915"
+              value: "--api_key=c089bd81-b8e8-480c-ba90-8451d4096b06 --api_password=8f712e10-cc3f-4c71-b2c8-76049d6b20aa --waf_server=http://192.168.25.105:8080"
           lifecycle:
             preStop:
               exec:
                 command:
                 - /bin/sh
                 - -c
                 - "sleep 180"
+          resources:
+            limits:
+              cpu: 2048m
+              memory: 4096Mi
+            requests:
+              cpu: 512m
+              memory: 2048Mi
       nodeSelector:
         jxwafnode: jxwafnode
-#kubectl label nodes 192.168.25.107 192.168.25.108 192.168.25.109 jxwafnode=jxwafnode
+# kubectl label nodes 192.168.25.107 192.168.25.108 192.168.25.109 jxwafnode=jxwafnode
+# kubectl set image --namespace jxwaf deployments jxwafnode jxwafnode=hub.wusong.com/library/devopsutilstools/jxwaf-node:2022-RC3
diff --git a/k8s/jxwafserver.yaml b/k8s/jxwafserver.yaml
@@ -1,4 +1,5 @@
-#kubectl label nodes 192.168.25.107 192.168.25.108 192.168.25.109 jxwafserver=jxwafserver
+# kubectl label nodes 192.168.25.107 192.168.25.108 192.168.25.109 jxwafserver=jxwafserver
+# kubectl set image --namespace jxwaf deployments jxwafserver jxwafserver=hub.wusong.com/library/devopsutilstools/jxwaf-server:RC3
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -8,11 +9,12 @@ metadata:
     app.kubernetes.io/name: jxwafserver
 data:
   #数据库配置
+  DB_ENGINE: "mysql"
   DB_HOST: "192.168.25.219"
   DB_PORT: "3308"
   DB_NAME: "jxwaf_db"
   DB_USER: "test"
-  DB_PASS: "XXXXXPASS"
+  DB_PASS: "XXXPASS"
 ---
 apiVersion: v1
 kind: Service
@@ -25,6 +27,7 @@ spec:
   type: NodePort
   ports:
   - name: jxwafserver
+    nodePort: 8080
     port: 8080
     targetPort: 8080
     protocol: TCP
@@ -38,9 +41,7 @@ metadata:
   labels:
     app.kubernetes.io/name: jxwafserver
 spec:
-  replicas: 1
-  strategy:
-    type: Recreate
+  replicas: 2
   selector:
     matchLabels:
       app.kubernetes.io/name: jxwafserver
@@ -61,8 +62,8 @@ spec:
         jxwafserver: jxwafserver
       containers:
         - name: jxwafserver
-          image: hub.wusong.com/library/devopsutilstools/jxwaf-server:v2022
-          imagePullPolicy: IfNotPresent
+          image: hub.wusong.com/library/devopsutilstools/jxwaf-server:RC3
+          imagePullPolicy: Always
           envFrom:
           - configMapRef:
               name: jxwafserver