Fix various bugs in helm chart (#364)

* Fix wrong trim * add missing MutatingWeghookConfiguration.webhooks[*].sideEffects * fix missing admissionReviewVersions * admissionregistration.k8s.io/v1 for kustomization manifests * revert webhook config
actions · Mar 3, 2021 · 8f977db · 8f977db
1 parent 9ae3551
commit 8f977db
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/charts/actions-runner-controller/Chart.yaml b/charts/actions-runner-controller/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.1
 
 home: https://github.com/summerwind/actions-runner-controller
 

diff --git a/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml b/charts/actions-runner-controller/templates/githubwebhook.deployment.yaml
@@ -41,7 +41,7 @@ spec:
           valueFrom:
             secretKeyRef:
               key: github_webhook_secret_token
-              name: {{- include "actions-runner-controller-github-webhook-server.secretName" . }}
+              name: {{ include "actions-runner-controller-github-webhook-server.secretName" . }}
               optional: true
         {{- range $key, $val := .Values.githubWebhookServer.env }}
         - name: {{ $key }}

diff --git a/charts/actions-runner-controller/templates/githubwebhook.secrets.yaml b/charts/actions-runner-controller/templates/githubwebhook.secrets.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{- include "actions-runner-controller-github-webhook-server.secretName" . }}
+  name: {{ include "actions-runner-controller-github-webhook-server.secretName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "actions-runner-controller.labels" . | nindent 4 }}

diff --git a/charts/actions-runner-controller/templates/webhook_configs.yaml b/charts/actions-runner-controller/templates/webhook_configs.yaml
@@ -1,10 +1,6 @@
 
 ---
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: admissionregistration.k8s.io/v1
-{{- else -}}
 apiVersion: admissionregistration.k8s.io/v1beta1
-{{- end }}
 kind: MutatingWebhookConfiguration
 metadata:
   creationTimestamp: null
@@ -68,11 +64,7 @@ webhooks:
     - runnerreplicasets
 
 ---
-{{- if semverCompare ">=1.16-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: admissionregistration.k8s.io/v1
-{{- else -}}
 apiVersion: admissionregistration.k8s.io/v1beta1
-{{- end }}
 kind: ValidatingWebhookConfiguration
 metadata:
   creationTimestamp: null