3
0
Quellcode durchsuchen

拍卖测试环境迁移

hr~ vor 9 Stunden
Ursprung
Commit
c3692febbe

+ 1 - 1
AuctionApp/DEV/AUC/cfg.yaml

@@ -9,4 +9,4 @@ project:
     module: auc
     health: /actuator/health/readiness
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml

+ 1 - 1
AuctionApp/DEV/BID/cfg.yaml

@@ -9,4 +9,4 @@ project:
     module: bid
     health: /actuator/health/readiness
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml

+ 1 - 1
k3s-INFRA/DEV/fluent-aggr/cfg.yaml

@@ -3,4 +3,4 @@ project:
     name: fluent-aggr
     version: ''
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml

+ 1 - 1
k3s-INFRA/DEV/traefik-rules/admin/IngressRoute.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: poyee-admin.https

+ 2 - 2
k3s-INFRA/DEV/traefik-rules/admin/Middleware.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: admin-strip
@@ -8,7 +8,7 @@ spec:
       - /py-admin
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: admin-cors-header

+ 1 - 1
k3s-INFRA/DEV/traefik-rules/auction-auc/IngressRoute.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: auction-auc.https

+ 2 - 2
k3s-INFRA/DEV/traefik-rules/auction-auc/Middleware.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: auction-auc-strip
@@ -8,7 +8,7 @@ spec:
       - /auc
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: auc-cors-header

+ 1 - 1
k3s-INFRA/DEV/traefik-rules/auction-bid/IngressRoute.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: auction-bid.https

+ 2 - 2
k3s-INFRA/DEV/traefik-rules/auction-bid/Middleware.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: auction-bid-strip
@@ -8,7 +8,7 @@ spec:
       - /bid
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: bid-cors-header

+ 1 - 1
k3s-INFRA/DEV/traefik-rules/cfg.yaml

@@ -1,3 +1,3 @@
 project:
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml

+ 1 - 1
k3s-INFRA/DEV/traefik-rules/poyee-app/IngressRoute.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
   name: poyee-app-login.https

+ 5 - 5
k3s-INFRA/DEV/traefik-rules/poyee-app/Middleware.yaml

@@ -1,4 +1,4 @@
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: poyee-app-v2-strip
@@ -9,7 +9,7 @@ spec:
       - /coresvc
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: poyee-app-marketgroups-ratelimit-byip
@@ -18,7 +18,7 @@ spec:
     address: http://coresvc2/api/auth/blockByIp
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: poyee-app-ratelimit-phonecode-byheader
@@ -31,7 +31,7 @@ spec:
       requestHeaderName: X-Client-ID
 
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: poyee-app-cors-header
@@ -46,7 +46,7 @@ spec:
     accessControlMaxAge: 100
     addVaryHeader: true
 ---
-apiVersion: traefik.containo.us/v1alpha1
+apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
   name: return-404

