Skip to content

Commit

Permalink
Merge pull request #3 from ttpcodes/master
Browse files Browse the repository at this point in the history
Revert "charts: sync v1.0.1-rc1 of longhorn chart"
  • Loading branch information
ttpcodes authored Jul 15, 2020
2 parents cca8b1f + c379565 commit c57f54c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 25 deletions.
4 changes: 2 additions & 2 deletions charts/longhorn/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: longhorn
version: 1.0.1-rc1
appVersion: v1.0.1-rc1
version: 1.0.0
appVersion: v1.0.0
kubeVersion: ">=v1.14.0-r0"
description: Longhorn is a distributed block storage system for Kubernetes powered by Rancher Labs.
keywords:
Expand Down
14 changes: 4 additions & 10 deletions charts/longhorn/questions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ questions:
label: Longhorn Manager Image Name
group: "Longhorn Images Settings"
- variable: image.longhorn.managerTag
default: v1.0.1-rc1
default: v1.0.0
description: "Specify Longhorn Manager Image Tag"
type: string
label: Longhorn Manager Image Tag
Expand All @@ -29,7 +29,7 @@ questions:
label: Longhorn Engine Image Name
group: "Longhorn Images Settings"
- variable: image.longhorn.engineTag
default: v1.0.1-rc1
default: v1.0.0
description: "Specify Longhorn Engine Image Tag"
type: string
label: Longhorn Engine Image Tag
Expand All @@ -41,7 +41,7 @@ questions:
label: Longhorn UI Image Name
group: "Longhorn Images Settings"
- variable: image.longhorn.uiTag
default: v1.0.1-rc1
default: v1.0.0
description: "Specify Longhorn UI Image Tag"
type: string
label: Longhorn UI Image Tag
Expand Down Expand Up @@ -239,12 +239,6 @@ WARNING: DO NOT CHANGE THIS SETTING WITH ATTACHED VOLUMES.'
group: "Longhorn Default Settings"
type: string
default: ""
- variable: defaultSettings.priorityClass
label: Priority Class
description: "The name of the Priority Class to set on the Longhorn workloads. This can help prevent Longhorn workloads from being evicted under Node Pressure. WARNING: DO NOT CHANGE THIS SETTING WITH ATTACHED VOLUMES."
group: "Longhorn Default Settings"
type: string
default: ""
- variable: defaultSettings.autoSalvage
label: Automatic salvage
description: "If enabled, volumes will be automatically salvaged when all the replicas become faulty e.g. due to network disconnection. Longhorn will try to figure out which replica(s) are usable, then use them for the volume. By default true."
Expand Down Expand Up @@ -305,7 +299,7 @@ WARNING: DO NOT CHANGE THIS SETTING WITH ATTACHED VOLUMES.'
show_if: "ingress.enabled=false"
group: "Services and Load Balancing"
show_subquestion_if: "NodePort"
subquestions:
subquestions:
- variable: service.ui.nodePort
default: ""
description: "NodePort port number(to set explicitly, choose port between 30000-32767)"
Expand Down
7 changes: 2 additions & 5 deletions charts/longhorn/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
Longhorn is now installed on the cluster!

Please wait a few minutes for other Longhorn components such as CSI deployments, Engine Images, and Instance Managers to be initialized.

Visit our documentation at https://longhorn.io/docs/
1. Get the application URL by running these commands:
kubectl get po -n $release_namespace
3 changes: 0 additions & 3 deletions charts/longhorn/templates/clusterrole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ rules:
- apiGroups: ["batch"]
resources: ["jobs", "cronjobs"]
verbs: ["*"]
- apiGroups: ["scheduling.k8s.io"]
resources: ["priorityclasses"]
verbs: ["watch", "list"]
- apiGroups: ["storage.k8s.io"]
resources: ["storageclasses", "volumeattachments", "csinodes", "csidrivers"]
verbs: ["*"]
Expand Down
1 change: 0 additions & 1 deletion charts/longhorn/templates/default-setting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ data:
default-longhorn-static-storage-class: {{ .Values.defaultSettings.defaultLonghornStaticStorageClass }}
backupstore-poll-interval: {{ .Values.defaultSettings.backupstorePollInterval }}
taint-toleration: {{ .Values.defaultSettings.taintToleration }}
priority-class: {{ .Values.defaultSettings.priorityClass }}
registry-secret: {{ .Values.defaultSettings.registrySecret }}
auto-salvage: {{ .Values.defaultSettings.autoSalvage }}
disable-scheduling-on-cordoned-node: {{ .Values.defaultSettings.disableSchedulingOnCordonedNode }}
Expand Down
7 changes: 3 additions & 4 deletions charts/longhorn/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
image:
longhorn:
engine: longhornio/longhorn-engine
engineTag: v1.0.1-rc1
engineTag: v1.0.0
manager: longhornio/longhorn-manager
managerTag: v1.0.1-rc1
managerTag: v1.0.0
ui: longhornio/longhorn-ui
uiTag: v1.0.1-rc1
uiTag: v1.0.0
instanceManager: longhornio/longhorn-instance-manager
instanceManagerTag: v1_20200514
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -49,7 +49,6 @@ defaultSettings:
defaultLonghornStaticStorageClass: ~
backupstorePollInterval: ~
taintToleration: ~
priorityClass: ~
registrySecret: ~
autoSalvage: ~
disableSchedulingOnCordonedNode: ~
Expand Down

0 comments on commit c57f54c

Please sign in to comment.