Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Test release #18

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions charts/monitor/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
name: monitor
home: https://github.com/teamhephy/monitor
version: <Will be populated by the ci before publishing the chart>
version: 2.11.6
description: Monitoring for Hephy Workflow.
maintainers:
- email: [email protected]
- name: Team Hephy
email: [email protected]
6 changes: 4 additions & 2 deletions charts/monitor/charts/grafana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
name: grafana
home: https://github.com/teamhephy/monitor/tree/master/grafana
version: <Will be populated by the ci before publishing the chart>
version: 2.11.6
description: Monitoring for Hephy Workflow.
maintainers:
- email: [email protected]
- name: Team Hephy
email: [email protected]
9 changes: 0 additions & 9 deletions charts/monitor/charts/grafana/templates/_helpers.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,3 @@ extensions/v1beta1
apps/v1
{{- end -}}
{{- end -}}
{{- define "APIVersion" -}}
{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
apps/v1
{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
extensions/v1beta1
{{- else -}}
apps/v1
{{- end -}}
{{- end -}}
6 changes: 4 additions & 2 deletions charts/monitor/charts/influxdb/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
name: influxdb
home: https://github.com/teamhephy/monitor/tree/master/influxdb
version: <Will be populated by the ci before publishing the chart>
version: 2.11.6
description: Monitoring for Hephy Workflow.
maintainers:
- email: [email protected]
- name: Team Hephy
email: [email protected]
9 changes: 0 additions & 9 deletions charts/monitor/charts/influxdb/templates/_helpers.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,3 @@ extensions/v1beta1
apps/v1
{{- end -}}
{{- end -}}
{{- define "APIVersion" -}}
{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
apps/v1
{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
extensions/v1beta1
{{- else -}}
apps/v1
{{- end -}}
{{- end -}}
8 changes: 5 additions & 3 deletions charts/monitor/charts/telegraf/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: v2
name: telegraf
home: https://github.com/teamhephy/monitor/tree/master/telegraf
version: <Will be populated by the ci before publishing the chart>
description: Monitoring for Deis Workflow.
version: 2.11.6
description: Monitoring for Hephy Workflow.
maintainers:
- email: [email protected]
- name: Team Hephy
email: [email protected]
9 changes: 0 additions & 9 deletions charts/monitor/charts/telegraf/templates/_helpers.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,3 @@ extensions/v1beta1
apps/v1
{{- end -}}
{{- end -}}
{{- define "APIVersion" -}}
{{- if .Capabilities.APIVersions.Has "apps/v1" -}}
apps/v1
{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" -}}
extensions/v1beta1
{{- else -}}
apps/v1
{{- end -}}
{{- end -}}
12 changes: 6 additions & 6 deletions charts/monitor/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
grafana:
org: "hephy"
pull_policy: "Always"
docker_tag: canary
pull_policy: "IfNotPresent"
docker_tag: v2.11.2
allow_sign_up: "true"
# limits_cpu: "100m"
# limits_memory: "50Mi"
Expand All @@ -11,8 +11,8 @@ grafana:
size: 5Gi
influxdb:
org: "hephy"
pull_policy: "Always"
docker_tag: canary
pull_policy: "IfNotPresent"
docker_tag: v2.11.2
# limits_cpu: "100m"
# limits_memory: "50Mi"
url: "my.influx.url"
Expand All @@ -25,8 +25,8 @@ influxdb:
size: 20Gi
telegraf:
org: "hephy"
pull_policy: "Always"
docker_tag: canary
pull_policy: "IfNotPresent"
docker_tag: v2.11.2
# limits_cpu: "100m"
# limits_memory: "50Mi"

Expand Down