feat(example-content): update version and add internal URL support fo…

…r local setup
openmfp · Feb 9, 2025 · 1dda425 · 1dda425
1 parent f24aea9
commit 1dda425
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/charts/example-content/Chart.yaml b/charts/example-content/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "0.148.0"
 description: Helm Chart for the openmfp Portal
 name: example-content
-version: 0.113.1
+version: 0.113.2
 dependencies:
   - name: common
     version: 0.2.7

diff --git a/charts/example-content/templates/contentconfigurations.yaml b/charts/example-content/templates/contentconfigurations.yaml
@@ -7,6 +7,9 @@ metadata:
 spec:
   remoteConfiguration:
     url: {{ .Values.contentConfigurations.ui.url }}
+    {{- if .Values.contentConfigurations.ui.internalUrl }}
+    internalUrl: {{ .Values.contentConfigurations.ui.internalUrl }}
+    {{- end }}
     contentType: json
 {{- end }}
 
@@ -20,5 +23,8 @@ metadata:
 spec:
   remoteConfiguration:
     url: {{ .Values.contentConfigurations.wc.url }}
+    {{- if .Values.contentConfigurations.wc.internalUrl }}
+    internalUrl: {{ .Values.contentConfigurations.wc.internalUrl }}
+    {{- end }}
     contentType: json
 {{- end }}
diff --git a/charts/example-content/values.yaml b/charts/example-content/values.yaml
@@ -18,8 +18,12 @@ contentConfigurations:
   ui:
     enabled: true
     url: http://localhost:8000/ui/example-content/ui/assets/config.json
+# Set internal url especially for local a setup where the url is not reachable from within the cluster
+#    internalUrl: null
   wc:
     enabled: true
     url: http://localhost:8000/ui/example-content/wc/assets/config.json
+# Set internal url especially for local a setup where the url is not reachable from within the cluster
+#    internalUrl: null
 
 contentProtocolDomain: https://example-content.some-domain.com
diff --git a/local-setup/kustomize/components/openmfp/release.yaml b/local-setup/kustomize/components/openmfp/release.yaml
@@ -31,10 +31,10 @@ spec:
       contentConfigurations:
         ui:
           enabled: true
-          url: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/ui/assets/config.json
+          internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/ui/assets/config.json
         wc:
           enabled: true
-          url: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/wc/assets/config.json
+          internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/wc/assets/config.json
       istio:
         enabled: true
         virtualService:
@@ -43,7 +43,9 @@ spec:
           matchers:
             - match:
               - uri:
-                  prefix: /ui/
+                  prefix: /ui/example-content
+              rewrite:
+                uri: /
     portal:
       baseDomains:
         - "localhost"