From b414de7295b08521307c8d9c2dc95a14923a17da Mon Sep 17 00:00:00 2001 From: TrueCharts-Bot Date: Mon, 22 Nov 2021 21:42:57 +0000 Subject: [PATCH] Commit new App releases for TrueCharts Signed-off-by: TrueCharts-Bot --- .../0.0.4/templates/alertmanager/service.yaml | 43 ------------------ .../templates/prometheus/_thanos-service.tpl | 42 ----------------- .../prometheus/{0.0.4 => 0.0.5}/CHANGELOG.md | 9 ++++ .../prometheus/{0.0.4 => 0.0.5}/CONFIG.md | 0 .../prometheus/{0.0.4 => 0.0.5}/Chart.lock | 2 +- .../prometheus/{0.0.4 => 0.0.5}/Chart.yaml | 2 +- .../prometheus/{0.0.4 => 0.0.5}/README.md | 0 .../prometheus/{0.0.4 => 0.0.5}/app-readme.md | 0 .../{0.0.4 => 0.0.5}/charts/common-8.9.0.tgz | Bin .../crds/crd-alertmanager-config.yaml | 0 .../crds/crd-alertmanager.yaml | 0 .../{0.0.4 => 0.0.5}/crds/crd-podmonitor.yaml | 0 .../{0.0.4 => 0.0.5}/crds/crd-probes.yaml | 0 .../{0.0.4 => 0.0.5}/crds/crd-prometheus.yaml | 0 .../crds/crd-prometheusrules.yaml | 0 .../crds/crd-servicemonitor.yaml | 0 .../crds/crd-thanosrulers.yaml | 0 .../{0.0.4 => 0.0.5}/helm-values.md | 2 +- .../{0.0.4 => 0.0.5}/ix_values.yaml | 2 +- .../{0.0.4 => 0.0.5}/questions.yaml | 0 .../{0.0.4 => 0.0.5}/templates/_helpers.tpl | 0 .../templates/alertmanager/alertmanager.yaml | 0 .../templates/alertmanager/secrets.yaml | 0 .../alertmanager/serviceaccount.yaml | 0 .../alertmanager/servicemonitor.yaml | 0 .../{0.0.4 => 0.0.5}/templates/common.yaml | 1 - .../templates/exporters/core-dns/service.yaml | 0 .../exporters/core-dns/servicemonitor.yaml | 0 .../kube-apiserver/servicemonitor.yaml | 0 .../kube-controller-manager/endpoints.yaml | 0 .../kube-controller-manager/service.yaml | 0 .../servicemonitor.yaml | 0 .../exporters/kube-scheduler/endpoints.yaml | 0 .../exporters/kube-scheduler/service.yaml | 0 .../kube-scheduler/servicemonitor.yaml | 0 .../exporters/kubelet/servicemonitor.yaml | 0 .../templates/operator/_args.tpl | 0 .../templates/operator/configmap.yaml | 0 .../templates/operator/servicemonitor.yaml | 0 .../prometheus/_additionalPrometheusRules.tpl | 0 .../prometheus/_additionalScrapeJobs.tpl | 0 .../templates/prometheus/_prometheus.tpl | 2 +- .../templates/prometheus/_servicemonitor.tpl | 0 .../templates/prometheus/clusterrole.yaml | 0 .../prometheus/clusterrolebinding.yaml | 0 .../templates/prometheus/serviceaccount.yaml | 0 .../prometheus/{0.0.4 => 0.0.5}/values.yaml | 0 47 files changed, 14 insertions(+), 91 deletions(-) delete mode 100644 incubator/prometheus/0.0.4/templates/alertmanager/service.yaml delete mode 100644 incubator/prometheus/0.0.4/templates/prometheus/_thanos-service.tpl rename incubator/prometheus/{0.0.4 => 0.0.5}/CHANGELOG.md (80%) rename incubator/prometheus/{0.0.4 => 0.0.5}/CONFIG.md (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/Chart.lock (78%) rename incubator/prometheus/{0.0.4 => 0.0.5}/Chart.yaml (98%) rename incubator/prometheus/{0.0.4 => 0.0.5}/README.md (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/app-readme.md (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/charts/common-8.9.0.tgz (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-alertmanager-config.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-alertmanager.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-podmonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-probes.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-prometheus.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-prometheusrules.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/crds/crd-thanosrulers.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/helm-values.md (99%) rename incubator/prometheus/{0.0.4 => 0.0.5}/ix_values.yaml (99%) rename incubator/prometheus/{0.0.4 => 0.0.5}/questions.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/_helpers.tpl (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/alertmanager/alertmanager.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/alertmanager/secrets.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/alertmanager/serviceaccount.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/alertmanager/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/common.yaml (91%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/core-dns/service.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/core-dns/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-apiserver/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-controller-manager/endpoints.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-controller-manager/service.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-controller-manager/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-scheduler/endpoints.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-scheduler/service.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kube-scheduler/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/exporters/kubelet/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/operator/_args.tpl (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/operator/configmap.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/operator/servicemonitor.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/_additionalPrometheusRules.tpl (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/_additionalScrapeJobs.tpl (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/_prometheus.tpl (99%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/_servicemonitor.tpl (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/clusterrole.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/clusterrolebinding.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/templates/prometheus/serviceaccount.yaml (100%) rename incubator/prometheus/{0.0.4 => 0.0.5}/values.yaml (100%) diff --git a/incubator/prometheus/0.0.4/templates/alertmanager/service.yaml b/incubator/prometheus/0.0.4/templates/alertmanager/service.yaml deleted file mode 100644 index 7a10f1d3d19..00000000000 --- a/incubator/prometheus/0.0.4/templates/alertmanager/service.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{{- if .Values.alertmanager.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ template "kube-prometheus.alertmanager.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.alertmanager.labels" . | nindent 4 }} - {{- with .Values.alertmanager.service.annotations }} - annotations: {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.alertmanager.service.type }} - {{- if index .Values.alertmanager "stickySessions" }} - sessionAffinity: ClientIP - {{- end }} - {{- if and .Values.alertmanager.service.loadBalancerIP (eq .Values.alertmanager.service.type "LoadBalancer") }} - loadBalancerIP: {{ .Values.alertmanager.service.loadBalancerIP }} - {{- end }} - {{- if and (eq .Values.alertmanager.service.type "LoadBalancer") .Values.alertmanager.service.loadBalancerSourceRanges }} - {{- with .Values.alertmanager.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} - {{- if and (eq .Values.alertmanager.service.type "LoadBalancer") .Values.alertmanager.service.externalTrafficPolicy }} - externalTrafficPolicy: {{ .Values.alertmanager.service.externalTrafficPolicy }} - {{- end }} - {{- if and (eq .Values.alertmanager.service.type "LoadBalancer") (eq .Values.alertmanager.service.externalTrafficPolicy "Local") .Values.alertmanager.service.healthCheckNodePort }} - healthCheckNodePort: {{ .Values.alertmanager.service.healthCheckNodePort }} - {{- end }} - {{- if and (eq .Values.alertmanager.service.type "ClusterIP") .Values.alertmanager.service.clusterIP }} - clusterIP: {{ .Values.alertmanager.service.clusterIP }} - {{- end }} - ports: - - name: http - port: {{ .Values.alertmanager.service.port }} - targetPort: 9093 - {{- if and .Values.alertmanager.service.nodePort (or (eq .Values.alertmanager.service.type "NodePort") (eq .Values.alertmanager.service.type "LoadBalancer")) }} - nodePort: {{ .Values.alertmanager.service.nodePort }} - {{- end }} - selector: - app.kubernetes.io/name: alertmanager - alertmanager: {{ template "kube-prometheus.alertmanager.fullname" . }} -{{- end }} diff --git a/incubator/prometheus/0.0.4/templates/prometheus/_thanos-service.tpl b/incubator/prometheus/0.0.4/templates/prometheus/_thanos-service.tpl deleted file mode 100644 index f15efae6fec..00000000000 --- a/incubator/prometheus/0.0.4/templates/prometheus/_thanos-service.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{{- define "prometheus.prometheus.thanos.service" -}} -{{- if and .Values.prometheus.enabled .Values.prometheus.thanos.create }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ template "kube-prometheus.prometheus.fullname" . }}-thanos - namespace: {{ .Release.Namespace }} - labels: {{- include "kube-prometheus.prometheus.labels" . | nindent 4 }} - app.kubernetes.io/subcomponent: thanos - {{- if .Values.prometheus.thanos.service.annotations }} - annotations: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.thanos.service.annotations "context" $) | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.prometheus.thanos.service.type }} - {{- if and .Values.prometheus.thanos.service.loadBalancerIP (eq .Values.prometheus.thanos.service.type "LoadBalancer") }} - loadBalancerIP: {{ .Values.prometheus.thanos.service.loadBalancerIP }} - {{- end }} - {{- if and (eq .Values.prometheus.thanos.service.type "LoadBalancer") .Values.prometheus.thanos.service.loadBalancerSourceRanges }} - {{- with .Values.prometheus.thanos.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} - {{- if and (eq .Values.prometheus.thanos.service.type "ClusterIP") .Values.prometheus.thanos.service.clusterIP }} - clusterIP: {{ .Values.prometheus.thanos.service.clusterIP }} - {{- end }} - ports: - - name: grpc - port: {{ .Values.prometheus.thanos.service.port }} - targetPort: grpc - protocol: TCP - {{- if and .Values.prometheus.thanos.service.nodePort (or (eq .Values.prometheus.thanos.service.type "NodePort") (eq .Values.prometheus.thanos.service.type "LoadBalancer")) }} - nodePort: {{ .Values.prometheus.thanos.service.nodePort }} - {{- end }} - {{- if .Values.prometheus.thanos.service.extraPorts }} - {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.thanos.service.extraPorts "context" $) | nindent 4 }} - {{- end }} - selector: - app.kubernetes.io/name: prometheus - prometheus: {{ template "kube-prometheus.prometheus.fullname" . }} -{{- end }} -{{- end }} diff --git a/incubator/prometheus/0.0.4/CHANGELOG.md b/incubator/prometheus/0.0.5/CHANGELOG.md similarity index 80% rename from incubator/prometheus/0.0.4/CHANGELOG.md rename to incubator/prometheus/0.0.5/CHANGELOG.md index 449393dbc1e..10a52f165a8 100644 --- a/incubator/prometheus/0.0.4/CHANGELOG.md +++ b/incubator/prometheus/0.0.5/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog
+ +### [prometheus-0.0.5](https://github.com/truecharts/apps/compare/prometheus-0.0.4...prometheus-0.0.5) (2021-11-22) + +#### Fix + +* migrate away services + + + ### [prometheus-0.0.4](https://github.com/truecharts/apps/compare/prometheus-0.0.3...prometheus-0.0.4) (2021-11-22) diff --git a/incubator/prometheus/0.0.4/CONFIG.md b/incubator/prometheus/0.0.5/CONFIG.md similarity index 100% rename from incubator/prometheus/0.0.4/CONFIG.md rename to incubator/prometheus/0.0.5/CONFIG.md diff --git a/incubator/prometheus/0.0.4/Chart.lock b/incubator/prometheus/0.0.5/Chart.lock similarity index 78% rename from incubator/prometheus/0.0.4/Chart.lock rename to incubator/prometheus/0.0.5/Chart.lock index 197fd9e4c2e..55023f93b12 100644 --- a/incubator/prometheus/0.0.4/Chart.lock +++ b/incubator/prometheus/0.0.5/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://truecharts.org version: 8.9.0 digest: sha256:897df8a7a9ac40261f41d88342ca2d8748cdf91b8e8ed0ba04c8f26643bf3430 -generated: "2021-11-22T21:20:49.297052633Z" +generated: "2021-11-22T21:40:17.029801231Z" diff --git a/incubator/prometheus/0.0.4/Chart.yaml b/incubator/prometheus/0.0.5/Chart.yaml similarity index 98% rename from incubator/prometheus/0.0.4/Chart.yaml rename to incubator/prometheus/0.0.5/Chart.yaml index 2f70013f6b2..a26ae544ecb 100644 --- a/incubator/prometheus/0.0.4/Chart.yaml +++ b/incubator/prometheus/0.0.5/Chart.yaml @@ -20,7 +20,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 0.0.4 +version: 0.0.5 annotations: truecharts.org/catagories: | - metrics diff --git a/incubator/prometheus/0.0.4/README.md b/incubator/prometheus/0.0.5/README.md similarity index 100% rename from incubator/prometheus/0.0.4/README.md rename to incubator/prometheus/0.0.5/README.md diff --git a/incubator/prometheus/0.0.4/app-readme.md b/incubator/prometheus/0.0.5/app-readme.md similarity index 100% rename from incubator/prometheus/0.0.4/app-readme.md rename to incubator/prometheus/0.0.5/app-readme.md diff --git a/incubator/prometheus/0.0.4/charts/common-8.9.0.tgz b/incubator/prometheus/0.0.5/charts/common-8.9.0.tgz similarity index 100% rename from incubator/prometheus/0.0.4/charts/common-8.9.0.tgz rename to incubator/prometheus/0.0.5/charts/common-8.9.0.tgz diff --git a/incubator/prometheus/0.0.4/crds/crd-alertmanager-config.yaml b/incubator/prometheus/0.0.5/crds/crd-alertmanager-config.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-alertmanager-config.yaml rename to incubator/prometheus/0.0.5/crds/crd-alertmanager-config.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-alertmanager.yaml b/incubator/prometheus/0.0.5/crds/crd-alertmanager.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-alertmanager.yaml rename to incubator/prometheus/0.0.5/crds/crd-alertmanager.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-podmonitor.yaml b/incubator/prometheus/0.0.5/crds/crd-podmonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-podmonitor.yaml rename to incubator/prometheus/0.0.5/crds/crd-podmonitor.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-probes.yaml b/incubator/prometheus/0.0.5/crds/crd-probes.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-probes.yaml rename to incubator/prometheus/0.0.5/crds/crd-probes.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-prometheus.yaml b/incubator/prometheus/0.0.5/crds/crd-prometheus.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-prometheus.yaml rename to incubator/prometheus/0.0.5/crds/crd-prometheus.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-prometheusrules.yaml b/incubator/prometheus/0.0.5/crds/crd-prometheusrules.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-prometheusrules.yaml rename to incubator/prometheus/0.0.5/crds/crd-prometheusrules.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-servicemonitor.yaml b/incubator/prometheus/0.0.5/crds/crd-servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-servicemonitor.yaml rename to incubator/prometheus/0.0.5/crds/crd-servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/crds/crd-thanosrulers.yaml b/incubator/prometheus/0.0.5/crds/crd-thanosrulers.yaml similarity index 100% rename from incubator/prometheus/0.0.4/crds/crd-thanosrulers.yaml rename to incubator/prometheus/0.0.5/crds/crd-thanosrulers.yaml diff --git a/incubator/prometheus/0.0.4/helm-values.md b/incubator/prometheus/0.0.5/helm-values.md similarity index 99% rename from incubator/prometheus/0.0.4/helm-values.md rename to incubator/prometheus/0.0.5/helm-values.md index 1009400f950..8512cf371a8 100644 --- a/incubator/prometheus/0.0.4/helm-values.md +++ b/incubator/prometheus/0.0.5/helm-values.md @@ -63,7 +63,7 @@ You will, however, be able to use all values referenced in the common chart here | alertmanager.podSecurityContext.enabled | bool | `true` | | | alertmanager.podSecurityContext.fsGroup | int | `1001` | | | alertmanager.podSecurityContext.runAsUser | int | `1001` | | -| alertmanager.portName | string | `"web"` | | +| alertmanager.portName | string | `"alertmanager"` | | | alertmanager.priorityClassName | string | `""` | | | alertmanager.readinessProbe.enabled | bool | `true` | | | alertmanager.readinessProbe.failureThreshold | int | `120` | | diff --git a/incubator/prometheus/0.0.4/ix_values.yaml b/incubator/prometheus/0.0.5/ix_values.yaml similarity index 99% rename from incubator/prometheus/0.0.4/ix_values.yaml rename to incubator/prometheus/0.0.5/ix_values.yaml index 6fbdfb7ace7..99ef3b2aa40 100644 --- a/incubator/prometheus/0.0.4/ix_values.yaml +++ b/incubator/prometheus/0.0.5/ix_values.yaml @@ -1164,7 +1164,7 @@ alertmanager: routePrefix: / ## @param alertmanager.portName Port name used for the pods and governing service. This defaults to web ## - portName: web + portName: alertmanager ## @param alertmanager.configNamespaceSelector AlertmanagerConfigs to be selected for to merge and configure Alertmanager with. This defaults to {} ## configNamespaceSelector: {} diff --git a/incubator/prometheus/0.0.4/questions.yaml b/incubator/prometheus/0.0.5/questions.yaml similarity index 100% rename from incubator/prometheus/0.0.4/questions.yaml rename to incubator/prometheus/0.0.5/questions.yaml diff --git a/incubator/prometheus/0.0.4/templates/_helpers.tpl b/incubator/prometheus/0.0.5/templates/_helpers.tpl similarity index 100% rename from incubator/prometheus/0.0.4/templates/_helpers.tpl rename to incubator/prometheus/0.0.5/templates/_helpers.tpl diff --git a/incubator/prometheus/0.0.4/templates/alertmanager/alertmanager.yaml b/incubator/prometheus/0.0.5/templates/alertmanager/alertmanager.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/alertmanager/alertmanager.yaml rename to incubator/prometheus/0.0.5/templates/alertmanager/alertmanager.yaml diff --git a/incubator/prometheus/0.0.4/templates/alertmanager/secrets.yaml b/incubator/prometheus/0.0.5/templates/alertmanager/secrets.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/alertmanager/secrets.yaml rename to incubator/prometheus/0.0.5/templates/alertmanager/secrets.yaml diff --git a/incubator/prometheus/0.0.4/templates/alertmanager/serviceaccount.yaml b/incubator/prometheus/0.0.5/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/alertmanager/serviceaccount.yaml rename to incubator/prometheus/0.0.5/templates/alertmanager/serviceaccount.yaml diff --git a/incubator/prometheus/0.0.4/templates/alertmanager/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/alertmanager/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/alertmanager/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/common.yaml b/incubator/prometheus/0.0.5/templates/common.yaml similarity index 91% rename from incubator/prometheus/0.0.4/templates/common.yaml rename to incubator/prometheus/0.0.5/templates/common.yaml index efb7dd7a1b2..929df3b38e5 100644 --- a/incubator/prometheus/0.0.4/templates/common.yaml +++ b/incubator/prometheus/0.0.5/templates/common.yaml @@ -9,7 +9,6 @@ {{- include "prometheus.prometheus.prometheus" . }} {{- include "prometheus.prometheus.additionalprometheusrules" . }} {{- include "prometheus.prometheus.additionalscrapejobs" . }} -{{- include "prometheus.prometheus.thanos.service" . }} {{- include "prometheus.prometheus.servicemonitor" . }} diff --git a/incubator/prometheus/0.0.4/templates/exporters/core-dns/service.yaml b/incubator/prometheus/0.0.5/templates/exporters/core-dns/service.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/core-dns/service.yaml rename to incubator/prometheus/0.0.5/templates/exporters/core-dns/service.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/core-dns/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/exporters/core-dns/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/core-dns/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/exporters/core-dns/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-apiserver/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-apiserver/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-apiserver/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-apiserver/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-controller-manager/endpoints.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-controller-manager/endpoints.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-controller-manager/endpoints.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-controller-manager/endpoints.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-controller-manager/service.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-controller-manager/service.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-controller-manager/service.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-controller-manager/service.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-controller-manager/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-controller-manager/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-controller-manager/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-controller-manager/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-scheduler/endpoints.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-scheduler/endpoints.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-scheduler/endpoints.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-scheduler/endpoints.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-scheduler/service.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-scheduler/service.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-scheduler/service.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-scheduler/service.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kube-scheduler/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/exporters/kube-scheduler/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kube-scheduler/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kube-scheduler/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/exporters/kubelet/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/exporters/kubelet/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/exporters/kubelet/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/exporters/kubelet/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/operator/_args.tpl b/incubator/prometheus/0.0.5/templates/operator/_args.tpl similarity index 100% rename from incubator/prometheus/0.0.4/templates/operator/_args.tpl rename to incubator/prometheus/0.0.5/templates/operator/_args.tpl diff --git a/incubator/prometheus/0.0.4/templates/operator/configmap.yaml b/incubator/prometheus/0.0.5/templates/operator/configmap.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/operator/configmap.yaml rename to incubator/prometheus/0.0.5/templates/operator/configmap.yaml diff --git a/incubator/prometheus/0.0.4/templates/operator/servicemonitor.yaml b/incubator/prometheus/0.0.5/templates/operator/servicemonitor.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/operator/servicemonitor.yaml rename to incubator/prometheus/0.0.5/templates/operator/servicemonitor.yaml diff --git a/incubator/prometheus/0.0.4/templates/prometheus/_additionalPrometheusRules.tpl b/incubator/prometheus/0.0.5/templates/prometheus/_additionalPrometheusRules.tpl similarity index 100% rename from incubator/prometheus/0.0.4/templates/prometheus/_additionalPrometheusRules.tpl rename to incubator/prometheus/0.0.5/templates/prometheus/_additionalPrometheusRules.tpl diff --git a/incubator/prometheus/0.0.4/templates/prometheus/_additionalScrapeJobs.tpl b/incubator/prometheus/0.0.5/templates/prometheus/_additionalScrapeJobs.tpl similarity index 100% rename from incubator/prometheus/0.0.4/templates/prometheus/_additionalScrapeJobs.tpl rename to incubator/prometheus/0.0.5/templates/prometheus/_additionalScrapeJobs.tpl diff --git a/incubator/prometheus/0.0.4/templates/prometheus/_prometheus.tpl b/incubator/prometheus/0.0.5/templates/prometheus/_prometheus.tpl similarity index 99% rename from incubator/prometheus/0.0.4/templates/prometheus/_prometheus.tpl rename to incubator/prometheus/0.0.5/templates/prometheus/_prometheus.tpl index c00f6f4b4bf..995f85ddb2d 100644 --- a/incubator/prometheus/0.0.4/templates/prometheus/_prometheus.tpl +++ b/incubator/prometheus/0.0.5/templates/prometheus/_prometheus.tpl @@ -239,7 +239,7 @@ spec: resources: {{- toYaml .Values.prometheus.thanos.resources | nindent 8 }} {{- end }} ports: - - name: grpc + - name: thanos containerPort: 10901 protocol: TCP - name: http diff --git a/incubator/prometheus/0.0.4/templates/prometheus/_servicemonitor.tpl b/incubator/prometheus/0.0.5/templates/prometheus/_servicemonitor.tpl similarity index 100% rename from incubator/prometheus/0.0.4/templates/prometheus/_servicemonitor.tpl rename to incubator/prometheus/0.0.5/templates/prometheus/_servicemonitor.tpl diff --git a/incubator/prometheus/0.0.4/templates/prometheus/clusterrole.yaml b/incubator/prometheus/0.0.5/templates/prometheus/clusterrole.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/prometheus/clusterrole.yaml rename to incubator/prometheus/0.0.5/templates/prometheus/clusterrole.yaml diff --git a/incubator/prometheus/0.0.4/templates/prometheus/clusterrolebinding.yaml b/incubator/prometheus/0.0.5/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/prometheus/clusterrolebinding.yaml rename to incubator/prometheus/0.0.5/templates/prometheus/clusterrolebinding.yaml diff --git a/incubator/prometheus/0.0.4/templates/prometheus/serviceaccount.yaml b/incubator/prometheus/0.0.5/templates/prometheus/serviceaccount.yaml similarity index 100% rename from incubator/prometheus/0.0.4/templates/prometheus/serviceaccount.yaml rename to incubator/prometheus/0.0.5/templates/prometheus/serviceaccount.yaml diff --git a/incubator/prometheus/0.0.4/values.yaml b/incubator/prometheus/0.0.5/values.yaml similarity index 100% rename from incubator/prometheus/0.0.4/values.yaml rename to incubator/prometheus/0.0.5/values.yaml