From c6d45fe7152d2e0bdccf31907a3002e586955c29 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 4 Jul 2025 11:00:52 +0000 Subject: [PATCH 1/7] feat(docker-image)!: Update nginx Docker tag to v21 --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 1175b50..24bd65c 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: nginx - version: 19.1.1 + version: 21.0.3 sourceRef: kind: HelmRepository name: bitnami From de9f1d50147c613bb67832bd744243b1f425445e Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Fri, 4 Jul 2025 13:01:28 +0200 Subject: [PATCH 2/7] Set proper domain --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 1175b50..761867c 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -21,7 +21,7 @@ spec: http: 8080 ingress: enabled: true - hostname: nginx.${TENANT_DOMAIN}.apps.ai-2.kvant.cloud + hostname: nginx.${TENANT_DOMAIN} ingressClassName: external extraVolumes: - name: ${TENANT_NAMESPACE}-image-storage From 284040d0654c5134a72fff2f5e8f7a8d339b321c Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Fri, 4 Jul 2025 13:09:37 +0200 Subject: [PATCH 3/7] Use lb --- templates/image-server/nginx/helmrelease.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 761867c..ba01c8e 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -16,9 +16,7 @@ spec: namespace: ${TENANT_NAMESPACE} values: service: - type: ClusterIP - ports: - http: 8080 + loadBalancer: ingress: enabled: true hostname: nginx.${TENANT_DOMAIN} From 883d8152b837cb0d6005cbc3c0e70dbd108c9030 Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Fri, 4 Jul 2025 13:11:34 +0200 Subject: [PATCH 4/7] Use ip --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index ba01c8e..4dddebb 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -16,7 +16,7 @@ spec: namespace: ${TENANT_NAMESPACE} values: service: - loadBalancer: + clusterIP: ingress: enabled: true hostname: nginx.${TENANT_DOMAIN} From 9532ba8fe87c71f233fbdef65168867b6af427cb Mon Sep 17 00:00:00 2001 From: Baptiste Bonnot Date: Fri, 4 Jul 2025 13:16:51 +0200 Subject: [PATCH 5/7] Resolve conflict --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 4dddebb..0937d41 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -16,7 +16,7 @@ spec: namespace: ${TENANT_NAMESPACE} values: service: - clusterIP: + type: ClusterIP ingress: enabled: true hostname: nginx.${TENANT_DOMAIN} From 32ff5115f01299405fc62a721f71fd5183b5a50d Mon Sep 17 00:00:00 2001 From: "maximilian.bartz" Date: Fri, 4 Jul 2025 13:48:07 +0200 Subject: [PATCH 6/7] change port and change https to http in URL --- firewall-dev/vm/fortigate.yaml | 2 +- firewall-s3/vm/fortigate.yaml | 2 +- firewall/vm/fortigate.yaml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/firewall-dev/vm/fortigate.yaml b/firewall-dev/vm/fortigate.yaml index 0a987a8..e0b92a8 100644 --- a/firewall-dev/vm/fortigate.yaml +++ b/firewall-dev/vm/fortigate.yaml @@ -10,7 +10,7 @@ spec: spec: source: http: - url: http://nginx.demo.svc.cluster.local:8080/fortios_v7_6_3.qcow2 + url: http://nginx.demo.svc.cluster.local:80/fortios_v7_6_3.qcow2 storage: resources: requests: diff --git a/firewall-s3/vm/fortigate.yaml b/firewall-s3/vm/fortigate.yaml index 91352bc..caaaf55 100644 --- a/firewall-s3/vm/fortigate.yaml +++ b/firewall-s3/vm/fortigate.yaml @@ -10,7 +10,7 @@ spec: spec: source: http: - url: https://glacier-1.kvant.cloud/ocp-virt-images/sources/fortios_7_6_3.qcow2 + url: http://glacier-1.kvant.cloud/ocp-virt-images/sources/fortios_7_6_3.qcow2 secretRef: s3-virt-credentials storage: resources: diff --git a/firewall/vm/fortigate.yaml b/firewall/vm/fortigate.yaml index 84f2088..b0f6236 100644 --- a/firewall/vm/fortigate.yaml +++ b/firewall/vm/fortigate.yaml @@ -8,6 +8,9 @@ spec: - metadata: name: fortigate-rootdisk spec: + source: + http: + url: http://nginx.demo.svc.cluster.local:80/fortios_v7_6_3.qcow2 storage: resources: requests: From 4880851fa2f49226c9614fb901700efe45450454 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 4 Jul 2025 13:01:55 +0000 Subject: [PATCH 7/7] feat(docker-image)!: Update nginx Docker tag to v21 --- templates/image-server/nginx/helmrelease.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/image-server/nginx/helmrelease.yaml b/templates/image-server/nginx/helmrelease.yaml index 0937d41..095248d 100644 --- a/templates/image-server/nginx/helmrelease.yaml +++ b/templates/image-server/nginx/helmrelease.yaml @@ -9,7 +9,7 @@ spec: chart: spec: chart: nginx - version: 19.1.1 + version: 21.0.3 sourceRef: kind: HelmRepository name: bitnami