ivampiresp/longhorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove longhorn-default-settings from manifests

Browse Source 
Longhorn 2570
Longhorn 3488

Signed-off-by: Derek Su <derek.su@suse.com>
This commit is contained in:
Derek Su 2022-05-31 23:25:54 +08:00 committed by David Ko
parent 7f675a365d
commit 0ed376c4cc
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chart/templates/daemonset-sa.yaml
View File

@ -54,8 +54,6 @@ spec:
- name: longhorn - name: longhorn
mountPath: /var/lib/longhorn/ mountPath: /var/lib/longhorn/
mountPropagation: Bidirectional mountPropagation: Bidirectional
- name: longhorn-default-setting
mountPath: /var/lib/longhorn-setting/
env: env:
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
@ -69,8 +67,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: DEFAULT_SETTING_PATH
value: /var/lib/longhorn-setting/default-setting.yaml
volumes: volumes:
- name: dev - name: dev
hostPath: hostPath:
@ -81,9 +77,6 @@ spec:
- name: longhorn - name: longhorn
hostPath: hostPath:
path: /var/lib/longhorn/ path: /var/lib/longhorn/
- name: longhorn-default-setting
configMap:
name: longhorn-default-setting
{{- if .Values.privateRegistry.registrySecret }} {{- if .Values.privateRegistry.registrySecret }}
imagePullSecrets: imagePullSecrets:
- name: {{ .Values.privateRegistry.registrySecret }} - name: {{ .Values.privateRegistry.registrySecret }}

8
deploy/longhorn.yaml
View File

@ -982,8 +982,6 @@ spec:
- name: longhorn - name: longhorn
mountPath: /var/lib/longhorn/ mountPath: /var/lib/longhorn/
mountPropagation: Bidirectional mountPropagation: Bidirectional
- name: longhorn-default-setting
mountPath: /var/lib/longhorn-setting/
env: env:
- name: POD_NAMESPACE - name: POD_NAMESPACE
valueFrom: valueFrom:
@ -997,9 +995,6 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
# Should be: mount path of the volume longhorn-default-setting + the key of the configmap data in 04-default-setting.yaml
- name: DEFAULT_SETTING_PATH
value: /var/lib/longhorn-setting/default-setting.yaml
volumes: volumes:
- name: dev - name: dev
hostPath: hostPath:
@ -1010,9 +1005,6 @@ spec:
- name: longhorn - name: longhorn
hostPath: hostPath:
path: /var/lib/longhorn/ path: /var/lib/longhorn/
- name: longhorn-default-setting
configMap:
name: longhorn-default-setting
# imagePullSecrets: # imagePullSecrets:
# - name: "" # - name: ""
# priorityClassName: # priorityClassName: