From 687d71f6083712865bcd0c88b9a7b53f6c4ee6dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Fri, 9 Oct 2020 15:32:45 +0800 Subject: [PATCH] =?utf8?q?chore:=20=E8=B0=83=E6=95=B4=E9=83=A8=E7=BD=B2?= =?utf8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E8=B5=84=E6=BA=90=EF=BC=88cpu?= =?utf8?q?=E3=80=81=E5=86=85=E5=AD=98=E7=AD=89=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../4.0.trans-service-v4-installer.yaml | 10 +++++----- .../5.trans-service-v4-datax-job.yaml | 10 +++++----- .../0.authx-service/9.poa-api-docs-installer.yaml | 10 +++++----- .../4.0.user-data-service-installer.yaml | 10 +++++----- .../2.user-data-service/4.1.user-data-service-poa.yaml | 4 ++-- .../4.0.user-authorization-installer.yaml | 10 +++++----- .../4.1.user-authorization-poa.yaml | 4 ++-- .../4.cas-server/4.0.cas-server-installer.yaml | 10 +++++----- .../4.cas-server/4.3.cas-server-security-engine.yaml | 4 ++-- .../4.cas-server/4.5.cas-server-site-webapp.yaml | 4 ++-- .../5.token-server/4.0.token-server-installer.yaml | 5 ----- .../5.token-server/4.1.token-server.yaml | 4 ++-- .../1.authx-service/9.jobs-server/4.1.jobs-server.yaml | 4 ++-- 13 files changed, 42 insertions(+), 47 deletions(-) diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/4.0.trans-service-v4-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/4.0.trans-service-v4-installer.yaml index 7a14465..f2a99b8 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/4.0.trans-service-v4-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/4.0.trans-service-v4-installer.yaml @@ -37,10 +37,10 @@ spec: name: datasource-env-secret - configMapRef: name: trans-installer-env - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" + # resources: + # requests: + # memory: "256Mi" + # limits: + # memory: "256Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/5.trans-service-v4-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/5.trans-service-v4-datax-job.yaml index 62581c7..e61d762 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/5.trans-service-v4-datax-job.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/0.0.trans-service-v4/5.trans-service-v4-datax-job.yaml @@ -45,11 +45,11 @@ spec: name: datasource-env-secret - configMapRef: name: trans-datax-job-env - resources: - # requests: - # memory: "400Mi" - # limits: - # memory: "400Mi" + # resources: + # requests: + # memory: "400Mi" + # limits: + # memory: "400Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml index 4fb013c..2b5d006 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/0.authx-service/9.poa-api-docs-installer.yaml @@ -36,10 +36,10 @@ spec: envFrom: - configMapRef: name: poa-api-docs-installer-env - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" + # resources: + # requests: + # memory: "256Mi" + # limits: + # memory: "256Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml index 4bd7ce5..cec2a98 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.0.user-data-service-installer.yaml @@ -37,10 +37,10 @@ spec: name: datasource-env-secret - configMapRef: name: user-data-service-installer-env - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" + # resources: + # requests: + # memory: "256Mi" + # limits: + # memory: "256Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml index b368dcf..17aa0f0 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.1.user-data-service-poa.yaml @@ -101,9 +101,9 @@ spec: name: user-data-service-poa-env resources: requests: - memory: "512Mi" + memory: "1024Mi" limits: - memory: "512Mi" + memory: "1024Mi" readinessProbe: httpGet: path: /actuator/health diff --git a/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml index 18c3ea7..09f8b68 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.0.user-authorization-installer.yaml @@ -37,11 +37,11 @@ spec: name: datasource-env-secret - configMapRef: name: user-authorization-installer-env - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" + # resources: + # requests: + # memory: "256Mi" + # limits: + # memory: "256Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.1.user-authorization-poa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.1.user-authorization-poa.yaml index f7b9639..9848b0e 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.1.user-authorization-poa.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.1.user-authorization-poa.yaml @@ -93,9 +93,9 @@ spec: name: user-authorization-poa-env resources: requests: - memory: "512Mi" + memory: "1024Mi" limits: - memory: "512Mi" + memory: "1024Mi" readinessProbe: httpGet: path: /actuator/health diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml index e735518..fd1f2f7 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml @@ -37,11 +37,11 @@ spec: name: datasource-env-secret - configMapRef: name: cas-server-installer-env - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" + # resources: + # requests: + # memory: "256Mi" + # limits: + # memory: "256Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml index 3154e2b..547ca77 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml @@ -80,9 +80,9 @@ spec: name: cas-server-security-engine-env-secret resources: requests: - memory: "400Mi" + memory: "512Mi" limits: - memory: "400Mi" + memory: "512Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml index dd3a7f1..de33456 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml @@ -222,9 +222,9 @@ spec: name: cas-server-site-webapp-env resources: requests: - memory: "800Mi" + memory: "6000Mi" limits: - memory: "800Mi" + memory: "6000Mi" readinessProbe: tcpSocket: port: 8080 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml index 5e7aa81..c198c45 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.0.token-server-installer.yaml @@ -37,11 +37,6 @@ spec: name: datasource-env-secret - configMapRef: name: token-server-installer-env - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" imagePullSecrets: - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml index 2bd9450..b428824 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml @@ -166,9 +166,9 @@ spec: name: token-server-env resources: requests: - memory: "512Mi" + memory: "1024Mi" limits: - memory: "512Mi" + memory: "1024Mi" readinessProbe: httpGet: path: /actuator/health diff --git a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml index 2124136..2e5cc4e 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/4.1.jobs-server.yaml @@ -183,9 +183,9 @@ spec: name: jobs-server-accounttrans2usersvcjob-env resources: requests: - memory: "1000Mi" + memory: "2000Mi" limits: - memory: "1000Mi" + memory: "2000Mi" imagePullSecrets: - name: harbor-registry -- 2.17.1