From 6ebe935bd02adfe19bb4406259be45c0adf506e4 Mon Sep 17 00:00:00 2001 From: shucheng Date: Tue, 30 Oct 2018 14:39:46 +0800 Subject: [PATCH] update --- templates/adminserver/adminserver-ss.yaml | 5 +++++ templates/database/database-ss.yaml | 7 ++++++- templates/jobservice/jobservice-dpl.yaml | 5 +++++ templates/notary/notary-server.yaml | 5 +++++ templates/notary/notary-signer.yaml | 5 +++++ templates/redis/redis.dp.yml | 9 ++++++++- templates/registry/registry-ss.yaml | 5 +++++ templates/ui/ui-dpl.yaml | 5 +++++ 8 files changed, 44 insertions(+), 2 deletions(-) diff --git a/templates/adminserver/adminserver-ss.yaml b/templates/adminserver/adminserver-ss.yaml index a07eb6e..6d906a8 100644 --- a/templates/adminserver/adminserver-ss.yaml +++ b/templates/adminserver/adminserver-ss.yaml @@ -46,7 +46,12 @@ spec: - name: adminserver-key mountPath: /etc/adminserver/key subPath: key + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime {{- if not .Values.persistence.enabled }} - name: data hostPath: diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml index 65742d6..73c3777 100644 --- a/templates/database/database-ss.yaml +++ b/templates/database/database-ss.yaml @@ -40,8 +40,13 @@ spec: volumeMounts: - name: data mountPath: /var/lib/postgresql/data - {{- if not .Values.persistence.enabled }} + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime + {{- if not .Values.persistence.enabled }} - name: data hostPath: path: /data/{{ .Release.Namespace }}/{{ .Release.Name }}/database diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml index b75de27..a99bcd3 100644 --- a/templates/jobservice/jobservice-dpl.yaml +++ b/templates/jobservice/jobservice-dpl.yaml @@ -37,7 +37,12 @@ spec: subPath: config.yml - name: job-logs mountPath: /var/log/jobs + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime - name: jobservice-config configMap: name: "{{ template "harbor.fullname" . }}-jobservice" diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml index 53bca97..4abac77 100644 --- a/templates/notary/notary-server.yaml +++ b/templates/notary/notary-server.yaml @@ -33,7 +33,12 @@ spec: - name: root-certificate mountPath: /root.crt subPath: tokenServiceRootCertBundle + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime - name: notary-config configMap: name: "{{ template "harbor.fullname" . }}-notary" diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml index a4450aa..db367c4 100644 --- a/templates/notary/notary-signer.yaml +++ b/templates/notary/notary-signer.yaml @@ -32,7 +32,12 @@ spec: volumeMounts: - name: notary-config mountPath: /etc/notary + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime - name: notary-config configMap: name: "{{ template "harbor.fullname" . }}-notary" diff --git a/templates/redis/redis.dp.yml b/templates/redis/redis.dp.yml index 0440eaf..83c3488 100644 --- a/templates/redis/redis.dp.yml +++ b/templates/redis/redis.dp.yml @@ -23,4 +23,11 @@ spec: args: ["--save","''","--appendonly","no"] ports: - name: redis - containerPort: 6379 \ No newline at end of file + containerPort: 6379 + volumeMounts: + - name: etc-localtime + mountPath: /etc/localtime + volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime \ No newline at end of file diff --git a/templates/registry/registry-ss.yaml b/templates/registry/registry-ss.yaml index 48f9300..1e7193d 100644 --- a/templates/registry/registry-ss.yaml +++ b/templates/registry/registry-ss.yaml @@ -97,7 +97,12 @@ spec: - name: registry-config mountPath: /etc/registry/config.yml subPath: config.yml + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime - name: registry-root-certificate secret: secretName: "{{ template "harbor.fullname" . }}-ui" diff --git a/templates/ui/ui-dpl.yaml b/templates/ui/ui-dpl.yaml index cb57232..5d014c0 100644 --- a/templates/ui/ui-dpl.yaml +++ b/templates/ui/ui-dpl.yaml @@ -67,7 +67,12 @@ spec: {{- end }} - name: psc mountPath: /etc/ui/token + - name: etc-localtime + mountPath: /etc/localtime volumes: + - name: etc-localtime + hostPath: + path: /etc/localtime - name: ui-config configMap: name: "{{ template "harbor.fullname" . }}-ui" -- 2.26.0