Sync chart files from 1.1.2

Signed-off-by: David Ko <dko@suse.com>
signaleleven · Aug 23, 2021 · 00848b4 · 00848b4
1 parent 6b6bbc9
commit 00848b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 24 deletions.
diff --git a/chart/questions.yml b/chart/questions.yml
@@ -65,7 +65,7 @@ questions:
     label: Longhorn Share Manager Image Repository
     group: "Longhorn Images Settings"
   - variable: image.longhorn.shareManager.tag
-    default: v1_20210416
+    default: v1_20210820
     description: "Specify Longhorn Share Manager Image Tag"
     type: string
     label: Longhorn Share Manager Image Tag
@@ -77,7 +77,7 @@ questions:
     label: Longhorn Backing Image Manager Image Repository
     group: "Longhorn Images Settings"
   - variable: image.longhorn.backingImageManager.tag
-    default: v2_20210809
+    default: v2_20210820
     description: "Specify Longhorn Backing Image Manager Image Tag"
     type: string
     label: Longhorn Backing Image Manager Image Tag
@@ -89,7 +89,7 @@ questions:
     label: Longhorn CSI Attacher Image Repository
     group: "Longhorn CSI Driver Images"
   - variable: image.csi.attacher.tag
-    default: v2.2.1-lh1
+    default: v2.2.1-lh2
     description: "Specify CSI attacher image tag. Leave blank to autodetect."
     type: string
     label: Longhorn CSI Attacher Image Tag
@@ -101,7 +101,7 @@ questions:
     label: Longhorn CSI Provisioner Image Repository
     group: "Longhorn CSI Driver Images"
   - variable: image.csi.provisioner.tag
-    default: v1.6.0-lh1
+    default: v1.6.0-lh2
     description: "Specify CSI provisioner image tag. Leave blank to autodetect."
     type: string
     label: Longhorn CSI Provisioner Image Tag
@@ -125,7 +125,7 @@ questions:
     label: Longhorn CSI Driver Resizer Image Repository
     group: "Longhorn CSI Driver Images"
   - variable: image.csi.resizer.tag
-    default: v0.5.1-lh1
+    default: v0.5.1-lh2
     description: "Specify CSI Driver Resizer image tag. Leave blank to autodetect."
     type: string
     label: Longhorn CSI Driver Resizer Image Tag
@@ -137,7 +137,7 @@ questions:
     label: Longhorn CSI Driver Snapshotter Image Repository
     group: "Longhorn CSI Driver Images"
   - variable: image.csi.snapshotter.tag
-    default: v2.1.1-lh1
+    default: v2.1.1-lh2
     description: "Specify CSI Driver Snapshotter image tag. Leave blank to autodetect."
     type: string
     label: Longhorn CSI Driver Snapshotter Image Tag
@@ -350,16 +350,6 @@ If disabled, Longhorn will not delete the workload pod that is managed by a cont
     group: "Longhorn Default Settings"
     type: boolean
     default: "true"
-  - variable: defaultSettings.volumeAttachmentRecoveryPolicy
-    label: Volume Attachment Recovery Policy
-    description: "Defines the Longhorn action when a Volume is stuck with a Deployment Pod on a failed node. `wait` leads to the deletion of the volume attachment as soon as the pods deletion time has passed. `never` is the default Kubernetes behavior of never deleting volume attachments on terminating pods. `immediate` leads to the deletion of the volume attachment as soon as all workload pods are pending. By default wait."
-    group: "Longhorn Default Settings"
-    type: enum
-    options:
-    - "wait"
-    - "never"
-    - "immediate"
-    default: "wait"
   - variable: defaultSettings.nodeDownPodDeletionPolicy
     label: Pod Deletion Policy When Node is Down
     description: "Defines the Longhorn action when a Volume is stuck with a StatefulSet/Deployment Pod on a node that is down.

diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml
@@ -18,7 +18,6 @@ data:
     upgrade-checker: {{ .Values.defaultSettings.upgradeChecker }}
     default-replica-count: {{ .Values.defaultSettings.defaultReplicaCount }}
     default-data-locality: {{ .Values.defaultSettings.defaultDataLocality }}
-    guaranteed-engine-cpu: {{ .Values.defaultSettings.guaranteedEngineCPU }}
     default-longhorn-static-storage-class: {{ .Values.defaultSettings.defaultLonghornStaticStorageClass }}
     backupstore-poll-interval: {{ .Values.defaultSettings.backupstorePollInterval }}
     taint-toleration: {{ .Values.defaultSettings.taintToleration }}
@@ -28,7 +27,6 @@ data:
     auto-delete-pod-when-volume-detached-unexpectedly: {{ .Values.defaultSettings.autoDeletePodWhenVolumeDetachedUnexpectedly }}
     disable-scheduling-on-cordoned-node: {{ .Values.defaultSettings.disableSchedulingOnCordonedNode }}
     replica-zone-soft-anti-affinity: {{ .Values.defaultSettings.replicaZoneSoftAntiAffinity }}
-    volume-attachment-recovery-policy: {{ .Values.defaultSettings.volumeAttachmentRecoveryPolicy }}
     node-down-pod-deletion-policy: {{ .Values.defaultSettings.nodeDownPodDeletionPolicy }}
     allow-node-drain-with-last-healthy-replica: {{ .Values.defaultSettings.allowNodeDrainWithLastHealthyReplica }}
     mkfs-ext4-parameters: {{ .Values.defaultSettings.mkfsExt4Parameters }}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -28,19 +28,19 @@ image:
   csi:
     attacher:
       repository: longhornio/csi-attacher
-      tag: v2.2.1-lh1
+      tag: v2.2.1-lh2
     provisioner:
       repository: longhornio/csi-provisioner
-      tag: v1.6.0-lh1
+      tag: v1.6.0-lh2
     nodeDriverRegistrar:
       repository: longhornio/csi-node-driver-registrar
       tag: v1.2.0-lh1
     resizer:
       repository: longhornio/csi-resizer
-      tag: v0.5.1-lh1
+      tag: v0.5.1-lh2
     snapshotter:
       repository: longhornio/csi-snapshotter
-      tag: v2.1.1-lh1
+      tag: v2.1.1-lh2
   pullPolicy: IfNotPresent
 
 service:
@@ -79,7 +79,6 @@ defaultSettings:
   storageMinimalAvailablePercentage: ~
   upgradeChecker: ~
   defaultReplicaCount: ~
-  guaranteedEngineCPU: ~
   defaultLonghornStaticStorageClass: ~
   backupstorePollInterval: ~
   taintToleration: ~
@@ -89,7 +88,6 @@ defaultSettings:
   autoDeletePodWhenVolumeDetachedUnexpectedly: ~
   disableSchedulingOnCordonedNode: ~
   replicaZoneSoftAntiAffinity: ~
-  volumeAttachmentRecoveryPolicy: ~
   nodeDownPodDeletionPolicy: ~
   allowNodeDrainWithLastHealthyReplica: ~
   mkfsExt4Parameters: ~