duyangang vor 1 Jahr
Ursprung
Commit
0bee99a5f1
1 geänderte Dateien mit 24 neuen und 7 gelöschten Zeilen
  1. 24 7
      deploy-tmp.yaml

+ 24 - 7
deploy-tmp.yaml

@@ -38,7 +38,11 @@ spec:
               name: port
           volumeMounts:
             - name: volume
-              mountPath: $JNLP_MOUNT_PATH 
+              mountPath: $JNLP_MOUNT_PATH
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/bin/sh","-c","curl -H 'loginName:admin' -H 'password:ea1so2ua3dm4in5' -X POST 127.0.0.1:80/actuator/shutdown"]
           livenessProbe:
             tcpSocket:
               port: $JNLP_CONTAINER_PORT
@@ -74,19 +78,32 @@ spec:
   selector:
     app: $DRONE_REPO_NAME
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: $DRONE_REPO_NAME-ingress
   namespace: $JNLP_ENV
-  annotations:
-    kubernetes.io/ingress.class: $JNLP_INGRESS
 spec:
   rules:
-    - host: mccallback.easou.com  #$JNLP_ENV-$DRONE_REPO_NAME$JNLP_DOMAIN
+    - host: $JNLP_ENV-$DRONE_REPO_NAME$JNLP_DOMAIN
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: $DRONE_REPO_NAME-svc
+                port: 
+                  number: $JNLP_CONTAINER_PORT
+    - host: douyin-video-content-callback.novelsee.cn
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: $DRONE_REPO_NAME-svc
-              servicePort: $JNLP_CONTAINER_PORT
+              service:
+                name: $DRONE_REPO_NAME-svc
+                port: 
+                  number: $JNLP_CONTAINER_PORT
+  ingressClassName: nginx
+