From b684d2d5bc58e57c62c5df3d20476123a4749bb5 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Thu, 21 Dec 2023 10:57:01 +0200 Subject: [PATCH] fix(apps): link non-primary ingress - add port to non-ingress gitea's url (#16336) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #11205 ⚒️ Fixes #9635 ⚒️ Fixes #8080 ⚒️ Fixes #6609 **⚙️ 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 **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [x] ⚖️ My code follows the style guidelines of this project - [x] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [x] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ 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._ --------- Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/emulatorjs/Chart.yaml | 2 +- charts/stable/emulatorjs/values.yaml | 3 ++- charts/stable/gitea/Chart.yaml | 2 +- charts/stable/gitea/ci/ingress-values.yaml | 5 +++++ charts/stable/gitea/templates/_secrets.tpl | 2 +- charts/stable/minio/Chart.yaml | 2 +- charts/stable/minio/values.yaml | 3 ++- charts/stable/mosquitto/Chart.yaml | 2 +- charts/stable/mosquitto/values.yaml | 3 ++- charts/stable/wg-easy/Chart.yaml | 4 ++-- charts/stable/wg-easy/values.yaml | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/charts/stable/emulatorjs/Chart.yaml b/charts/stable/emulatorjs/Chart.yaml index 4fe71c5ff8f..66c303d8556 100644 --- a/charts/stable/emulatorjs/Chart.yaml +++ b/charts/stable/emulatorjs/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: emulatorjs -version: 7.0.1 +version: 7.0.2 appVersion: 1.7.3 description: Emulatorjs - In browser web based emulation portable to nearly any device for many retro consoles. home: https://truecharts.org/charts/stable/emulatorjs diff --git a/charts/stable/emulatorjs/values.yaml b/charts/stable/emulatorjs/values.yaml index fce3e05039e..6c2f9a10c8f 100644 --- a/charts/stable/emulatorjs/values.yaml +++ b/charts/stable/emulatorjs/values.yaml @@ -30,7 +30,8 @@ service: port: 10138 ingress: front: - autoLink: true + targetSelector: + front: front workload: main: podSpec: diff --git a/charts/stable/gitea/Chart.yaml b/charts/stable/gitea/Chart.yaml index 71a50ea12cc..78884ac7003 100644 --- a/charts/stable/gitea/Chart.yaml +++ b/charts/stable/gitea/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: gitea -version: 15.0.1 +version: 15.0.2 appVersion: 1.21.2-rootless description: Self hosted GIT repositories home: https://truecharts.org/charts/stable/gitea diff --git a/charts/stable/gitea/ci/ingress-values.yaml b/charts/stable/gitea/ci/ingress-values.yaml index 59972584b5b..e0f46de92d3 100644 --- a/charts/stable/gitea/ci/ingress-values.yaml +++ b/charts/stable/gitea/ci/ingress-values.yaml @@ -1,3 +1,8 @@ ingress: main: enabled: true + hosts: + - host: gitea.example.com + paths: + - path: / + pathType: Prefix diff --git a/charts/stable/gitea/templates/_secrets.tpl b/charts/stable/gitea/templates/_secrets.tpl index 620c8c8737b..215287c072a 100644 --- a/charts/stable/gitea/templates/_secrets.tpl +++ b/charts/stable/gitea/templates/_secrets.tpl @@ -2,7 +2,7 @@ {{- define "gitea.secrets" -}} {{ $DOMAIN := .Values.config.nodeIP | quote -}} -{{ $URL := (printf "http://%s/" .Values.config.nodeIP) }} +{{ $URL := (printf "http://%s:%v/" .Values.config.nodeIP .Values.service.main.ports.main.port) }} {{- $pgHost := printf "%v-cnpg-main-rw" (include "tc.v1.common.lib.chart.names.fullname" $) -}} {{- if and (.Values.ingress.main.enabled) (gt (len .Values.ingress.main.hosts) 0) -}} diff --git a/charts/stable/minio/Chart.yaml b/charts/stable/minio/Chart.yaml index 7cb15bd9d12..763910bf6ef 100644 --- a/charts/stable/minio/Chart.yaml +++ b/charts/stable/minio/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: minio -version: 8.0.1 +version: 8.0.2 appVersion: 2023.12.14 description: Minio is a self-hosted S3 storage server home: https://truecharts.org/charts/stable/minio diff --git a/charts/stable/minio/values.yaml b/charts/stable/minio/values.yaml index a15e9b98cdc..2a075655c38 100644 --- a/charts/stable/minio/values.yaml +++ b/charts/stable/minio/values.yaml @@ -17,7 +17,8 @@ service: port: 10106 ingress: api: - autoLink: true + targetSelector: + api: api persistence: config: enabled: true diff --git a/charts/stable/mosquitto/Chart.yaml b/charts/stable/mosquitto/Chart.yaml index 7795b95e60f..ad91a3b2e51 100644 --- a/charts/stable/mosquitto/Chart.yaml +++ b/charts/stable/mosquitto/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: mosquitto -version: 12.0.1 +version: 12.0.2 appVersion: 2.0.18 description: Eclipse Mosquitto - An open source MQTT broker home: https://truecharts.org/charts/stable/mosquitto diff --git a/charts/stable/mosquitto/values.yaml b/charts/stable/mosquitto/values.yaml index 0c243171505..015f8ec301e 100644 --- a/charts/stable/mosquitto/values.yaml +++ b/charts/stable/mosquitto/values.yaml @@ -35,7 +35,8 @@ workload: port: 1883 ingress: websockets: - autoLink: true + targetSelector: + websockets: websockets auth: # -- By enabling this, `allow_anonymous` gets set to `false` in the mosquitto config. enabled: false diff --git a/charts/stable/wg-easy/Chart.yaml b/charts/stable/wg-easy/Chart.yaml index e4ef5920252..a29b751378b 100644 --- a/charts/stable/wg-easy/Chart.yaml +++ b/charts/stable/wg-easy/Chart.yaml @@ -1,8 +1,8 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: wg-easy -version: 6.0.1 -appVersion: latest +version: 6.0.2 +appVersion: "8" description: The easiest way to run WireGuard VPN + Web-based Admin UI. home: https://truecharts.org/charts/stable/wg-easy icon: https://truecharts.org/img/hotlink-ok/chart-icons/wg-easy.png diff --git a/charts/stable/wg-easy/values.yaml b/charts/stable/wg-easy/values.yaml index 74e0839240b..f5af2fc873f 100644 --- a/charts/stable/wg-easy/values.yaml +++ b/charts/stable/wg-easy/values.yaml @@ -1,7 +1,7 @@ image: - repository: docker.io/weejewel/wg-easy + repository: ghcr.io/wg-easy/wg-easy pullPolicy: IfNotPresent - tag: latest@sha256:ea65f283dfeb62628ce942ce38974f9db05177aa27ab69b787115b78591552f3 + tag: 8@sha256:f185fec28bf4a811e62d5791b7f05351113d3fe3c5ed9582e368e978625e6685 securityContext: container: PUID: 0