+ 19 - 0
k3s/k3s-eastern.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    insecure-skip-tls-verify: true
+    server: https://192.168.50.7:6443
+  name: default
+contexts:
+- context:
+    cluster: default
+    user: default
+  name: default
+current-context: default
+kind: Config
+preferences: {}
+users:
+- name: default
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJrRENDQVRlZ0F3SUJBZ0lJTFFBMkgvL2N4Tnd3Q2dZSUtvWkl6ajBFQXdJd0l6RWhNQjhHQTFVRUF3d1kKYXpOekxXTnNhV1Z1ZEMxallVQXhOemN3TWpFeU56a3dNQjRYRFRJMk1ESXdOREV6TkRZek1Gb1hEVEkzTURJdwpOREV6TkRZek1Gb3dNREVYTUJVR0ExVUVDaE1PYzNsemRHVnRPbTFoYzNSbGNuTXhGVEFUQmdOVkJBTVRESE41CmMzUmxiVHBoWkcxcGJqQlpNQk1HQnlxR1NNNDlBZ0VHQ0NxR1NNNDlBd0VIQTBJQUJBcUUvdEpId0NjLzZvZWQKTFJLQmFyRHZZdzVkT3RoVjN2eTJLQnlCUU1vT3FkdE9aSGpuckxGTzBPM2NGeXpURis2dFpvWnJMWXBqOWEzaApRemNMM3BlalNEQkdNQTRHQTFVZER3RUIvd1FFQXdJRm9EQVRCZ05WSFNVRUREQUtCZ2dyQmdFRkJRY0RBakFmCkJnTlZIU01FR0RBV2dCU3FGbTlyeFZaMEV5cG95MjRSQ0hVRWpPbVVtVEFLQmdncWhrak9QUVFEQWdOSEFEQkUKQWlCd3RSd21xRUJLQlZneVkyeWdkK0ZZamlaN2M2b1dXOG5za1NJK2JqSnl3QUlnWkFZOThicU5nMmZRSEd3YgowUU03cWw3MEd4TEdyaWxXOVF4Y00rOFZQdm89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0KLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUJkakNDQVIyZ0F3SUJBZ0lCQURBS0JnZ3Foa2pPUFFRREFqQWpNU0V3SHdZRFZRUUREQmhyTTNNdFkyeHAKWlc1MExXTmhRREUzTnpBeU1USTNPVEF3SGhjTk1qWXdNakEwTVRNME5qTXdXaGNOTXpZd01qQXlNVE0wTmpNdwpXakFqTVNFd0h3WURWUVFEREJock0zTXRZMnhwWlc1MExXTmhRREUzTnpBeU1USTNPVEF3V1RBVEJnY3Foa2pPClBRSUJCZ2dxaGtqT1BRTUJCd05DQUFRSTFiTDdseWMwZ2dtUEFDWkUwc0ZpMjg1RXErWmxnRGpLVnZ6OWl4WksKOVBEd1FxOWd1b2o5Rk1VaXZBSE05c3lTVk5FeVJXR1ZPaVRmUGlvRjRISElvMEl3UURBT0JnTlZIUThCQWY4RQpCQU1DQXFRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBZEJnTlZIUTRFRmdRVXFoWnZhOFZXZEJNcWFNdHVFUWgxCkJJenBsSmt3Q2dZSUtvWkl6ajBFQXdJRFJ3QXdSQUlnYjg5RmRIMEU0S0VZbEo0N0EvMUhndktrZHBXNWRoQWoKNlpGdm00YWNKa0FDSUNqc3Z0RGM1QzB6YmpVZzJyczFRNkVNZ01DeGxZQm4zNG41aFozcUpnY3AKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBFQyBQUklWQVRFIEtFWS0tLS0tCk1IY0NBUUVFSUVJaGk4c1Y0Wjc3ODhMTlRRN2pzUzdtajNBbVpCbXZhWUVBVzZzeTJNTEVvQW9HQ0NxR1NNNDkKQXdFSG9VUURRZ0FFQ29UKzBrZkFKei9xaDUwdEVvRnFzTzlqRGwwNjJGWGUvTFlvSElGQXlnNnAyMDVrZU9lcwpzVTdRN2R3WExOTVg3cTFtaG1zdGltUDFyZUZETnd2ZWx3PT0KLS0tLS1FTkQgRUMgUFJJVkFURSBLRVktLS0tLQo=

+ 1 - 1
poyee-admin/DEV/cfg.yaml

@@ -10,6 +10,6 @@ project:
 
 
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml
     cpu_limits: 850m
     cpu_requests: 250m

+ 1 - 1
poyee-auction-modules/DEV/order/cfg.yaml

@@ -9,6 +9,6 @@ project:
     jar: 'auction-order.jar'
     health: '/actuator/health'
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml
     cpu_limits: 850m
     cpu_requests: 250m

+ 1 - 1
poyee-auction-modules/DEV/pay/cfg.yaml

@@ -9,6 +9,6 @@ project:
     jar: 'poyee-pay.jar'
     health: '/actuator/health'
   k3s:
-    kubeconfig: k3s/k3s-dev6.yaml
+    kubeconfig: k3s/k3s-eastern.yaml
     cpu_limits: 850m
     cpu_requests: 250m