root před 2 roky
rodič
revize
f7360f56e9
2 změnil soubory, kde provedl 26 přidání a 10 odebrání
  1. 24 8
      deploy.yaml
  2. 2 2
      entrypoint.sh

+ 24 - 8
deploy.yaml

@@ -18,18 +18,32 @@ spec:
       labels:
         app: book-api
     spec:
+      readinessGates:
+      - conditionType: InPlaceUpdateReady
       terminationGracePeriodSeconds: 180
+      dnsPolicy: ClusterFirstWithHostNet
+      dnsConfig:
+        nameservers:
+          - 223.5.5.5
+          - 114.114.114.114
       initContainers:
         - name: init
-          image: $JNLP_REPO/dev/busybox
-          command: ["chmod","777","-R","$JNLP_MOUNT_PATH"]
+          image: hub.evbj.easou.com/dev/busybox
+          command: ["chmod","777","-R","/data"]
+          imagePullPolicy: Always
+          volumeMounts:
+          - name: volume
+            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.278/novelapi_3.1.278_kuaiDu3.15.4Dev_B3.1.277-179663_3.1.278_20220819-110109_RBL/ROOT.war -O /data/project/ROOT.war']
           imagePullPolicy: Always
           volumeMounts:
           - name: volume
             mountPath: /data
       containers:
       - name: book-api
-        image: hub.evbj.easou.com/op/v3.0.0
+        image: hub.evbj.easou.com/dev/book-api:v3.1base
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -78,19 +92,21 @@ spec:
   selector:
     app: book-api
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: book-api-ingress
   namespace: dev
-  annotations:
-    kubernetes.io/ingress.class: nginx
 spec:
   rules:
   - host: dev-book-api.ieasou.cn
     http:
       paths:
       - path: /
+        pathType: Prefix
         backend:
-          serviceName: book-svc
-          servicePort: 8080
+          service:
+            name: book-api-svc
+            port:
+              number: 8080
+  ingressClassName: nginx

+ 2 - 2
entrypoint.sh

@@ -5,8 +5,8 @@ set -o pipefail
 
 rm -f /app/soft/resin-4.0.65/log/jvm-app-0.log
 mkdir -p /data/project /data/log  /log
-rm -rf /data/project/*
-mv /tmp/ROOT.war /data/project/
+#rm -rf /data/project/*
+#mv /tmp/ROOT.war /data/project/
 
 
 exec "$@"