Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only include CRD install Job if ingress controller is enabled #446

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Only include CRD install Job if ingress controller is enabled #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
- Align with upstream chart version [2.46.0](https://github.com/Kong/charts/releases/tag/kong-2.46.0) ([Changes in upstream repository](https://github.com/Kong/charts/compare/kong-2.40.0...kong-2.46.0))
- Revert `ingressController.admissionWebhook` settings to upstream values. (Enabled by default with `failurePolicy: Ignore`)
- Update Kong Gateway image to `3.8.1.0-debian`
- Execute CRD installation Job only if ingressController is enabled (`ingressController.enabled`)

### Removed

Expand Down
6 changes: 4 additions & 2 deletions diffs/helm__kong-app__templates__custom-resource-definitions.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
diff --git a/vendor/kong/charts/kong/templates/custom-resource-definitions.yaml b/helm/kong-app/templates/custom-resource-definitions.yaml
index 5a6dda1..4975ccd 100644
index 5a6dda1..763d978 100644
--- a/vendor/kong/charts/kong/templates/custom-resource-definitions.yaml
+++ b/helm/kong-app/templates/custom-resource-definitions.yaml
@@ -32,3 +32,6 @@
@@ -32,3 +32,8 @@
---
{{- end }}
{{- end }}
+
+{{/* This requires giantswarm/kubectl-apply-job to be present as a Chart dependency */}}
+{{- if .Values.ingressController.enabled -}}
+{{ include "kubectlApplyJob.job" . }}
+{{- end }}
4 changes: 2 additions & 2 deletions helm/kong-app/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ dependencies:
- name: kubectl-apply-job
repository: oci://giantswarmpublic.azurecr.io/giantswarm-playground-catalog
version: 0.9.0
digest: sha256:7065cc931b5106e74c171660d4b4a2dc0973890e8b9c6d0f3ad20cb7c73f4442
generated: "2025-01-24T17:25:49.543767739+01:00"
digest: sha256:97618b8611a8b27dc4d5615e9815ed0a0e5b33f89845e5088f4abba947265641
generated: "2025-01-25T16:57:50.568469202+01:00"
1 change: 1 addition & 0 deletions helm/kong-app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ dependencies:
- name: kubectl-apply-job
version: "0.9.0"
repository: oci://giantswarmpublic.azurecr.io/giantswarm-playground-catalog
condition: ingressController.enabled
2 changes: 2 additions & 0 deletions helm/kong-app/templates/custom-resource-definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
{{- end }}

{{/* This requires giantswarm/kubectl-apply-job to be present as a Chart dependency */}}
{{- if .Values.ingressController.enabled -}}
{{ include "kubectlApplyJob.job" . }}
{{- end }}
6 changes: 4 additions & 2 deletions sync/patches/crds/custom-resource-definitions.yaml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
diff --git b/helm/kong-app/templates/custom-resource-definitions.yaml a/helm/kong-app/templates/custom-resource-definitions.yaml
index 5a6dda1..4975ccd 100644
index 5a6dda1..763d978 100644
--- b/helm/kong-app/templates/custom-resource-definitions.yaml
+++ a/helm/kong-app/templates/custom-resource-definitions.yaml
@@ -32,3 +32,6 @@
@@ -32,3 +32,8 @@
---
{{- end }}
{{- end }}
+
+{{/* This requires giantswarm/kubectl-apply-job to be present as a Chart dependency */}}
+{{- if .Values.ingressController.enabled -}}
+{{ include "kubectlApplyJob.job" . }}
+{{- end }}
Loading