From: 刘洪青 Date: Sat, 26 Jun 2021 03:45:20 +0000 (+0800) Subject: chore: cas-server 认证，更新镜像版本 1.2.0-RELEASE X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=e3de3a25574888618db937ecbb9c0c90a01b27f6;p=institute%2Fdeploy-authx-service.git chore: cas-server 认证，更新镜像版本 1.2.0-RELEASE --- diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml index da84302..6b1c9f5 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.0.cas-server-installer.yaml @@ -28,7 +28,7 @@ spec: containers: - name: cas-server-installer # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-installer:1.2.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-installer:1.2.0-RELEASE imagePullPolicy: Always envFrom: - configMapRef: diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml index fa3ddbe..6ccb453 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml @@ -95,7 +95,7 @@ spec: containers: - name: cas-server-sa-api # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.2.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-sa-api:1.2.0-RELEASE imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml index 76ce2e5..8626670 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.3.cas-server-security-engine.yaml @@ -62,7 +62,7 @@ spec: containers: - name: cas-server-security-engine # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.2.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-security-engine:1.2.0-RELEASE imagePullPolicy: Always ports: - containerPort: 6060 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml deleted file mode 100644 index ae12ab2..0000000 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.4.cas-server-uidws.yaml +++ /dev/null @@ -1,113 +0,0 @@ -# 4.4.cas-server-uidws.yaml - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - namespace: cas-server - name: cas-server-uidws-env -data: - SERVER_PORT: "8080" - SSL_ENABLED: "false" - #SSL_KEYSTORE_FILE: file:/certs/server/server.keystore - #SSL_KEYSTORE_PASSWORD: "" - #SSL_TRUSTSTORE_FILE: file:/certs/server/server.truststore - #SSL_TRUSTSTORE_PASSWORD: "" - - SERVER_MAXHTTPHEADERSIZE: "10240" - - SERVER_TOMCAT_ACCEPT_COUNT: "100" - SERVER_TOMCAT_MAX_CONNECTIONS: "10000" - SERVER_TOMCAT_MAX_THREADS: "200" - SERVER_TOMCAT_MIN_SPARE_THREADS: "10" - - - UIDWS_APPKEYSECRET: "1:1,2:2" - - - USER_DATA_SERVICE_SA_API_SERVER_URL: http://user-data-service-goa-svc.user-data-service.svc.cluster.local:8080 - USER_DATA_SERVICE_SA_API_CLIENT_AUTH_ENABLED: "false" - #USER_DATA_SERVICE_SA_API_CLIENT_AUTH_KEYSTORE_FILE: file:/certs/client/client.keystore - #USER_DATA_SERVICE_SA_API_CLIENT_AUTH_TRUSTSTORE_FILE: file:/certs/client/client.truststore - ---- -apiVersion: v1 -kind: Secret -metadata: - namespace: cas-server - name: cas-server-uidws-env-secret -type: Opaque -data: - #USER_DATA_SERVICE_SA_API_CLIENT_AUTH_KEY_PASSWORD: Y2xpZW50 - #USER_DATA_SERVICE_SA_API_CLIENT_AUTH_KEYSTORE_PASSWORD: Y2xpZW50 - #USER_DATA_SERVICE_SA_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD: Y2xpZW50 - ---- -apiVersion: v1 -kind: Service -metadata: - namespace: cas-server - name: cas-server-uidws-svc - labels: - app: cas-server-uidws - needMonitor: 'true' -spec: - ports: - - port: 8080 - targetPort: http - protocol: TCP - name: http - - port: 6060 - targetPort: http-metrics - protocol: TCP - name: http-metrics - selector: - app: cas-server-uidws ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cas-server-uidws - namespace: cas-server -spec: - selector: - matchLabels: - app: cas-server-uidws - replicas: 1 - template: - metadata: - labels: - app: cas-server-uidws - spec: - containers: - - name: cas-server-uidws - image: harbor.supwisdom.com/cas-server/cas-server-uidws:1.2.0-SNAPSHOT - imagePullPolicy: Always - ports: - - containerPort: 8080 - name: http - - containerPort: 6060 - name: http-metrics - envFrom: - - configMapRef: - name: jvm-env - - configMapRef: - name: cas-server-uidws-env - - secretRef: - name: cas-server-uidws-env-secret - resources: - requests: - memory: "512Mi" - limits: - memory: "512Mi" - readinessProbe: - httpGet: - path: /uidws/actuator/health - port: 8080 - initialDelaySeconds: 20 - periodSeconds: 5 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 10 - imagePullSecrets: - - name: harbor-registry diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml index 5a4334a..1b19f4c 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.5.cas-server-site-webapp.yaml @@ -223,7 +223,7 @@ spec: containers: - name: cas-server-site-webapp # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.2.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-site-webapp:1.2.0-RELEASE imagePullPolicy: Always ports: - containerPort: 8080 diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml index 5ea231e..648048b 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.6.cas-server-site-scheme.yaml @@ -95,7 +95,7 @@ spec: memory: "256Mi" - name: cas-server-site-scheme-generator # 根据情况修改镜像地址 - image: harbor.supwisdom.com/cas-server/cas-server-site-scheme:1.2.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-site-scheme:1.2.0-RELEASE imagePullPolicy: Always envFrom: - configMapRef: diff --git a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml index 448d3d2..9f94793 100644 --- a/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml +++ b/deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/5.cas-server-datax-job.yaml @@ -42,7 +42,7 @@ spec: containers: - name: cas-server-datax-job # 若使用了学校搭设的私有仓库，请修改 - image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.2.0-SNAPSHOT + image: harbor.supwisdom.com/cas-server/cas-server-datax-job:1.2.0-RELEASE imagePullPolicy: Always envFrom: - configMapRef: