chore: update k8s deploy yml;

labring · Jan 22, 2022 · 79a4a34 · 79a4a34
1 parent 6287e58
commit 79a4a34
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 49 deletions.
diff --git a/deploy/kubernetes/deploy.fs.yml b/deploy/kubernetes/deploy.fs.yml
@@ -37,12 +37,9 @@ spec:
     spec:
       automountServiceAccountToken: false
       containers:
-        - image: lafyun/storage-service:0.7.0
+        - image: lafyun/storage-service:latest
           name: storage-service
           resources:
-            # requests:
-            #   memory: "128Mi"
-            #   cpu: "500m"
             limits:
               memory: "1024Mi"
               cpu: "1000m"

diff --git a/deploy/kubernetes/deploy.gateway.yml b/deploy/kubernetes/deploy.gateway.yml
@@ -37,13 +37,12 @@ spec:
         app: gateway
     spec:
       automountServiceAccountToken: false
+      hostNetwork: true
+      dnsPolicy: ClusterFirstWithHostNet
       containers:
-        - image: lafyun/gateway:0.7.1
+        - image: lafyun/gateway:latest
           name: gateway
           resources:
-            # requests:
-            #   memory: "128Mi"
-            #   cpu: "1000m"
             limits:
               memory: "1024Mi"
               cpu: "1000m"

diff --git a/deploy/kubernetes/deploy.sys.yml b/deploy/kubernetes/deploy.sys.yml
@@ -40,9 +40,6 @@ spec:
         - image: lafyun/system-server:latest
           name: system-server
           resources:
-            # requests:
-            #   memory: "128Mi"
-            #   cpu: "500m"
             limits:
               memory: "1024Mi"
               cpu: "1000m"

diff --git a/kubernetes-dev/deploy.fs.yml b/kubernetes-dev/deploy.fs.yml
@@ -37,12 +37,9 @@ spec:
     spec:
       automountServiceAccountToken: false
       containers:
-        - image: lafyun/storage-service:0.7.0
+        - image: lafyun/storage-service:0.7.3
           name: storage-service
           resources:
-            # requests:
-            #   memory: "128Mi"
-            #   cpu: "500m"
             limits:
               memory: "256Mi"
               cpu: "500m"
@@ -56,11 +53,4 @@ spec:
           ports:
             - containerPort: 9010
           command: ["node", "/app/dist/index.js"]
-          volumeMounts:
-            - name: local-storage-service
-              mountPath: /app
       restartPolicy: Always
-      volumes:
-        - name: local-storage-service
-          hostPath:
-            path: /Users/fugen/codes/less/laf/packages/storage-service
diff --git a/kubernetes-dev/deploy.gateway.yml b/kubernetes-dev/deploy.gateway.yml
@@ -34,7 +34,7 @@ spec:
       # hostNetwork: true
       # dnsPolicy: ClusterFirstWithHostNet
       containers:
-        - image: lafyun/gateway:0.7.1
+        - image: lafyun/gateway:0.7.4
           name: gateway
           resources:
             limits:
@@ -53,21 +53,4 @@ spec:
               value: kubernetes
           ports:
             - containerPort: 80
-          volumeMounts:
-            - name: system-conf
-              mountPath: /etc/nginx/templates/system.conf.template
-            - name: app-conf
-              mountPath: /etc/nginx/templates/app.conf.template
-            - name: fs-conf
-              mountPath: /etc/nginx/templates/fs-proxy.conf.template
       restartPolicy: Always
-      volumes:
-        - name: system-conf
-          hostPath:
-            path: /Users/fugen/codes/less/laf/packages/gateway/conf.kubernetes/system.conf
-        - name: app-conf
-          hostPath:
-            path: /Users/fugen/codes/less/laf/packages/gateway/conf.kubernetes/app.conf
-        - name: fs-conf
-          hostPath:
-            path: /Users/fugen/codes/less/laf/packages/gateway/conf.kubernetes/fs-proxy.conf
diff --git a/kubernetes-dev/deploy.sys.yml b/kubernetes-dev/deploy.sys.yml
@@ -37,7 +37,7 @@ spec:
     spec:
       automountServiceAccountToken: true
       containers:
-        - image: lafyun/system-server:0.7.1
+        - image: lafyun/system-server:0.7.2
           name: system-server
           resources:
             limits:
@@ -58,9 +58,13 @@ spec:
             - name: SYS_SERVER_SECRET_SALT
               value: Rewrite_Your_Own_Secret_Salt_abcdefg1234567
             - name: APP_SERVICE_IMAGE
-              value: lafyun/app-service:0.7.1
+              value: lafyun/app-service:0.7.2
             - name: SERVICE_DRIVER
               value: kubernetes
+            - name: APP_SERVICE_MEMORY_LIMIT
+              value: "128"
+            - name: APP_SERVICE_CPU_SHARES
+              value: "128"
             - name: LOG_LEVEL
               value: debug
             - name: ACCOUNT_DEFAULT_APP_QUOTA
@@ -79,11 +83,4 @@ spec:
               value: abc123
           ports:
             - containerPort: 9000
-          volumeMounts:
-            - name: local-system-server
-              mountPath: /app
       restartPolicy: Always
-      volumes:
-        - name: local-system-server
-          hostPath:
-            path: /Users/fugen/codes/less/laf/packages/system-server