diff --git a/charts/example-content/Chart.lock b/charts/example-content/Chart.lock index 0e6be5248..3e4aa7fd9 100644 --- a/charts/example-content/Chart.lock +++ b/charts/example-content/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://ghcr.io/openmfp/helm-charts - version: 0.2.8 -digest: sha256:88e8d528b6fcc70a9fb622aad43a0d896814acd2100d431c98b9603865dcc50a -generated: "2025-02-10T18:48:39.924098819Z" + version: 0.2.9 +digest: sha256:3ec6cdc8436e1e02b0f5ca64842f4f7559adbc6998124d7864d51143071ef569 +generated: "2025-02-12T15:44:26.260004137+02:00" diff --git a/charts/example-content/Chart.yaml b/charts/example-content/Chart.yaml index 07036e3cb..3d1411170 100644 --- a/charts/example-content/Chart.yaml +++ b/charts/example-content/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 appVersion: "0.151.0" description: Helm Chart for the openmfp Portal name: example-content -version: 0.113.8 +version: 0.114.0 dependencies: - name: common - version: 0.2.8 + version: 0.2.9 repository: oci://ghcr.io/openmfp/helm-charts diff --git a/charts/example-content/README.md b/charts/example-content/README.md index 9058db377..a4667f382 100644 --- a/charts/example-content/README.md +++ b/charts/example-content/README.md @@ -10,14 +10,16 @@ Helm Chart for the openmfp Portal ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| contentConfigurations.ui | object | `{"enabled":true,"url":"http://localhost:8000/ui/example-content/ui/assets/config.json"}` | This content configuration enables a basic homepage in the portal | +| contentConfigurations.ui | object | `{"enabled":true,"internalUrl":"http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/ui/assets/config.json","url":"http://localhost:8000/ui/example-content/ui/assets/config.json"}` | This content configuration enables a basic homepage in the portal | | contentConfigurations.wc.enabled | bool | `true` | | +| contentConfigurations.wc.internalUrl | string | `"http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/wc/assets/config.json"` | | | contentConfigurations.wc.url | string | `"http://localhost:8000/ui/example-content/wc/assets/config.json"` | | | contentProtocolDomain | string | `"https://example-content.some-domain.com"` | | | image.name | string | `"ghcr.io/openmfp/example-content"` | The image name | -| istio.virtualService.hosts[0] | string | `"your-host.com"` | | -| istio.virtualService.matchers[0].match[0].uri.exact | string | `"/ui/example-content"` | | -| istio.virtualService.matchers[0].match[1].uri.prefix | string | `"/ui/example-content/"` | | +| istio.enabled | bool | `true` | | +| istio.virtualService.hosts[0] | string | `"*"` | | +| istio.virtualService.matchers[0].match[0].uri.prefix | string | `"/ui/example-content"` | | +| istio.virtualService.matchers[0].rewrite.uri | string | `"/"` | | ## Overriding Values diff --git a/charts/example-content/charts/common-0.2.8.tgz b/charts/example-content/charts/common-0.2.8.tgz deleted file mode 100644 index c0a4dc86d..000000000 Binary files a/charts/example-content/charts/common-0.2.8.tgz and /dev/null differ diff --git a/charts/example-content/charts/common-0.2.9.tgz b/charts/example-content/charts/common-0.2.9.tgz new file mode 100644 index 000000000..cb933217a Binary files /dev/null and b/charts/example-content/charts/common-0.2.9.tgz differ diff --git a/charts/example-content/tests/__snapshot__/snapshot_test.yaml.snap b/charts/example-content/tests/__snapshot__/snapshot_test.yaml.snap index 18a0cd647..3d8c9444b 100644 --- a/charts/example-content/tests/__snapshot__/snapshot_test.yaml.snap +++ b/charts/example-content/tests/__snapshot__/snapshot_test.yaml.snap @@ -10,6 +10,7 @@ matches the snapshot: spec: remoteConfiguration: contentType: json + internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/ui/assets/config.json url: http://localhost:8000/ui/example-content/ui/assets/config.json 2: | apiVersion: core.openmfp.io/v1alpha1 @@ -22,6 +23,7 @@ matches the snapshot: spec: remoteConfiguration: contentType: json + internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/wc/assets/config.json url: http://localhost:8000/ui/example-content/wc/assets/config.json 3: | apiVersion: apps/v1 @@ -91,6 +93,28 @@ matches the snapshot: - emptyDir: {} name: run-volume 4: | + apiVersion: networking.istio.io/v1alpha3 + kind: VirtualService + metadata: + name: RELEASE-NAME-example-content + namespace: NAMESPACE + spec: + gateways: + - NAMESPACE/gateway + hosts: + - '*' + http: + - match: + - uri: + prefix: /ui/example-content + rewrite: + uri: / + route: + - destination: + host: RELEASE-NAME-example-content.NAMESPACE.svc.cluster.local + port: + number: 8080 + 5: | apiVersion: v1 imagePullSecrets: - name: github @@ -98,7 +122,7 @@ matches the snapshot: metadata: name: RELEASE-NAME-example-content namespace: NAMESPACE - 5: | + 6: | apiVersion: v1 kind: Service metadata: @@ -137,6 +161,7 @@ matches the snapshot (internalUrl): spec: remoteConfiguration: contentType: json + internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/wc/assets/config.json url: http://localhost:8000/ui/example-content/wc/assets/config.json 3: | apiVersion: apps/v1 @@ -206,6 +231,28 @@ matches the snapshot (internalUrl): - emptyDir: {} name: run-volume 4: | + apiVersion: networking.istio.io/v1alpha3 + kind: VirtualService + metadata: + name: RELEASE-NAME-example-content + namespace: NAMESPACE + spec: + gateways: + - NAMESPACE/gateway + hosts: + - '*' + http: + - match: + - uri: + prefix: /ui/example-content + rewrite: + uri: / + route: + - destination: + host: RELEASE-NAME-example-content.NAMESPACE.svc.cluster.local + port: + number: 8080 + 5: | apiVersion: v1 imagePullSecrets: - name: github @@ -213,7 +260,7 @@ matches the snapshot (internalUrl): metadata: name: RELEASE-NAME-example-content namespace: NAMESPACE - 5: | + 6: | apiVersion: v1 kind: Service metadata: diff --git a/charts/example-content/values.yaml b/charts/example-content/values.yaml index f266813ad..780cdc90b 100644 --- a/charts/example-content/values.yaml +++ b/charts/example-content/values.yaml @@ -3,26 +3,33 @@ image: name: ghcr.io/openmfp/example-content istio: + enabled: true virtualService: hosts: - - your-host.com + - "*" + # matchers: + # - match: + # - uri: + # prefix: /ui/ matchers: - match: - - uri: - exact: /ui/example-content - - uri: - prefix: /ui/example-content/ + - uri: + prefix: /ui/example-content + rewrite: + uri: / contentConfigurations: # -- This content configuration enables a basic homepage in the portal ui: enabled: true url: http://localhost:8000/ui/example-content/ui/assets/config.json + internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/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 + internalUrl: http://openmfp-example-content.openmfp-system.svc.cluster.local:8080/wc/assets/config.json # Set internal url especially for local a setup where the url is not reachable from within the cluster # internalUrl: null