From 543c9b114e0011ec88bedc2317483f14ed1d0d0a Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 12:39:10 -0400 Subject: [PATCH 1/4] tag 2.11.3 Signed-off-by: Kingdon Barrett --- charts/monitor/Chart.yaml | 2 +- charts/monitor/charts/grafana/Chart.yaml | 2 +- charts/monitor/charts/influxdb/Chart.yaml | 2 +- charts/monitor/charts/telegraf/Chart.yaml | 2 +- charts/monitor/values.yaml | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/monitor/Chart.yaml b/charts/monitor/Chart.yaml index 896c09a..87414bb 100644 --- a/charts/monitor/Chart.yaml +++ b/charts/monitor/Chart.yaml @@ -1,6 +1,6 @@ name: monitor home: https://github.com/teamhephy/monitor -version: +version: 2.11.3 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/grafana/Chart.yaml b/charts/monitor/charts/grafana/Chart.yaml index 3996943..034414f 100644 --- a/charts/monitor/charts/grafana/Chart.yaml +++ b/charts/monitor/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ name: grafana home: https://github.com/teamhephy/monitor/tree/master/grafana -version: +version: 2.11.3 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/influxdb/Chart.yaml b/charts/monitor/charts/influxdb/Chart.yaml index d4cda29..bc70933 100644 --- a/charts/monitor/charts/influxdb/Chart.yaml +++ b/charts/monitor/charts/influxdb/Chart.yaml @@ -1,6 +1,6 @@ name: influxdb home: https://github.com/teamhephy/monitor/tree/master/influxdb -version: +version: 2.11.3 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/telegraf/Chart.yaml b/charts/monitor/charts/telegraf/Chart.yaml index f4a0f94..3165305 100644 --- a/charts/monitor/charts/telegraf/Chart.yaml +++ b/charts/monitor/charts/telegraf/Chart.yaml @@ -1,6 +1,6 @@ name: telegraf home: https://github.com/teamhephy/monitor/tree/master/telegraf -version: +version: 2.11.3 description: Monitoring for Deis Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/values.yaml b/charts/monitor/values.yaml index 6d82e26..8350e7c 100644 --- a/charts/monitor/values.yaml +++ b/charts/monitor/values.yaml @@ -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" @@ -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" @@ -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" From cfa46dc020f76502e67b20d9f6d914bc980c3b1f Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 13:10:35 -0400 Subject: [PATCH 2/4] tag 2.11.4 Signed-off-by: Kingdon Barrett --- charts/monitor/Chart.yaml | 2 +- charts/monitor/charts/telegraf/Chart.yaml | 2 +- charts/monitor/charts/telegraf/templates/_helpers.tmpl | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/charts/monitor/Chart.yaml b/charts/monitor/Chart.yaml index 87414bb..dad34ef 100644 --- a/charts/monitor/Chart.yaml +++ b/charts/monitor/Chart.yaml @@ -1,6 +1,6 @@ name: monitor home: https://github.com/teamhephy/monitor -version: 2.11.3 +version: 2.11.4 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/telegraf/Chart.yaml b/charts/monitor/charts/telegraf/Chart.yaml index 3165305..8b75129 100644 --- a/charts/monitor/charts/telegraf/Chart.yaml +++ b/charts/monitor/charts/telegraf/Chart.yaml @@ -1,6 +1,6 @@ name: telegraf home: https://github.com/teamhephy/monitor/tree/master/telegraf -version: 2.11.3 +version: 2.11.4 description: Monitoring for Deis Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/telegraf/templates/_helpers.tmpl b/charts/monitor/charts/telegraf/templates/_helpers.tmpl index aa15095..6006a69 100644 --- a/charts/monitor/charts/telegraf/templates/_helpers.tmpl +++ b/charts/monitor/charts/telegraf/templates/_helpers.tmpl @@ -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 -}} From 44bbcf77dcb66ff0afcf2a24a7e9c38153b25749 Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 13:21:09 -0400 Subject: [PATCH 3/4] tag 2.11.5 Signed-off-by: Kingdon Barrett --- charts/monitor/Chart.yaml | 2 +- charts/monitor/charts/grafana/Chart.yaml | 2 +- charts/monitor/charts/grafana/templates/_helpers.tmpl | 9 --------- charts/monitor/charts/influxdb/Chart.yaml | 2 +- charts/monitor/charts/influxdb/templates/_helpers.tmpl | 9 --------- 5 files changed, 3 insertions(+), 21 deletions(-) diff --git a/charts/monitor/Chart.yaml b/charts/monitor/Chart.yaml index dad34ef..1b740d9 100644 --- a/charts/monitor/Chart.yaml +++ b/charts/monitor/Chart.yaml @@ -1,6 +1,6 @@ name: monitor home: https://github.com/teamhephy/monitor -version: 2.11.4 +version: 2.11.5 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/grafana/Chart.yaml b/charts/monitor/charts/grafana/Chart.yaml index 034414f..ad89ae5 100644 --- a/charts/monitor/charts/grafana/Chart.yaml +++ b/charts/monitor/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ name: grafana home: https://github.com/teamhephy/monitor/tree/master/grafana -version: 2.11.3 +version: 2.11.4 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/grafana/templates/_helpers.tmpl b/charts/monitor/charts/grafana/templates/_helpers.tmpl index aa15095..6006a69 100644 --- a/charts/monitor/charts/grafana/templates/_helpers.tmpl +++ b/charts/monitor/charts/grafana/templates/_helpers.tmpl @@ -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 -}} diff --git a/charts/monitor/charts/influxdb/Chart.yaml b/charts/monitor/charts/influxdb/Chart.yaml index bc70933..65cd85b 100644 --- a/charts/monitor/charts/influxdb/Chart.yaml +++ b/charts/monitor/charts/influxdb/Chart.yaml @@ -1,6 +1,6 @@ name: influxdb home: https://github.com/teamhephy/monitor/tree/master/influxdb -version: 2.11.3 +version: 2.11.4 description: Monitoring for Hephy Workflow. maintainers: - email: team@teamhephy.com diff --git a/charts/monitor/charts/influxdb/templates/_helpers.tmpl b/charts/monitor/charts/influxdb/templates/_helpers.tmpl index aa15095..6006a69 100644 --- a/charts/monitor/charts/influxdb/templates/_helpers.tmpl +++ b/charts/monitor/charts/influxdb/templates/_helpers.tmpl @@ -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 -}} From 1d5b70f54f153ec5f1558bef1c77fc20f50a8b6b Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Tue, 26 Sep 2023 16:31:01 -0400 Subject: [PATCH 4/4] tag 2.11.6 Signed-off-by: Kingdon Barrett --- charts/monitor/Chart.yaml | 6 ++++-- charts/monitor/charts/grafana/Chart.yaml | 6 ++++-- charts/monitor/charts/influxdb/Chart.yaml | 6 ++++-- charts/monitor/charts/telegraf/Chart.yaml | 8 +++++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/charts/monitor/Chart.yaml b/charts/monitor/Chart.yaml index 1b740d9..a3c4025 100644 --- a/charts/monitor/Chart.yaml +++ b/charts/monitor/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 name: monitor home: https://github.com/teamhephy/monitor -version: 2.11.5 +version: 2.11.6 description: Monitoring for Hephy Workflow. maintainers: - - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com diff --git a/charts/monitor/charts/grafana/Chart.yaml b/charts/monitor/charts/grafana/Chart.yaml index ad89ae5..951f6cc 100644 --- a/charts/monitor/charts/grafana/Chart.yaml +++ b/charts/monitor/charts/grafana/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 name: grafana home: https://github.com/teamhephy/monitor/tree/master/grafana -version: 2.11.4 +version: 2.11.6 description: Monitoring for Hephy Workflow. maintainers: - - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com diff --git a/charts/monitor/charts/influxdb/Chart.yaml b/charts/monitor/charts/influxdb/Chart.yaml index 65cd85b..6bbd0fd 100644 --- a/charts/monitor/charts/influxdb/Chart.yaml +++ b/charts/monitor/charts/influxdb/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 name: influxdb home: https://github.com/teamhephy/monitor/tree/master/influxdb -version: 2.11.4 +version: 2.11.6 description: Monitoring for Hephy Workflow. maintainers: - - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com diff --git a/charts/monitor/charts/telegraf/Chart.yaml b/charts/monitor/charts/telegraf/Chart.yaml index 8b75129..babf57d 100644 --- a/charts/monitor/charts/telegraf/Chart.yaml +++ b/charts/monitor/charts/telegraf/Chart.yaml @@ -1,6 +1,8 @@ +apiVersion: v2 name: telegraf home: https://github.com/teamhephy/monitor/tree/master/telegraf -version: 2.11.4 -description: Monitoring for Deis Workflow. +version: 2.11.6 +description: Monitoring for Hephy Workflow. maintainers: - - email: team@teamhephy.com +- name: Team Hephy + email: team@teamhephy.com