root 2 år sedan
förälder
incheckning
69910fd260
2 ändrade filer med 11 tillägg och 3 borttagningar
  1. 6 2
      deploy-canary.yaml
  2. 5 1
      deploy.yaml

+ 6 - 2
deploy-canary.yaml

@@ -23,7 +23,7 @@ spec:
         app: book-api-rs
       readinessGates:
       - conditionType: InPlaceUpdateReady
-      terminationGracePeriodSeconds: 180
+      terminationGracePeriodSeconds: 30
       dnsPolicy: ClusterFirstWithHostNet
       dnsConfig:
         nameservers:
@@ -39,7 +39,7 @@ spec:
             mountPath: /data
         - name: init-package
           image: hub.evbj.easou.com/dev/busybox
-          command: ['sh', '-c', 'rm -rf /data/project/* && wget http://10.26.22.190/release/app-web/prod-64/novelapi/3.1.279/novelapi_3.1.279_quickappDev_B3.1.278-180049_3.1.279_20220915-165454_RBL/ROOT.war -O /data/project/ROOT.war']
+          command: ['sh', '-c', 'rm -rf /data/project/* && wget http://10.26.22.190/release/app-web/prod-64/novelapi/3.1.279/novelapi_3.1.279_quickappDev_B3.1.278-180049_3.1.279_20220915-165454_RBL/ROOT.war -O /data/project/ROOT.war && /data/project/ROOT.war']
           imagePullPolicy: IfNotPresent
           volumeMounts:
           - name: volume
@@ -51,6 +51,10 @@ spec:
         ports:
         - containerPort: 8080
           name: port
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sh","-c","supervisorctl stop all"]
         volumeMounts:
         - name: volume
           mountPath: /data

+ 5 - 1
deploy.yaml

@@ -39,7 +39,7 @@ spec:
             mountPath: /data
         - name: init-package
           image: hub.evbj.easou.com/dev/busybox
-          command: ['sh', '-c', 'rm -rf /data/project/* && wget http://10.26.22.190/release/app-web/prod-64/novelapi/3.1.279/novelapi_3.1.279_quickappDev_B3.1.278-180049_3.1.279_20220915-165454_RBL/ROOT.war -O /data/project/ROOT.war']
+          command: ['sh', '-c', 'rm -rf /data/project/* && wget http://10.26.22.190/release/app-web/prod-64/novelapi/3.1.279/novelapi_3.1.279_quickappDev_B3.1.278-180049_3.1.279_20220915-165454_RBL/ROOT.war -O /data/project/ROOT.war && md5sum  /data/project/ROOT.war']
           imagePullPolicy: IfNotPresent
           volumeMounts:
           - name: volume
@@ -51,6 +51,10 @@ spec:
         ports:
         - containerPort: 8080
           name: port
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sh","-c","supervisorctl stop all"]
         volumeMounts:
         - name: volume
           mountPath: /data