e41041b327
After the OSH-I upversion, the Ingress Helm chart was changed from the one from Openstack community to the Ingress-nginx. A previous commit [1] added the new Helm chart to the build environment and another [2] created the manifest for this new Ingress chart. Now, this review removes the old Ingress manifest and activates the new Ingress Helm chart. A patch was created to rename the Ingress Helm-chart so it wouldn't have a conflict with the Ingress deployed by the platform. All manifests and plugins of the old Ingress was deleted, and all references (kustomization, dependencies, etc...) was changed to the new Ingress chart name. The new Ingress was placed as a dependency to the OSH-I debian package. This dependencie was moved to the stx-openstack-helm-fluxcd debian control, to facilitate the tarball building proccess. As it was, the new Ingress needed to be declared in the tarball building call, with this change this is not necessary anymore. Finally the name for the ingressClass name in all Helm charts' Ingress was changed for the new name defined by the Ingress patch. [1] - https://review.opendev.org/c/starlingx/openstack-armada-app/+/937396 [2] - https://review.opendev.org/c/starlingx/openstack-armada-app/+/937174 Test Plan: PASS - Build all packages and STX-O tarball PASS - STX-O upload and apply PASS - New Ingress Helm chart deployed with new name PASS - Ingress from all charts with new ingressclassname PASS - Ingress comunicates with other Helm charts PASS - Launch a VM This is the last change in the realtion chain related to the upversion to the Caracal version and the activation of the new Ingress chart. All reviews must be merged together, otherwise the build and apply of STX-O will break. Story: 2011303 Task: 51611 Change-Id: If10a47a470b6e32ccb1090dbaa604fcbf6d1f82e Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
53 lines
2.9 KiB
Diff
53 lines
2.9 KiB
Diff
From e94108931a7ed75882b4bd5da463fee3f0f231f5 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Caires <DanielMarques.Caires@windriver.com>
|
|
Date: Mon, 13 Jan 2025 10:40:59 -0300
|
|
Subject: [PATCH] Fix upversion breaking changes
|
|
|
|
After the OSH and OSH-I to caracal, two changes made into the upstream
|
|
broke the deployment of STX-O.
|
|
|
|
The first change it was a enconding of the password. This broke the
|
|
apply of STX-O because urlquery is a GO template function and when
|
|
the plugin tries to retrieve the password from the Helm environment
|
|
it is not encoded the same way.
|
|
|
|
The second change modified the pathtype of the Helm charts' ingress.
|
|
|
|
This patch reverts this two modification to the upstream.
|
|
|
|
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
|
|
---
|
|
.../templates/endpoints/_authenticated_endpoint_uri_lookup.tpl | 2 +-
|
|
helm-toolkit/templates/manifests/_ingress.tpl | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
|
|
index d7390d8b..12b84dec 100644
|
|
--- a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
|
|
+++ b/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl
|
|
@@ -50,7 +50,7 @@ return: |
|
|
{{- $endpointScheme := tuple $type $endpoint $port $context | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}
|
|
{{- $userMap := index $context.Values.endpoints ( $type | replace "-" "_" ) "auth" $userclass }}
|
|
{{- $endpointUser := index $userMap "username" }}
|
|
-{{- $endpointPass := index $userMap "password" | urlquery }}
|
|
+{{- $endpointPass := index $userMap "password" }}
|
|
{{- $endpointHost := tuple $type $endpoint $context | include "helm-toolkit.endpoints.endpoint_host_lookup" }}
|
|
{{- $endpointPort := tuple $type $endpoint $port $context | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
|
{{- $endpointPath := tuple $type $endpoint $port $context | include "helm-toolkit.endpoints.keystone_endpoint_path_lookup" }}
|
|
diff --git a/helm-toolkit/templates/manifests/_ingress.tpl b/helm-toolkit/templates/manifests/_ingress.tpl
|
|
index cacb4b81..4ea88966 100644
|
|
--- a/helm-toolkit/templates/manifests/_ingress.tpl
|
|
+++ b/helm-toolkit/templates/manifests/_ingress.tpl
|
|
@@ -625,7 +625,7 @@ examples:
|
|
{{- $backendServiceType := index . "backendServiceType" -}}
|
|
{{- $backendPort := index . "backendPort" -}}
|
|
{{- $endpoint := index . "endpoint" | default "public" -}}
|
|
-{{- $pathType := index . "pathType" | default "Prefix" -}}
|
|
+{{- $pathType := index . "pathType" | default "ImplementationSpecific" -}}
|
|
{{- $certIssuer := index . "certIssuer" | default "" -}}
|
|
{{- $ingressName := tuple $backendServiceType $endpoint $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
|
|
{{- $backendName := tuple $backendServiceType "internal" $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
|
|
--
|
|
2.34.1
|
|
|