From: 刘洪青 <hongqing.liu@supwisdom.com>
Date: Thu, 24 Jun 2021 06:59:57 +0000 (+0800)
Subject: fix: 修正脚本错误
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=78b003b9acf441b19d42e0176a1901c0ba1a69ac;p=institute%2Fdeploy-authx-service.git

fix: 修正脚本错误
---

diff --git a/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.2.user-authorization-sa.yaml b/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.2.user-authorization-sa.yaml
index 9884f93..475a6f6 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.2.user-authorization-sa.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/3.user-authorization-service/4.2.user-authorization-sa.yaml
@@ -28,7 +28,7 @@ data:
 
 
   USER_AUTHORIZATION_SA_USER_RABBITMQ_CONSUMER_ENABLED: "false"
-  USER_AUTHORIZATION_SA_USER_RABBITMQ_HOST: rabbitmq-server.jobs-server.svc.cluster.local
+  USER_AUTHORIZATION_SA_USER_RABBITMQ_HOST: rabbitmq-server.authx-service.svc.cluster.local
   USER_AUTHORIZATION_SA_USER_RABBITMQ_PORT: "5672"
   USER_AUTHORIZATION_SA_USER_RABBITMQ_USERNAME: guest
   USER_AUTHORIZATION_SA_USER_RABBITMQ_PASSWORD: guest
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/1.token-server-env.yaml b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/1.token-server-env.yaml
index 0bbf852..304756b 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/1.token-server-env.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/1.token-server-env.yaml
@@ -36,3 +36,18 @@ data:
   SPRING_REDIS_HOST: cmVkaXMtc2VydmVy
   SPRING_REDIS_PORT: NjM3OQ==
   SPRING_REDIS_PASSWORD: OEt1d29zbE9pdXc3SA==
+
+
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: token-server
+  name: rabbitmq-env-secret
+type: Opaque
+data:
+  # 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/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 7892b01..98017ee 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
@@ -28,7 +28,7 @@ spec:
       containers:
       - name: token-server-installer
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/token-server/token-server-installer:1.2.0-SNAPSHOT
+        image: harbor.supwisdom.com/token-server/token-server-installer:1.2.0-RELEASE
         imagePullPolicy: Always
         envFrom:
         - configMapRef:
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 e0005b7..92fc7fd 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
@@ -106,6 +106,20 @@ data:
 
   TPAS_AGENT_SERVICE_SMS_SENDER_PATH: /api/v1/tpas/sms/console/send
 
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  namespace: token-server
+  name: token-server-env-secret
+type: Opaque
+data:
+  SPRING_RABBITMQ_HOST: cmFiYml0bXEtc2VydmVyLmF1dGh4LXNlcnZpY2Uuc3ZjLmNsdXN0ZXIubG9jYWw=
+  # rabbitmq-server.authx-service.svc.cluster.local
+  SPRING_RABBITMQ_PORT: NTY3Mg==
+  SPRING_RABBITMQ_USERNAME: Z3Vlc3Q=
+  SPRING_RABBITMQ_PASSWORD: Z3Vlc3Q=
+
 
 ---
 apiVersion: v1
@@ -148,7 +162,7 @@ spec:
       containers:
       - name: token-server
         # 若使用了学校搭设的私有仓库，请 **修改**
-        image: harbor.supwisdom.com/token-server/token-server:1.2.0-SNAPSHOT
+        image: harbor.supwisdom.com/token-server/token-server:1.2.0-RELEASE
         imagePullPolicy: Always
         ports:
         - containerPort: 8080
@@ -162,6 +176,8 @@ spec:
             name: datasource-env-secret
         - secretRef:
             name: redis-env-secret
+        - secretRef:
+            name: rabbitmq-env-secret
         - configMapRef:
             name: token-server-env
         resources:
diff --git a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml
index 0c988e1..d69badf 100644
--- a/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml
+++ b/deploy-manifests/k8s-rancher/1.authx-service/5.token-server/9.api-docs-installer.yaml
@@ -36,7 +36,7 @@ spec:
       containers:
       - name: api-docs-installer
         # 若使用了学校搭设的私有仓库，请修改
-        image: harbor.supwisdom.com/token-server/api-docs-installer:1.2.0-SNAPSHOT
+        image: harbor.supwisdom.com/token-server/api-docs-installer:1.2.0-RELEASE
         imagePullPolicy: Always
         envFrom:
         - configMapRef: