fix volume mount, should be on k8s container, update chart ver

rlex · Jan 18, 2024 · 1a95c81 · 1a95c81
1 parent 03959c6
commit 1a95c81
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/charts/pyrra/Chart.yaml b/charts/pyrra/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.11.1
+version: 0.12.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/pyrra/README.md b/charts/pyrra/README.md
@@ -1,6 +1,6 @@
 # pyrra
 
-![Version: 0.11.1](https://img.shields.io/badge/Version-0.11.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.2](https://img.shields.io/badge/AppVersion-v0.7.2-informational?style=flat-square)
+![Version: 0.12.0](https://img.shields.io/badge/Version-0.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.7.2](https://img.shields.io/badge/AppVersion-v0.7.2-informational?style=flat-square)
 
 SLO manager and alert generator
 

diff --git a/charts/pyrra/templates/admissionvalidation.yaml b/charts/pyrra/templates/admissionvalidation.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.validatingWebhookConfiguration.enabled }}
+{{- if and .Values.validatingWebhookConfiguration.enabled ($.Capabilities.APIVersions.Has "cert-manager.io/v1") }}
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
@@ -14,7 +14,7 @@ spec:
   dnsNames:
   -  {{ include "pyrra.fullname" . }}.{{ .Release.Namespace }}.svc
   issuerRef:
-    name: selfsigned
+    name: {{ include "pyrra.fullname" . }}-selfsigned
   secretName: {{ include "pyrra.fullname" . }}-webhook-validation
 ---
 apiVersion: admissionregistration.k8s.io/v1
@@ -29,6 +29,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ include "pyrra.fullname" . }}
+      namespace: {{ .Release.Namespace }}
       path: /validate-pyrra-dev-v1alpha1-servicelevelobjective
       port: 9443
   failurePolicy: Fail

diff --git a/charts/pyrra/templates/deployment.yaml b/charts/pyrra/templates/deployment.yaml
@@ -35,14 +35,19 @@ spec:
             {{- if .Values.genericRules.enabled }}
             - --generic-rules
             {{- end }}
-            {{- if .Values.validatingWebhookConfiguration.enabled }}
+            {{- if and .Values.validatingWebhookConfiguration.enabled ($.Capabilities.APIVersions.Has "cert-manager.io/v1") }}
             - --disable-webhooks=false
             {{- end }}
             {{- with .Values.extraKubernetesArgs }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if and .Values.validatingWebhookConfiguration.enabled ($.Capabilities.APIVersions.Has "cert-manager.io/v1") }}
+          volumeMounts:
+          - mountPath: /tmp/k8s-webhook-server/serving-certs
+            name: certs
+          {{- end }}
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
@@ -61,11 +66,6 @@ spec:
           ports:
           - name: http
             containerPort: 9099
-          {{- if .Values.validatingWebhookConfiguration.enabled }}
-          volumeMounts:
-          - mountPath: /tmp/k8s-webhook-server/serving-certs
-            name: certs
-          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -78,7 +78,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.validatingWebhookConfiguration.enabled }}
+      {{- if and .Values.validatingWebhookConfiguration.enabled ($.Capabilities.APIVersions.Has "cert-manager.io/v1") }}
       volumes:
         - name: certs
           secret: