From 6bf6e65d36cbfd7ec80fcae5338543f1c661ca2e Mon Sep 17 00:00:00 2001 From: william Date: Fri, 14 Jun 2024 02:13:35 +0800 Subject: [PATCH] 1 --- base/mysql/mysql-statefulset.yaml | 2 -- base/phpmyadmin/phpmyadmin-deployment.yaml | 2 -- base/projects/stock2/admin-deployment.yaml | 2 +- base/projects/stock2/agent-deployment.yaml | 2 +- base/projects/stock2/api-deployment.yaml | 2 +- base/projects/stock2/h5-deployment.yaml | 2 +- base/projects/stock2/market-deployment.yaml | 2 +- base/projects/stock2/task-deployment.yaml | 2 +- base/secret/juyou-docker-tcr-secret.yaml | 9 +++++++++ base/secret/kustomization.yaml | 3 ++- 10 files changed, 17 insertions(+), 11 deletions(-) create mode 100644 base/secret/juyou-docker-tcr-secret.yaml diff --git a/base/mysql/mysql-statefulset.yaml b/base/mysql/mysql-statefulset.yaml index 39ad399..737e4da 100644 --- a/base/mysql/mysql-statefulset.yaml +++ b/base/mysql/mysql-statefulset.yaml @@ -23,8 +23,6 @@ spec: value: "utf8mb4" - name: MYSQL_COLLATION_SERVER value: "utf8mb4_unicode_ci" - - name: TZ - value: "Asia/Seoul" args: - "--character-set-server=utf8mb4" - "--collation-server=utf8mb4_unicode_ci" diff --git a/base/phpmyadmin/phpmyadmin-deployment.yaml b/base/phpmyadmin/phpmyadmin-deployment.yaml index 26c6c5d..18e6ef4 100644 --- a/base/phpmyadmin/phpmyadmin-deployment.yaml +++ b/base/phpmyadmin/phpmyadmin-deployment.yaml @@ -18,7 +18,5 @@ spec: env: - name: PMA_HOST value: "mysql-service" - - name: TZ - value: "Asia/Seoul" ports: - containerPort: 80 \ No newline at end of file diff --git a/base/projects/stock2/admin-deployment.yaml b/base/projects/stock2/admin-deployment.yaml index 9c3736f..cff8035 100644 --- a/base/projects/stock2/admin-deployment.yaml +++ b/base/projects/stock2/admin-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: stock2-web-admin - image: juyoutech/stock2_web_admin:latest + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_admin:latest ports: - containerPort: 80 resources: diff --git a/base/projects/stock2/agent-deployment.yaml b/base/projects/stock2/agent-deployment.yaml index 2def401..8327528 100644 --- a/base/projects/stock2/agent-deployment.yaml +++ b/base/projects/stock2/agent-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: stock2-web-agent - image: juyoutech/stock2_web_agent:latest + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_agent:latest ports: - containerPort: 80 resources: diff --git a/base/projects/stock2/api-deployment.yaml b/base/projects/stock2/api-deployment.yaml index 45c7112..606a4b5 100644 --- a/base/projects/stock2/api-deployment.yaml +++ b/base/projects/stock2/api-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: stock2-java-api - image: juyoutech/stock2_java_api:latest + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:latest env: - name: MARKET_HOST value: "http://india-stock-market-service:31099" diff --git a/base/projects/stock2/h5-deployment.yaml b/base/projects/stock2/h5-deployment.yaml index 505d34a..174f385 100644 --- a/base/projects/stock2/h5-deployment.yaml +++ b/base/projects/stock2/h5-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: stock2-web-h5 - image: juyoutech/stock2_web_h5:latest + image: juyou.tencentcloudcr.com/juyoutech/stock2_web_h5:latest ports: - containerPort: 80 resources: diff --git a/base/projects/stock2/market-deployment.yaml b/base/projects/stock2/market-deployment.yaml index 2c753b3..40a6cfb 100644 --- a/base/projects/stock2/market-deployment.yaml +++ b/base/projects/stock2/market-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: stock2-java-market - image: juyoutech/stock2_java_market:latest + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_market:latest env: - name: MARKET_HOST value: "http://india-stock-market-service:31099" diff --git a/base/projects/stock2/task-deployment.yaml b/base/projects/stock2/task-deployment.yaml index bd71b80..c9c03c1 100644 --- a/base/projects/stock2/task-deployment.yaml +++ b/base/projects/stock2/task-deployment.yaml @@ -14,7 +14,7 @@ spec: spec: containers: - name: stock2-java-task - image: juyoutech/stock2_java_api:latest + image: juyou.tencentcloudcr.com/juyoutech/stock2_java_api:latest env: - name: MARKET_HOST value: "http://india-stock-market-service:31099" diff --git a/base/secret/juyou-docker-tcr-secret.yaml b/base/secret/juyou-docker-tcr-secret.yaml new file mode 100644 index 0000000..4759525 --- /dev/null +++ b/base/secret/juyou-docker-tcr-secret.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +data: + .dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL2luZGV4LmRvY2tlci5pby92MS8iOnsidXNlcm5hbWUiOiJqdXlvdXRlY2giLCJwYXNzd29yZCI6ImRja3JfcGF0XzJWeHJjODBzbU5EWERYODdhMmNmNXlOUUlZRSIsImVtYWlsIjoid2lsbGlhbUBqdXlvdTg4LmNvbSIsImF1dGgiOiJhblY1YjNWMFpXTm9PbVJqYTNKZmNHRjBYekpXZUhKak9EQnpiVTVFV0VSWU9EZGhNbU5tTlhsT1VVbFpSUT09In0sImh0dHBzOi8vanV5b3UudGVuY2VudGNsb3VkY3IuY29tL3YyLyI6eyJ1c2VybmFtZSI6IjIwMDAzMDY4NzA1OSIsInBhc3N3b3JkIjoiZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNklrNUxUVUk2U0RWUE5qcEhRamRYT2xKYU1sYzZSVmRNVlRwTlUwaEtPa3hWVnpRNk5rWkhRenBZV1ZGUE9saFRObG82U1ZwUFVUcFFSVFZhSW4wLmV5SnZkMjVsY2xWcGJpSTZJakl3TURBek1EWTROekExT1NJc0ltOXdaWEpoZEc5eVZXbHVJam9pTWpBd01ETXdOamczTURVNUlpd2lkRzlyWlc1SlpDSTZJbU53YkRBd01XSTRhMk5uY3pGbk0yMXpOV0ZuSWl3aVpYaHdJam95TURNek5UZ3lPRFV6TENKdVltWWlPakUzTVRneU1qSTROVE1zSW1saGRDSTZNVGN4T0RJeU1qZzFNMzAub2xwbnd5RmNyUmtiVHRDLXNEc3l3QVpGTm5qUmtOeGxtMWFKYlpMenozbkpoVndYS0dwQkhqTVd0QUtFQmpwdnBvZDNjTDZSNEpSTWZjMzRydEdvUk9BNy1RQnkwUnBUUi05UmlIRExkNjJTMHp1cnVpbDIzTmJiNDFBWmZLLWZXMGYyYlVGbk9xQnB4TGUwa2FKeUZoZ0hrdlNTek1UdnhnR1ZKNGNwY3hBc1BhUXJLenJhTUpRQUx6SWVySG5OekJ3Ry04RVhKRU5QT3J4ak5QT0V6ZTNnVXJiSF9NUE8yR2xjS1BvNWVNU1E5S3hSbWJFamhZOWg3SmxkQ3NiRVJVNDNrb2VrWTBfM2tFNTR3ZzBIWWhQUG5TZHpVUFdCdmNoaGQ2ZUwxZnhqRHRLazhxN2lvQllSdW5EYzFHQ3NaREw4SlRjWjlXbEdSVmlRNkJqOTNRIiwiZW1haWwiOiJ3aWxsaWFtQGp1eW91ODguY29tIiwiYXV0aCI6Ik1qQXdNRE13TmpnM01EVTVPbVY1U21oaVIyTnBUMmxLVTFWNlNURk9hVWx6U1cxMGNGcERTVFpKYXpWTVZGVkpObE5FVmxCT2FuQklVV3BrV0U5c1NtRk5iR00yVWxaa1RWWlVjRTVWTUdoTFQydDRWbFo2VVRaT2ExcElVWHB3V1ZkV1JsQlBiR2hVVG14dk5sTldjRkJWVkhCUlVsUldZVWx1TUM1bGVVcDJaREkxYkdOc1ZuQmlhVWsyU1dwSmQwMUVRWHBOUkZrMFRucEJNVTlUU1hOSmJUbDNXbGhLYUdSSE9YbFdWMngxU1dwdmFVMXFRWGROUkUxM1RtcG5NMDFFVlRWSmFYZHBaRWM1Y2xwWE5VcGFRMGsyU1cxT2QySkVRWGROVjBrMFlUSk9ibU42Um01Tk1qRjZUbGRHYmtscGQybGFXR2gzU1dwdmVVMUVUWHBPVkdkNVQwUlZla3hEU25WWmJWbHBUMnBGTTAxVVozbE5ha2swVGxSTmMwbHRiR2hrUTBrMlRWUmplRTlFU1hsTmFtY3hUVE13TG05c2NHNTNlVVpqY2xKcllsUjBReTF6UkhONWQwRmFSazV1YWxKclRuaHNiVEZoU21KYVRIcDZNMjVLYUZaM1dFdEhjRUpJYWsxWGRFRkxSVUpxY0had2IyUXpZMHcyVWpSS1VrMW1Zek0wY25SSGIxSlBRVGN0VVVKNU1GSndWRkl0T1ZKcFNFUk1aRFl5VXpCNmRYSjFhV3d5TTA1aVlqUXhRVnBtU3kxbVZ6Qm1NbUpWUm01UGNVSndlRXhsTUd0aFNubEdhR2RJYTNaVFUzcE5WSFo0WjBkV1NqUmpjR040UVhOUVlWRnlTM3B5WVUxS1VVRk1la2xsY2todVRucENkMGN0T0VWWVNrVk9VRTl5ZUdwT1VFOUZlbVV6WjFWeVlraGZUVkJQTWtkc1kwdFFielZsVFZOUk9VdDRVbTFpUldwb1dUbG9OMHBzWkVOellrVlNWVFF6YTI5bGExa3dYek5yUlRVMGQyY3dTRmxvVUZCdVUyUjZWVkJYUW5aamFHaGtObVZNTVdaNGFrUjBTMnM0Y1RkcGIwSlpVblZ1UkdNeFIwTnpXa1JNT0VwVVkxbzVWMnhIVWxacFVUWkNhamt6VVE9PSJ9fX0= +kind: Secret +metadata: + name: juyou-docker-tcr-secret +type: kubernetes.io/dockerconfigjson + + diff --git a/base/secret/kustomization.yaml b/base/secret/kustomization.yaml index 10285da..f2f90e9 100644 --- a/base/secret/kustomization.yaml +++ b/base/secret/kustomization.yaml @@ -1,2 +1,3 @@ resources: - - juyoutech-docker-hub-secret.yaml \ No newline at end of file + - juyoutech-docker-hub-secret.yaml + - juyou-docker-tcr-secret.yaml \ No newline at end of file