chore: 完善rabbitmq、redis 的k8s部署脚本，优化资源设置
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 @@
- containerPort: 6379
name: redis
protocol: TCP
+ resources:
+ requests:
+ memory: "1024Mi"
+ limits:
+ memory: "1024Mi"
readinessProbe:
exec:
command:
@@ -217,6 +222,19 @@
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 @@
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 @@
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 @@
####################################################
# rabbitmq-server
####################################################
+
---
apiVersion: v1
kind: Secret
@@ -32,6 +33,7 @@
data:
RABBITMQ_USERNAME: Z3Vlc3Q=
RABBITMQ_PASSWORD: Z3Vlc3Q=
+
---
apiVersion: v1
kind: Service
@@ -72,6 +74,19 @@
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