diff --git a/charts/actions-runner-controller/Chart.yaml b/charts/actions-runner-controller/Chart.yaml index b74cf591..3fc49f29 100644 --- 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.15.1 +version: 0.15.2 # Used as the default manager tag value when no tag property is provided in the values.yaml appVersion: 0.20.3 diff --git a/charts/actions-runner-controller/README.md b/charts/actions-runner-controller/README.md index ac089b48..89bfdac4 100644 --- a/charts/actions-runner-controller/README.md +++ b/charts/actions-runner-controller/README.md @@ -102,6 +102,7 @@ All additional docs are kept in the `docs/` folder, this README is solely for do | `githubWebhookServer.ingress.annotations` | Set annotations for the ingress kind | | | `githubWebhookServer.ingress.hosts` | Set hosts configuration for ingress | `[{"host": "chart-example.local", "paths": []}]` | | `githubWebhookServer.ingress.tls` | Set tls configuration for ingress | | +| `githubWebhookServer.ingress.ingressClassName` | Set ingress class name | | | `githubWebhookServer.podDisruptionBudget.enabled` | Enables a PDB to ensure HA of githubwebhook pods | false | | `githubWebhookServer.podDisruptionBudget.minAvailable` | Minimum number of pods that must be available after eviction | | | `githubWebhookServer.podDisruptionBudget.maxUnavailable` | Maximum number of pods that can be unavailable after eviction. Kubernetes 1.7+ required. | | diff --git a/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml b/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml index 65b261aa..4a0e8ef9 100644 --- a/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml +++ b/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml @@ -1,12 +1,12 @@ {{- if .Values.githubWebhookServer.ingress.enabled -}} {{- $fullName := include "actions-runner-controller-github-webhook-server.fullname" . -}} {{- $svcPort := (index .Values.githubWebhookServer.service.ports 0).port -}} -{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }} +apiVersion: networking.k8s.io/v1 +{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} apiVersion: networking.k8s.io/v1beta1 {{- else if .Capabilities.APIVersions.Has "extensions/v1beta1" }} apiVersion: extensions/v1beta1 -{{- else -}} -apiVersion: networking.k8s.io/v1 {{- end }} kind: Ingress metadata: @@ -28,6 +28,9 @@ spec: secretName: {{ .secretName }} {{- end }} {{- end }} + {{- with .Values.githubWebhookServer.ingress.ingressClassName }} + ingressClassName: {{ . }} + {{- end }} rules: {{- range .Values.githubWebhookServer.ingress.hosts }} - host: {{ .host | quote }} @@ -35,6 +38,9 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} + pathType: {{ .pathType }} + {{- end }} backend: {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1" }} service: diff --git a/charts/actions-runner-controller/values.yaml b/charts/actions-runner-controller/values.yaml index 0dbbd246..e724622c 100644 --- a/charts/actions-runner-controller/values.yaml +++ b/charts/actions-runner-controller/values.yaml @@ -206,13 +206,15 @@ githubWebhookServer: #nodePort: someFixedPortForUseWithTerraformCdkCfnEtc ingress: enabled: false - annotations: - {} + ingressClassName: "" + annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - host: chart-example.local paths: [] + # - path: /* + # pathType: ImplementationSpecific tls: [] # - secretName: chart-example-tls # hosts: