From 5fa9a9f597eeb056d61b832e3d4b94118aebbfbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20B=C3=A4ume?= <julian.baeume@open-xchange.com>
Date: Mon, 11 Sep 2023 11:29:14 +0200
Subject: [PATCH] [Chore] Fix preview deployments
UI Middleware instance for prefix deployments was not restarted, so deployment could be "old".
Online help was broken for prefix deployments, adjusted virtualservice to match deployment
---
.gitlab/preview-prefix/kubernetes-resources.yaml | 8 ++++++--
.gitlab/preview-prefix/values-template.yaml | 5 +++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/.gitlab/preview-prefix/kubernetes-resources.yaml b/.gitlab/preview-prefix/kubernetes-resources.yaml
index 0eb5ef8..d85a733 100644
--- a/.gitlab/preview-prefix/kubernetes-resources.yaml
+++ b/.gitlab/preview-prefix/kubernetes-resources.yaml
@@ -11,8 +11,10 @@ spec:
http:
- match:
- uri:
- prefix: /help-documents
+ prefix: /appsuite/help-documents
name: office-user-guide
+ rewrite:
+ uri: /help-documents
route:
- destination:
host: preview-app-office-user-guide
@@ -20,8 +22,10 @@ spec:
number: 80
- match:
- uri:
- prefix: /help
+ prefix: /appsuite/help
name: user-guide
+ rewrite:
+ uri: /help
route:
- destination:
host: preview-app-core-user-guide
diff --git a/.gitlab/preview-prefix/values-template.yaml b/.gitlab/preview-prefix/values-template.yaml
index 5d03dcf..9e58d23 100644
--- a/.gitlab/preview-prefix/values-template.yaml
+++ b/.gitlab/preview-prefix/values-template.yaml
@@ -3,6 +3,11 @@ imagePullSecrets:
appRoot: /appsuite/
+podAnnotations:
+ commit-ref: "${CI_COMMIT_SHORT_SHA}"
+deploymentAnnotations:
+ commit-ref: "${CI_COMMIT_SHORT_SHA}"
+
image:
registry: ${CI_REGISTRY}
repository: frontend/ui-middleware
--
GitLab