From eefd0605796368c39554dbf60be861e933ce111e Mon Sep 17 00:00:00 2001 From: "bao.ao" Date: Tue, 20 Oct 2020 14:09:08 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=200.infras/0.0.2.infras-sba.y?= =?utf8?q?aml=20=E5=A4=84=E7=90=86=E9=95=9C=E5=83=8F=E6=97=A0=E6=B3=95?= =?utf8?q?=E5=88=9B=E5=BB=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../0.infras/0.0.2.infras-sba.yaml | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) 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 - -- 2.17.1