harbor: preserve required volume mounts
This commit is contained in:
parent
9743064ad3
commit
22e3004b0a
@ -369,15 +369,19 @@ spec:
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: harbor-core
|
name: harbor-core
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- $patch: replace
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
mountPath: /entrypoint.sh
|
mountPath: /entrypoint.sh
|
||||||
subPath: vault-entrypoint.sh
|
subPath: vault-entrypoint.sh
|
||||||
- name: secret-key
|
|
||||||
$patch: delete
|
|
||||||
- name: token-service-private-key
|
|
||||||
$patch: delete
|
|
||||||
- name: core-writable
|
- name: core-writable
|
||||||
mountPath: /etc/core
|
mountPath: /etc/core
|
||||||
|
- name: config
|
||||||
|
mountPath: /etc/core/app.conf
|
||||||
|
subPath: app.conf
|
||||||
|
- name: ca-download
|
||||||
|
mountPath: /etc/core/ca
|
||||||
|
- name: psc
|
||||||
|
mountPath: /etc/core/token
|
||||||
volumes:
|
volumes:
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
configMap:
|
configMap:
|
||||||
@ -415,9 +419,15 @@ spec:
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: harbor-jobservice-env
|
name: harbor-jobservice-env
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- $patch: replace
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
mountPath: /entrypoint.sh
|
mountPath: /entrypoint.sh
|
||||||
subPath: vault-entrypoint.sh
|
subPath: vault-entrypoint.sh
|
||||||
|
- name: jobservice-config
|
||||||
|
mountPath: /etc/jobservice/config.yml
|
||||||
|
subPath: config.yml
|
||||||
|
- name: job-logs
|
||||||
|
mountPath: /var/log/jobs
|
||||||
volumes:
|
volumes:
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
configMap:
|
configMap:
|
||||||
@ -449,13 +459,17 @@ spec:
|
|||||||
envFrom:
|
envFrom:
|
||||||
- $patch: replace
|
- $patch: replace
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- $patch: replace
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
mountPath: /entrypoint.sh
|
mountPath: /entrypoint.sh
|
||||||
subPath: vault-entrypoint.sh
|
subPath: vault-entrypoint.sh
|
||||||
- name: registry-htpasswd
|
|
||||||
$patch: delete
|
|
||||||
- name: registry-writable
|
- name: registry-writable
|
||||||
mountPath: /etc/registry
|
mountPath: /etc/registry
|
||||||
|
- name: registry-config
|
||||||
|
mountPath: /etc/registry/config.yml
|
||||||
|
subPath: config.yml
|
||||||
|
- name: registry-data
|
||||||
|
mountPath: /storage
|
||||||
- name: registryctl
|
- name: registryctl
|
||||||
command:
|
command:
|
||||||
- /entrypoint.sh
|
- /entrypoint.sh
|
||||||
@ -470,9 +484,18 @@ spec:
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: harbor-registryctl
|
name: harbor-registryctl
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- $patch: replace
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
mountPath: /entrypoint.sh
|
mountPath: /entrypoint.sh
|
||||||
subPath: vault-entrypoint.sh
|
subPath: vault-entrypoint.sh
|
||||||
|
- name: registry-config
|
||||||
|
mountPath: /etc/registry/config.yml
|
||||||
|
subPath: config.yml
|
||||||
|
- name: registry-config
|
||||||
|
mountPath: /etc/registryctl/config.yml
|
||||||
|
subPath: ctl-config.yml
|
||||||
|
- name: registry-data
|
||||||
|
mountPath: /storage
|
||||||
volumes:
|
volumes:
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
configMap:
|
configMap:
|
||||||
@ -541,9 +564,13 @@ spec:
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: harbor-core
|
name: harbor-core
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- $patch: replace
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
mountPath: /entrypoint.sh
|
mountPath: /entrypoint.sh
|
||||||
subPath: vault-entrypoint.sh
|
subPath: vault-entrypoint.sh
|
||||||
|
- name: config
|
||||||
|
mountPath: /etc/core/app.conf
|
||||||
|
subPath: app.conf
|
||||||
volumes:
|
volumes:
|
||||||
- name: harbor-vault-entrypoint
|
- name: harbor-vault-entrypoint
|
||||||
configMap:
|
configMap:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user