From bee14e9c868d7b07e54b39b92e444863ae596ed7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= <hongqing.liu@supwisdom.com>
Date: Fri, 29 Jan 2021 23:26:59 +0800
Subject: [PATCH] =?utf8?q?chore:=20=E5=AE=8C=E5=96=84rabbitmq=E3=80=81redi?=
 =?utf8?q?s=20=E7=9A=84k8s=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC=EF=BC=8C?=
 =?utf8?q?=E4=BC=98=E5=8C=96=E8=B5=84=E6=BA=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../0.user-data-service-base.yaml             | 23 +++++++++++++++++++
 .../1.user-data-service-env.yaml              |  2 +-
 .../9.jobs-server/0.jobs-server-base.yaml     | 15 ++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/0.user-data-service-base.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/0.user-data-service-base.yaml
index 91edf43..10e2c6c 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/0.user-data-service-base.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/0.user-data-service-base.yaml
@@ -124,6 +124,11 @@ spec:
         - containerPort: 6379
           name: redis
           protocol: TCP
+        resources:
+          requests:
+            memory: "1024Mi"
+          limits:
+            memory: "1024Mi"
         readinessProbe:
           exec:
             command:
@@ -217,6 +222,19 @@ spec:
     spec:
       containers:
       - name: rabbitmq-server
+        env:
+        - name: RABBITMQ_VM_MEMORY_HIGH_WATERMARK
+          value: "0.6"
+        - name: RABBITMQ_DEFAULT_USER
+          valueFrom:
+            secretKeyRef:
+              name: rabbitmq-server
+              key: RABBITMQ_USERNAME
+        - name: RABBITMQ_DEFAULT_PASS
+          valueFrom:
+            secretKeyRef:
+              name: rabbitmq-server
+              key: RABBITMQ_PASSWORD
         # 若使用了学校搭设的私有仓库，请修改
         image: rabbitmq:management
         # 若使用了学校搭设的私有仓库，请修改 为 Always
@@ -227,6 +245,11 @@ spec:
           name: tcp-1
         - containerPort: 15672
           name: tcp-2
+        resources:
+          requests:
+            memory: "1024Mi"
+          limits:
+            memory: "1024Mi"
       # 若使用了学校搭设的私有仓库，请增加以下配置（取消注释即可）
       # imagePullSecrets:
       #   - name: harbor-registry
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml
index 39f22fa..4077154 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/1.user-data-service-env.yaml
@@ -42,8 +42,8 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: rabbitmq-env-secret
   namespace: user-data-service
+  name: rabbitmq-env-secret
 type: Opaque
 data:
   SPRING_RABBITMQ_HOST: cmFiYml0bXEtc2VydmVy
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/0.jobs-server-base.yaml b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/0.jobs-server-base.yaml
index d3f82f8..73b9740 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/0.jobs-server-base.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/0.jobs-server-base.yaml
@@ -19,6 +19,7 @@ data:
 ####################################################
 # rabbitmq-server
 ####################################################
+
 ---
 apiVersion: v1
 kind: Secret
@@ -32,6 +33,7 @@ type: Opaque
 data:
   RABBITMQ_USERNAME: Z3Vlc3Q=
   RABBITMQ_PASSWORD: Z3Vlc3Q=
+
 ---
 apiVersion: v1
 kind: Service
@@ -72,6 +74,19 @@ spec:
     spec:
       containers:
       - name: rabbitmq-server
+        env:
+        - name: RABBITMQ_VM_MEMORY_HIGH_WATERMARK
+          value: "0.6"
+        - name: RABBITMQ_DEFAULT_USER
+          valueFrom:
+            secretKeyRef:
+              name: rabbitmq-server
+              key: RABBITMQ_USERNAME
+        - name: RABBITMQ_DEFAULT_PASS
+          valueFrom:
+            secretKeyRef:
+              name: rabbitmq-server
+              key: RABBITMQ_PASSWORD
         # 若使用了学校搭设的私有仓库，请修改
         image: rabbitmq:management
         # 若使用了学校搭设的私有仓库，请修改 为 Always
-- 
2.17.1