From d3a49f43d7d83df55db9107cd7c3d937ec8e209b Mon Sep 17 00:00:00 2001 From: Boemeltrein <130394941+Boemeltrein@users.noreply.github.com> Date: Mon, 7 Apr 2025 13:10:05 +0200 Subject: [PATCH] fix(clustertool): nginx (#34016) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** Add repo nginx ⚒️ Fixes # [34015](https://github.com/truecharts/public/issues/34015) **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [x] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code - [ ] 📜 Documentation Changes **🧪 How Has This Been Tested?** Deployed now correctly on my test cluster **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made changes to the documentation - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning - [ ] I made sure the title starts with `feat(chart-name):`, `fix(chart-name):`, `chore(chart-name):`, `docs(chart-name):` or `fix(docs):` **➕ App addition** If this PR is an app addition please make sure you have done the following. - [x] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- .../networking/nginx-external/app/helm-release.yaml | 4 ++-- .../networking/nginx-internal/app/helm-release.yaml | 4 ++-- .../root/repositories/helm/ingress-nginx.yaml | 12 ++++++++++++ .../root/repositories/helm/kustomization.yaml | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml diff --git a/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml index 063074f6fc4..2a4d3af5084 100644 --- a/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/networking/nginx-external/app/helm-release.yaml @@ -9,11 +9,11 @@ spec: interval: 15m chart: spec: - chart: 'ingress-nginx' + chart: ingress-nginx version: 4.12.1 sourceRef: kind: HelmRepository - name: 'ingress-nginx' + name: ingress-nginx namespace: flux-system interval: 15m timeout: 20m diff --git a/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml index 3fc55a5ecfd..0f0bdcd4378 100644 --- a/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/networking/nginx-internal/app/helm-release.yaml @@ -9,11 +9,11 @@ spec: interval: 15m chart: spec: - chart: 'ingress-nginx' + chart: ingress-nginx version: 4.12.1 sourceRef: kind: HelmRepository - name: 'ingress-nginx' + name: ingress-nginx namespace: flux-system interval: 15m timeout: 20m diff --git a/clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml b/clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml new file mode 100644 index 00000000000..ab3e70e5a1f --- /dev/null +++ b/clustertool/embed/generic/root/repositories/helm/ingress-nginx.yaml @@ -0,0 +1,12 @@ +--- +# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json +apiVersion: source.toolkit.fluxcd.io/v1 +kind: HelmRepository +metadata: + name: ingress-nginx + namespace: flux-system +spec: + ## TODO: move to OCI + # type: oci + interval: 5m + url: https://kubernetes.github.io/ingress-nginx diff --git a/clustertool/embed/generic/root/repositories/helm/kustomization.yaml b/clustertool/embed/generic/root/repositories/helm/kustomization.yaml index 655350d63be..517176c306d 100644 --- a/clustertool/embed/generic/root/repositories/helm/kustomization.yaml +++ b/clustertool/embed/generic/root/repositories/helm/kustomization.yaml @@ -11,6 +11,7 @@ resources: - csi-driver-nfs.yaml - descheduler.yaml - home-ops-mirror.yaml + - ingress-nginx.yaml - intel.yaml - jetstack.yaml - kubernetes-sigs-metrics-server.yaml