Compare commits

...

3 Commits

Author SHA1 Message Date
Denis
eb2f4bac88 [uptimerobot-prometheus] Support annotations in Service (#86)
* bump chart version

* [uptimerobot-prometheus] Support annotations in Service (#1)

* add annotations to service

* add example annotations to values.yaml

* fix trailing spaces
2020-10-07 13:26:13 -04:00
Ryan Holt
7f1f2b9150 Merge pull request #84 from CuBiC3D/master
[media-common] Fixes HELM error on extraIngresses
2020-10-07 11:25:44 -04:00
Waldemar Faist
4bde4fa33f Fixes HELM error on extraIngresses
Signed-off-by: Waldemar Faist <cubic@coldice.net>
2020-10-07 14:01:34 +02:00
5 changed files with 11 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ apiVersion: v2
name: media-common name: media-common
description: Common dependancy chart for media ecosystem containers description: Common dependancy chart for media ecosystem containers
type: application type: application
version: 1.3.0 version: 1.3.1
keywords: keywords:
- media-common - media-common
home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common home: https://github.com/k8s-at-home/charts/tree/master/charts/media-common

View File

@@ -64,7 +64,7 @@ kind: Ingress
metadata: metadata:
name: {{ $fullName }}-{{ $ingress.nameSuffix | default $index }} name: {{ $fullName }}-{{ $ingress.nameSuffix | default $index }}
labels: labels:
{{- include "media-common.labels" . | nindent 4 }} {{- include "media-common.labels" $ | nindent 4 }}
{{- with $ingress.annotations }} {{- with $ingress.annotations }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}

View File

@@ -2,7 +2,7 @@ apiVersion: v2
name: uptimerobot-prometheus name: uptimerobot-prometheus
description: Prometheus Exporter for the official uptimerobot CLI description: Prometheus Exporter for the official uptimerobot CLI
type: application type: application
version: 2.0.0 version: 2.0.1
appVersion: 0.0.1 appVersion: 0.0.1
keywords: keywords:
- uptimerobot - uptimerobot

View File

@@ -4,6 +4,10 @@ metadata:
name: {{ include "uptimerobot-prometheus.fullname" . }} name: {{ include "uptimerobot-prometheus.fullname" . }}
labels: labels:
{{- include "uptimerobot-prometheus.labels" . | nindent 4 }} {{- include "uptimerobot-prometheus.labels" . | nindent 4 }}
{{- if .Values.service.annotations }}
annotations:
{{ toYaml .Values.service.annotations | indent 4 }}
{{- end }}
spec: spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
ports: ports:

View File

@@ -29,6 +29,10 @@ securityContext: {}
service: service:
type: ClusterIP type: ClusterIP
port: 9705 port: 9705
# Sometimes you may need to add annotations to the service
# to integrate with external operators
# annotations:
# prometheus.io/scrape: "true"
resources: {} resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious # We usually recommend not to specify default resources and to leave this as a conscious