Merge pull request #1 from stakater-charts/update-annotations

Add xposer annotations

kube-state-metrics/templates/service.yaml

@@ -7,16 +7,10 @@ metadata:
     k8s-app: {{ template "kube-state-metrics.name" . }}
 {{ include "kube-state-metrics.labels.stakater" . | indent 4 }}
 {{ include "kube-state-metrics.labels.chart" . | indent 4 }}
+{{- if .Values.kubeStateMetrics.service.annotations }}
   annotations:
-    prometheus.io/scrape: '{{ .Values.kubeStateMetrics.service.scrape }}'
-    fabric8.io/ingress.annotations: |-
-      ingress.kubernetes.io/force-ssl-redirect: {{ .Values.kubeStateMetrics.service.forceSslRedirect }}
-      kubernetes.io/ingress.class: {{ .Values.kubeStateMetrics.service.ingressClass }}
-      {{- with .Values.kubeStateMetrics.service.annotations }}
-      {{- range $key, $value := . }}
-      {{ $key }}: {{ $value }}
-      {{- end }}
-      {{- end }}
+{{ toYaml .Values.kubeStateMetrics.service.annotations | indent 4 }}
+{{- end }}
 spec:
   ports:
   - name: http-metrics

kube-state-metrics/values.yaml

@@ -39,8 +39,14 @@ kubeStateMetrics:
         #memory: 200Mi
         #cpu: 200m
   service:
-    scrape: "true"
-    forceSslRedirect: "true"
-    ingressClass: internal-ingress
     annotations:
+      prometheus.io/scrape: 'true'
+      config.xposer.stakater.com/Domain: stackator.com
+      config.xposer.stakater.com/IngressNameTemplate: '{{.Service}}-{{.Namespace}}'
+      config.xposer.stakater.com/IngressURLTemplate: '{{.Service}}.{{.Domain}}'
+      config.xposer.stakater.com/TLS: "true"
+      xposer.stakater.com/annotations: |-
+        kubernetes.io/ingress.class: internal-ingress
+        ingress.kubernetes.io/force-ssl-redirect: true
+        certmanager.k8s.io/cluster-issuer: letsencrypt-production
     expose: "true"