chore: 整理用户授权V1.2 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 10e2c6c..a9d74c3 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
@@ -166,90 +166,90 @@
-####################################################
-# rabbitmq-server
-####################################################
----
-apiVersion: v1
-kind: Secret
-metadata:
- labels:
- app: rabbitmq
- release: rabbitmq-server
- name: rabbitmq-server
- namespace: user-data-service
-type: Opaque
-data:
- RABBITMQ_USERNAME: Z3Vlc3Q=
- RABBITMQ_PASSWORD: Z3Vlc3Q=
----
-apiVersion: v1
-kind: Service
-metadata:
- name: rabbitmq-server
- namespace: user-data-service
- labels:
- app: rabbitmq-server
-spec:
- ports:
- - port: 5672
- targetPort: tcp-1
- protocol: TCP
- name: tcp-1
- - port: 15672
- targetPort: tcp-2
- protocol: TCP
- name: tcp-2
- selector:
- app: rabbitmq-server
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: rabbitmq-server
- namespace: user-data-service
-spec:
- selector:
- matchLabels:
- app: rabbitmq-server
- replicas: 1
- template:
- metadata:
- labels:
- app: rabbitmq-server
- annotations:
- sidecar.istio.io/inject: "false"
- 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
- imagePullPolicy: IfNotPresent
- # imagePullPolicy: Always
- ports:
- - containerPort: 5672
- name: tcp-1
- - containerPort: 15672
- name: tcp-2
- resources:
- requests:
- memory: "1024Mi"
- limits:
- memory: "1024Mi"
- # 若使用了学校搭设的私有仓库，请增加以下配置（取消注释即可）
- # imagePullSecrets:
- # - name: harbor-registry
+# ####################################################
+# # rabbitmq-server
+# ####################################################
+# ---
+# apiVersion: v1
+# kind: Secret
+# metadata:
+# labels:
+# app: rabbitmq
+# release: rabbitmq-server
+# name: rabbitmq-server
+# namespace: user-data-service
+# type: Opaque
+# data:
+# RABBITMQ_USERNAME: Z3Vlc3Q=
+# RABBITMQ_PASSWORD: Z3Vlc3Q=
+# ---
+# apiVersion: v1
+# kind: Service
+# metadata:
+# name: rabbitmq-server
+# namespace: user-data-service
+# labels:
+# app: rabbitmq-server
+# spec:
+# ports:
+# - port: 5672
+# targetPort: tcp-1
+# protocol: TCP
+# name: tcp-1
+# - port: 15672
+# targetPort: tcp-2
+# protocol: TCP
+# name: tcp-2
+# selector:
+# app: rabbitmq-server
+# ---
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+# name: rabbitmq-server
+# namespace: user-data-service
+# spec:
+# selector:
+# matchLabels:
+# app: rabbitmq-server
+# replicas: 1
+# template:
+# metadata:
+# labels:
+# app: rabbitmq-server
+# annotations:
+# sidecar.istio.io/inject: "false"
+# 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
+# imagePullPolicy: IfNotPresent
+# # imagePullPolicy: Always
+# ports:
+# - containerPort: 5672
+# 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 4077154..0f7e6e2 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
@@ -46,7 +46,8 @@
name: rabbitmq-env-secret
type: Opaque
data:
- SPRING_RABBITMQ_HOST: cmFiYml0bXEtc2VydmVy
+ # rabbitmq-server.authx-service.svc.cluster.local
+ SPRING_RABBITMQ_HOST: cmFiYml0bXEtc2VydmVyLmF1dGh4LXNlcnZpY2Uuc3ZjLmNsdXN0ZXIubG9jYWw=
SPRING_RABBITMQ_PORT: NTY3Mg==
SPRING_RABBITMQ_USERNAME: Z3Vlc3Q=
SPRING_RABBITMQ_PASSWORD: Z3Vlc3Q=
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
index b084b83..b9ee81d 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.2.user-data-service-goa.yaml
@@ -39,7 +39,7 @@
# 推送数据到 jobs-server 的配置
JOBS_RABBITMQ_ENABLED: "false"
- JOBS_RABBITMQ_HOST: rabbitmq-server.jobs-server.svc.cluster.local
+ JOBS_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local
JOBS_RABBITMQ_PORT: "5672"
JOBS_RABBITMQ_USERNAME: guest
JOBS_RABBITMQ_PASSWORD: guest
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
index 430cbf0..0c18a15 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/4.3.user-data-service-biz.yaml
@@ -108,6 +108,8 @@
name: jvm-env
- secretRef:
name: datasource-env-secret
+ - secretRef:
+ name: rabbitmq-env-secret
- configMapRef:
name: user-data-service-biz-env
resources:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
index 3a749a4..c8243c8 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/2.user-data-service/5.user-data-service-datax-job.yaml
@@ -24,7 +24,7 @@
name: user-data-service-datax-job
namespace: user-data-service
spec:
- schedule: "10 */1 * * *"
+ schedule: "30 */4 * * *"
jobTemplate:
metadata:
labels: