update
diff --git a/charts/longhorn/templates/daemonset-sa.yaml b/charts/longhorn/templates/daemonset-sa.yaml
index f361d27..0bba120 100644
--- a/charts/longhorn/templates/daemonset-sa.yaml
+++ b/charts/longhorn/templates/daemonset-sa.yaml
@@ -45,6 +45,9 @@
- "{{ template "registry_url" . }}{{ .Values.image.longhorn.manager.repository }}:{{ .Values.image.longhorn.manager.tag }}"
- --service-account
- longhorn-service-account
+ {{- if .Values.preUpgradeChecker.upgradeVersionCheck}}
+ - --upgrade-version-check
+ {{- end }}
ports:
- containerPort: 9500
name: manager
@@ -60,16 +63,31 @@
port: 9501
scheme: HTTPS
volumeMounts:
+ - name: boot
+ mountPath: /host/boot/
+ readOnly: true
- name: dev
mountPath: /host/dev/
- name: proc
mountPath: /host/proc/
+ readOnly: true
+ - name: etc
+ mountPath: /host/etc/
+ readOnly: true
- name: longhorn
mountPath: /var/lib/longhorn/
mountPropagation: Bidirectional
- name: longhorn-grpc-tls
mountPath: /tls-files/
+ {{- if .Values.enableGoCoverDir }}
+ - name: go-cover-dir
+ mountPath: /go-cover-dir/
+ {{- end }}
env:
+ - name: POD_NAME
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.name
- name: POD_NAMESPACE
valueFrom:
fieldRef:
@@ -82,16 +100,36 @@
valueFrom:
fieldRef:
fieldPath: spec.nodeName
+ {{- if .Values.enableGoCoverDir }}
+ - name: GOCOVERDIR
+ value: /go-cover-dir/
+ {{- end }}
+ - name: pre-pull-share-manager-image
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ image: {{ template "registry_url" . }}{{ .Values.image.longhorn.shareManager.repository }}:{{ .Values.image.longhorn.shareManager.tag }}
+ command: ["sh", "-c", "echo share-manager image pulled && sleep infinity"]
volumes:
+ - name: boot
+ hostPath:
+ path: /boot/
- name: dev
hostPath:
path: /dev/
- name: proc
hostPath:
path: /proc/
+ - name: etc
+ hostPath:
+ path: /etc/
- name: longhorn
hostPath:
path: /var/lib/longhorn/
+ {{- if .Values.enableGoCoverDir }}
+ - name: go-cover-dir
+ hostPath:
+ path: /go-cover-dir/
+ type: DirectoryOrCreate
+ {{- end }}
- name: longhorn-grpc-tls
secret:
secretName: longhorn-grpc-tls
@@ -103,22 +141,22 @@
{{- if .Values.longhornManager.priorityClass }}
priorityClassName: {{ .Values.longhornManager.priorityClass | quote }}
{{- end }}
- {{- if or .Values.longhornManager.tolerations .Values.global.cattle.windowsCluster.enabled }}
+ {{- if or .Values.global.tolerations .Values.longhornManager.tolerations .Values.global.cattle.windowsCluster.enabled }}
tolerations:
{{- if and .Values.global.cattle.windowsCluster.enabled .Values.global.cattle.windowsCluster.tolerations }}
{{ toYaml .Values.global.cattle.windowsCluster.tolerations | indent 6 }}
{{- end }}
- {{- if .Values.longhornManager.tolerations }}
-{{ toYaml .Values.longhornManager.tolerations | indent 6 }}
+ {{- if or .Values.global.tolerations .Values.longhornManager.tolerations }}
+{{ default .Values.global.tolerations .Values.longhornManager.tolerations | toYaml | indent 6 }}
{{- end }}
{{- end }}
- {{- if or .Values.longhornManager.nodeSelector .Values.global.cattle.windowsCluster.enabled }}
+ {{- if or .Values.global.nodeSelector .Values.longhornManager.nodeSelector .Values.global.cattle.windowsCluster.enabled }}
nodeSelector:
{{- if and .Values.global.cattle.windowsCluster.enabled .Values.global.cattle.windowsCluster.nodeSelector }}
{{ toYaml .Values.global.cattle.windowsCluster.nodeSelector | indent 8 }}
{{- end }}
- {{- if .Values.longhornManager.nodeSelector }}
-{{ toYaml .Values.longhornManager.nodeSelector | indent 8 }}
+ {{- if or .Values.global.nodeSelector .Values.longhornManager.nodeSelector }}
+{{ default .Values.global.nodeSelector .Values.longhornManager.nodeSelector | toYaml | indent 8 }}
{{- end }}
{{- end }}
serviceAccountName: longhorn-service-account
@@ -139,7 +177,6 @@
{{- end }}
spec:
type: {{ .Values.service.manager.type }}
- sessionAffinity: ClientIP
selector:
app: longhorn-manager
ports: