From: bao.ao <bao.ao@supwisdom.com>
Date: Tue, 20 Oct 2020 06:09:08 +0000 (+0800)
Subject: 修改 0.infras/0.0.2.infras-sba.yaml 处理镜像无法创建问题
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=eefd0605796368c39554dbf60be861e933ce111e;p=institute%2Fdeploy-authx-service.git

修改 0.infras/0.0.2.infras-sba.yaml 处理镜像无法创建问题
---

diff --git a/deploy-manifests/k8s-rancher/0.infras/0.0.2.infras-sba.yaml b/deploy-manifests/k8s-rancher/0.infras/0.0.2.infras-sba.yaml
index 70b3269..88b0de2 100644
--- a/deploy-manifests/k8s-rancher/0.infras/0.0.2.infras-sba.yaml
+++ b/deploy-manifests/k8s-rancher/0.infras/0.0.2.infras-sba.yaml
@@ -14,17 +14,6 @@ data:
   # sbanimda
   SBA_PASSWORD: c2JhbmltZGE=
 
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  namespace: base
-  name: spring-boot-admin-env
-data:
-  SERVER_PORT: "8080"
-
-
 ---
 apiVersion: v1
 kind: Service
@@ -46,6 +35,7 @@ spec:
       name: http-metrics
   selector:
     app: spring-boot-admin
+    
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -73,19 +63,15 @@ spec:
         - containerPort: 6060
           name: http-metrics
         envFrom:
-        - configMapRef:
-            name: jvm-env
-        - secretRef:
-            name: datasource-env-secret
         - secretRef:
             name: spring-boot-admin-env-secret
-        - configMapRef:
-            name: spring-boot-admin-env
         resources:
           requests:
-            memory: "400Mi"
+            cpu: 200m
+            memory: "256Mi"
           limits:
-            memory: "400Mi"
+            cpu: 1000m
+            memory: "256Mi"
         readinessProbe:
           tcpSocket:
             port: 8080
@@ -97,7 +83,6 @@ spec:
       imagePullSecrets:
         - name: harbor-registry
 
-
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -114,4 +99,3 @@ spec:
         backend:
           serviceName: spring-boot-admin-svc
           servicePort: http
-