Skip to content

Commit

Permalink
helm-hub: Merge pull request logicmonitor#30 in DEV/k8s-helm-charts f…
Browse files Browse the repository at this point in the history
…rom feature/DEV-62719-helm-chart-updates-allow-for-pod-priorityclass to develop

* commit '38aa383f4d7346d74fa17bbebdd6d4ef0a8a29e1':
  DEV-62719 added priorityClassName in Argus & Collectorset-controller helm charts
  • Loading branch information
pranay-lonkar-logicmonitor authored and vkumbhar94 committed Sep 2, 2020
1 parent dc376cc commit 183d666
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 20 deletions.
2 changes: 1 addition & 1 deletion argus/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v3
description: Automated Kubernetes monitoring
name: argus
version: 0.10.0
version: 0.11.0
kubeVersion: ">= 1.14.0-0"
maintainers:
- name: LogicMonitor
Expand Down
2 changes: 2 additions & 0 deletions argus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Optional Values:
- **proxyURL (default: `""`):** The Http/s proxy url.
- **proxyUser (default: `""`):** The Http/s proxy username.
- **proxyPass (default: `""`):** The Http/s proxy password.
- **priorityClassName (default: `""`):** The priority class name for Pod priority. If this parameter is set then user must have PriorityClass resource created otherwise Pod will be rejected.
- **collector.imageRepository (default: `logicmonitor/collector`):** The image repository of the collector.
- **collector.imageTag (default: `latest`):** The image tag of the collector.
- **collector.imagePullPolicy (default: `Always`):** The image pull policy of the collector.
Expand All @@ -67,3 +68,4 @@ Optional Values:
- **collector.proxyURL (default: `""`):** The Http/s proxy url of the collectors.
- **collector.proxyUser (default: `""`):** The Http/s proxy username of the collectors.
- **collector.proxyPass (default: `""`):** The Http/s proxy password of the collectors.
- **collector.priorityClassName (default: `""`):** The priority class name for Pod priority of the collector. If this parameter is set then user must have PriorityClass resource created otherwise Pod will be rejected.
3 changes: 3 additions & 0 deletions argus/templates/collectorset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@ spec:
{{- end }}
{{- if .Values.collector.proxyUser }}
secretName: {{ required "A valid .Values.collector.secretName entry is required!" .Values.collector.secretName }}
{{- end }}
{{- if .Values.collector.priorityClassName }}
priorityClassName: {{ .Values.collector.priorityClassName }}
{{- end }}
3 changes: 3 additions & 0 deletions argus/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
containers:
- name: argus
Expand Down
2 changes: 2 additions & 0 deletions argus/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ debug: false
enableRBAC: true
nodeSelector: {}
affinity: {}
priorityClassName: ""
collector:
imageRepository: logicmonitor/collector
imageTag: latest
imagePullPolicy: Always
secretName: collector
priorityClassName: ""
2 changes: 1 addition & 1 deletion collectorset-controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v3
description: Automated collector management
name: collectorset-controller
version: 0.5.0
version: 0.6.0
kubeVersion: ">= 1.14.0-0"
maintainers:
- name: LogicMonitor
Expand Down
3 changes: 2 additions & 1 deletion collectorset-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ Optional Values:
- **imageTag:** The collectorset-controller image tag to use.
- **proxyURL (default: `""`):** The Http/s proxy url.
- **proxyUser (default: `""`):** The Http/s proxy username.
- **proxyPass (default: `""`):** The Http/s proxy password.
- **proxyPass (default: `""`):** The Http/s proxy password.
- **priorityClassName (default: `""`):** The priority class name for Pod priority. If this parameter is set then user must have PriorityClass resource created otherwise Pod will be rejected.
3 changes: 3 additions & 0 deletions collectorset-controller/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ spec:
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
containers:
- name: collectorset-controller
Expand Down
1 change: 1 addition & 0 deletions collectorset-controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ debug: false
enableRBAC: true
nodeSelector: {}
affinity: {}
priorityClassName: ""
Binary file added docs/argus-0.11.0.tgz
Binary file not shown.
Binary file added docs/collectorset-controller-0.6.0.tgz
Binary file not shown.
58 changes: 41 additions & 17 deletions docs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,19 @@ apiVersion: v1
entries:
argus:
- apiVersion: v3
created: "2020-06-12T17:46:43.092279+05:30"
created: "2020-07-27T14:29:30.710898+05:30"
description: Automated Kubernetes monitoring
digest: 31767c41016ec9b67a8dc5fe1fa42db1f908b59a97cd7565410385425c036951
kubeVersion: '>= 1.14.0-0'
maintainers:
- email: [email protected]
name: LogicMonitor
name: argus
urls:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.11.0.tgz
version: 0.11.0
- apiVersion: v3
created: "2020-07-27T14:29:30.710485+05:30"
description: Automated Kubernetes monitoring
digest: 2076904bb28cf1be4d01adf4ece12fa87ccae30d057aadc4460b586a15bf0326
kubeVersion: '>= 1.14.0-0'
Expand All @@ -14,7 +26,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.10.0.tgz
version: 0.10.0
- apiVersion: v1
created: "2020-06-12T17:46:43.095876+05:30"
created: "2020-07-27T14:29:30.714482+05:30"
description: Automated Kubernetes monitoring
digest: e776eb48d576f2425918397fa292a25402962556cdc3422d33105d2204d644d1
maintainers:
Expand All @@ -25,7 +37,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.9.0.tgz
version: 0.9.0
- apiVersion: v1
created: "2020-06-12T17:46:43.09543+05:30"
created: "2020-07-27T14:29:30.714072+05:30"
description: Automated Kubernetes monitoring
digest: 8a4a410afa317710c283d95c85020338859ae0a2075779edb7b473144683c6d9
maintainers:
Expand All @@ -36,7 +48,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.8.0.tgz
version: 0.8.0
- apiVersion: v1
created: "2020-06-12T17:46:43.094994+05:30"
created: "2020-07-27T14:29:30.713645+05:30"
description: Automated Kubernetes monitoring
digest: a08c828e6adf6531cc1c19fdeaef8c931892254fecb3ed690ba7e1a71ed592cd
maintainers:
Expand All @@ -47,7 +59,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.7.0.tgz
version: 0.7.0
- apiVersion: v1
created: "2020-06-12T17:46:43.094561+05:30"
created: "2020-07-27T14:29:30.713281+05:30"
description: Automated Kubernetes monitoring
digest: 5f0b9bf61fce9f0c29f228cc96a80e288e91564e83c558a53435194338162054
maintainers:
Expand All @@ -58,7 +70,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.6.0.tgz
version: 0.6.0
- apiVersion: v1
created: "2020-06-12T17:46:43.09417+05:30"
created: "2020-07-27T14:29:30.712925+05:30"
description: Automated Kubernetes monitoring
digest: 651cd27e9174432dccdfa6c1ba6f976af8617407080c7d815dd16cd1643f683e
maintainers:
Expand All @@ -69,7 +81,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.5.0.tgz
version: 0.5.0
- apiVersion: v1
created: "2020-06-12T17:46:43.093765+05:30"
created: "2020-07-27T14:29:30.712556+05:30"
description: Automated Kubernetes monitoring
digest: 1b69a545be0e7eb20930c0850f54ba5259a730eabf40e186970295730bbad598
maintainers:
Expand All @@ -80,7 +92,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.4.0.tgz
version: 0.4.0
- apiVersion: v1
created: "2020-06-12T17:46:43.093356+05:30"
created: "2020-07-27T14:29:30.712177+05:30"
description: Automated Kubernetes monitoring
digest: f6a794f1222ab9aac475538765a8694e74f7caa81b78541533503db26ad5221f
maintainers:
Expand All @@ -91,7 +103,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.3.0.tgz
version: 0.3.0
- apiVersion: v1
created: "2020-06-12T17:46:43.092917+05:30"
created: "2020-07-27T14:29:30.711808+05:30"
description: Automated Kubernetes monitoring
digest: 316c7c7d17085a65027667ef4a053062c3b2304b12f2f7e178b1f633baef73b0
maintainers:
Expand All @@ -102,7 +114,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/argus-0.2.0.tgz
version: 0.2.0
- apiVersion: v1
created: "2020-06-12T17:46:43.091662+05:30"
created: "2020-07-27T14:29:30.710056+05:30"
description: Automated Kubernetes monitoring
digest: b5e475acc633064f72e56d604bceb181920e194372807ed7e7384b4b75a8a8eb
maintainers:
Expand All @@ -114,7 +126,19 @@ entries:
version: 0.1.0
collectorset-controller:
- apiVersion: v3
created: "2020-06-12T17:46:43.098568+05:30"
created: "2020-07-27T14:29:30.716688+05:30"
description: Automated collector management
digest: 7227705f9288235c0a8fc6a12c0f1fc3a4ab52b5ef690b4ab9b9e3a3e0ac133a
kubeVersion: '>= 1.14.0-0'
maintainers:
- email: [email protected]
name: LogicMonitor
name: collectorset-controller
urls:
- https://logicmonitor.github.com/k8s-helm-charts/collectorset-controller-0.6.0.tgz
version: 0.6.0
- apiVersion: v3
created: "2020-07-27T14:29:30.716305+05:30"
description: Automated collector management
digest: 02776cbf28588a1789fb74a8281a932735f20bb49a5f8fa40d1f888712688845
kubeVersion: '>= 1.14.0-0'
Expand All @@ -126,7 +150,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/collectorset-controller-0.5.0.tgz
version: 0.5.0
- apiVersion: v3
created: "2020-06-12T17:46:43.098066+05:30"
created: "2020-07-27T14:29:30.715944+05:30"
description: Automated collector management
digest: 077d1aa7e185c12b7eae362a92e75cbf7cee34c085e45a6cca1f577573c6dbf3
kubeVersion: '>= 1.14.0-0'
Expand All @@ -138,7 +162,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/collectorset-controller-0.4.0.tgz
version: 0.4.0
- apiVersion: v1
created: "2020-06-12T17:46:43.097566+05:30"
created: "2020-07-27T14:29:30.715576+05:30"
description: Automated collector management
digest: 0f2bac595c0d506685d66b8018fa769c66f7197794f17f8f08a394b71db5abc9
maintainers:
Expand All @@ -149,7 +173,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/collectorset-controller-0.3.0.tgz
version: 0.3.0
- apiVersion: v1
created: "2020-06-12T17:46:43.09714+05:30"
created: "2020-07-27T14:29:30.715203+05:30"
description: Automated collector management
digest: 46f1e1eaa4cc60d24074e6bcc01479f089aec4dbdef20850343afc495c653eba
maintainers:
Expand All @@ -160,7 +184,7 @@ entries:
- https://logicmonitor.github.com/k8s-helm-charts/collectorset-controller-0.2.0.tgz
version: 0.2.0
- apiVersion: v1
created: "2020-06-12T17:46:43.096706+05:30"
created: "2020-07-27T14:29:30.714847+05:30"
description: Automated collector management
digest: f73f02ba9a2eccdc4e2d1f52ec2e6c986ecf9375d103a5103f2e46a827949d82
maintainers:
Expand All @@ -172,12 +196,12 @@ entries:
version: 0.1.0
releasemanager:
- apiVersion: v1
created: "2020-06-12T17:46:43.099692+05:30"
created: "2020-07-27T14:29:30.717526+05:30"
description: Release Manager provides a long-running application that will periodically
poll the Tiller server installed in your cluster.
digest: a22275d1372c9352a3e1902eef56c4725c60cdb29f7044f992fd29ff70756a70
name: releasemanager
urls:
- https://logicmonitor.github.com/k8s-helm-charts/releasemanager-0.1.0.tgz
version: 0.1.0
generated: "2020-06-12T17:46:43.090929+05:30"
generated: "2020-07-27T14:29:30.708599+05:30"

0 comments on commit 183d666

Please sign in to comment.