chore: 整理用户授权V1.2 k8s部署脚本
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 73b9740..dcf76b5 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
@@ -16,88 +16,88 @@
.dockerconfigjson: eyJhdXRocyI6eyJoYXJib3Iuc3Vwd2lzZG9tLmNvbSI6eyJwYXNzd29yZCI6IlBXTWdQODVxaUxGQyIsInVzZXJuYW1lIjoicmFuY2hlci5kZXZvcHMifX19
-####################################################
-# rabbitmq-server
-####################################################
+# ####################################################
+# # rabbitmq-server
+# ####################################################
----
-apiVersion: v1
-kind: Secret
-metadata:
- labels:
- app: rabbitmq
- release: rabbitmq-server
- name: rabbitmq-server
- namespace: jobs-server
-type: Opaque
-data:
- RABBITMQ_USERNAME: Z3Vlc3Q=
- RABBITMQ_PASSWORD: Z3Vlc3Q=
+# ---
+# apiVersion: v1
+# kind: Secret
+# metadata:
+# labels:
+# app: rabbitmq
+# release: rabbitmq-server
+# name: rabbitmq-server
+# namespace: jobs-server
+# type: Opaque
+# data:
+# RABBITMQ_USERNAME: Z3Vlc3Q=
+# RABBITMQ_PASSWORD: Z3Vlc3Q=
----
-apiVersion: v1
-kind: Service
-metadata:
- name: rabbitmq-server
- namespace: jobs-server
- 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: jobs-server
-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
- # 若使用了学校搭设的私有仓库，请增加以下配置（取消注释即可）
- # imagePullSecrets:
- # - name: harbor-registry
+# ---
+# apiVersion: v1
+# kind: Service
+# metadata:
+# name: rabbitmq-server
+# namespace: jobs-server
+# 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: jobs-server
+# 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
+# # 若使用了学校搭设的私有仓库，请增加以下配置（取消注释即可）
+# # imagePullSecrets:
+# # - name: harbor-registry
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/1.jobs-server-env.yaml b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/1.jobs-server-env.yaml
index 7ac9df8..10ece22 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/1.jobs-server-env.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/9.jobs-server/1.jobs-server-env.yaml
@@ -17,7 +17,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=