Merge branch 'prometheus' of https://github.com/spiffe/helm-charts in…

…to prometheus Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
spiffe · Feb 24, 2023 · 8b0938a · 8b0938a
2 parents c3de3c0 + 6026bbf
commit 8b0938a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -42,4 +42,8 @@ Any changes to Chart.yaml or values.yaml require an update of the README.md. Thi
 ./helm-docs.sh charts/«chart-name»
 ```
 
+## Bumping Chart version
+
+In contrary to many other Helm repositories we do NOT require contributors to increate the Chart version. We have customized our release pipeline so we can bundle various PRs in a single release. Maintainers of the helm-charts in this repo will take care of the semantic versioning.
+
 [helm-docs]: https://github.com/norwoodj/helm-docs "Generate documentation for your Helm chart."
diff --git a/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml b/charts/spire/charts/spiffe-oidc-discovery-provider/templates/deployment.yaml
@@ -38,7 +38,7 @@ spec:
             - /run/spire/oidc/config/oidc-discovery-provider.conf
           ports:
             - containerPort: 8008
-              name: health
+              name: healthz
           {{- if not .Values.insecureScheme.enabled }}
             - containerPort: 443
               name: https
@@ -57,13 +57,13 @@ spec:
           readinessProbe:
             httpGet:
               path: /ready
-              port: health
+              port: healthz
             initialDelaySeconds: 5
             periodSeconds: 5
           livenessProbe:
             httpGet:
               path: /live
-              port: health
+              port: healthz
             initialDelaySeconds: 5
             periodSeconds: 5
           resources:

diff --git a/charts/spire/charts/spire-agent/templates/daemonset.yaml b/charts/spire/charts/spire-agent/templates/daemonset.yaml
@@ -45,6 +45,13 @@ spec:
           image: {{ template "spire-agent.image" (dict "appVersion" $.Chart.AppVersion "image" .Values.image) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args: ["-config", "/run/spire/config/agent.conf"]
+          ports:
+            - containerPort: {{ .Values.healthChecks.port }}
+              name: healthz
+            {{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
+            - containerPort: {{ .Values.telemetry.prometheus.port }}
+              name: prom
+            {{- end }}
           volumeMounts:
             - name: spire-config
               mountPath: /run/spire/config
@@ -67,13 +74,13 @@ spec:
           livenessProbe:
             httpGet:
               path: /live
-              port: health
+              port: healthz
             initialDelaySeconds: 15
             periodSeconds: 60
           readinessProbe:
             httpGet:
               path: /ready
-              port: health
+              port: healthz
             initialDelaySeconds: 15
             periodSeconds: 60
           resources:

diff --git a/charts/spire/charts/spire-server/templates/statefulset.yaml b/charts/spire/charts/spire-server/templates/statefulset.yaml
@@ -46,23 +46,23 @@ spec:
               containerPort: 8081
               protocol: TCP
             - containerPort: 8080
-              name: health
+              name: healthz
             {{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
             - containerPort: 9988
               name: prom
             {{- end }}
           livenessProbe:
             httpGet:
               path: /live
-              port: 8080
+              port: healthz
             failureThreshold: 2
             initialDelaySeconds: 15
             periodSeconds: 60
             timeoutSeconds: 3
           readinessProbe:
             httpGet:
               path: /ready
-              port: 8080
+              port: healthz
             initialDelaySeconds: 5
             periodSeconds: 5
           resources:
@@ -96,6 +96,8 @@ spec:
             - name: https
               containerPort: 9443
               protocol: TCP
+            - containerPort: 8008
+              name: healthz
             {{- if (dig "telemetry" "prometheus" "enabled" .Values.telemetry.prometheus.enabled .Values.global) }}
             - containerPort: 8082
               name: prom2
@@ -104,11 +106,11 @@ spec:
           # livenessProbe:
           #   httpGet:
           #     path: /
-          #     port: https
+          #     port: healthz
           # readinessProbe:
           #   httpGet:
           #     path: /
-          #     port: https
+          #     port: healthz
           resources:
             {{- toYaml .Values.controllerManager.resources | nindent 12 }}
           volumeMounts: