diff --git a/Taskfile.yaml b/Taskfile.yaml index 30788b290..ed2844a72 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -43,10 +43,10 @@ tasks: - "for chart in $(echo {{.CHARTS}} | tr ',' ' '); do helm dependency update $chart; done" validate: cmds: - - task: update + - task: test - task: helm-docs + - task: update - task: lint - - task: test - task: oci vulnerability: deps: diff --git a/charts/account-operator-crds/Chart.yaml b/charts/account-operator-crds/Chart.yaml index 814d91735..202b7fe67 100644 --- a/charts/account-operator-crds/Chart.yaml +++ b/charts/account-operator-crds/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes type: application -version: 0.1.11 +version: 0.1.12 appVersion: "0.0.0" diff --git a/charts/account-operator/charts/account-operator-crds-0.1.11.tgz b/charts/account-operator/charts/account-operator-crds-0.1.11.tgz index 799a2434c..cfc6e8622 100644 Binary files a/charts/account-operator/charts/account-operator-crds-0.1.11.tgz and b/charts/account-operator/charts/account-operator-crds-0.1.11.tgz differ diff --git a/charts/account-operator/charts/common-0.2.7.tgz b/charts/account-operator/charts/common-0.2.7.tgz index 5749aba34..41874f087 100644 Binary files a/charts/account-operator/charts/common-0.2.7.tgz and b/charts/account-operator/charts/common-0.2.7.tgz differ diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index 3463935e2..e9f208227 100644 --- a/charts/common/Chart.yaml +++ b/charts/common/Chart.yaml @@ -4,4 +4,4 @@ description: A Helm chart containing reuse templates type: library -version: 0.2.7 +version: 0.2.8 diff --git a/charts/example-content/Chart.yaml b/charts/example-content/Chart.yaml index fe0749e04..91abfe51f 100644 --- a/charts/example-content/Chart.yaml +++ b/charts/example-content/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.140.0" description: Helm Chart for the openmfp Portal name: example-content -version: 0.111.18 +version: 0.112.0 dependencies: - name: common version: 0.2.7 diff --git a/charts/example-content/README.md b/charts/example-content/README.md index 50f9b8182..ea2ecf41a 100644 --- a/charts/example-content/README.md +++ b/charts/example-content/README.md @@ -12,9 +12,9 @@ Helm Chart for the openmfp Portal |-----|------|---------|-------------| | contentConfigurations.home | bool | `true` | This content configuration enables a basic homepage in the portal | | 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/"` | | ## Overriding Values diff --git a/charts/example-content/charts/common-0.2.7.tgz b/charts/example-content/charts/common-0.2.7.tgz index 5749aba34..41874f087 100644 Binary files a/charts/example-content/charts/common-0.2.7.tgz and b/charts/example-content/charts/common-0.2.7.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 d3a36823d..c4f311cdc 100644 --- a/charts/example-content/tests/__snapshot__/snapshot_test.yaml.snap +++ b/charts/example-content/tests/__snapshot__/snapshot_test.yaml.snap @@ -126,6 +126,26 @@ matches the snapshot: - emptyDir: {} name: run-volume 3: | + 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/ + route: + - destination: + host: RELEASE-NAME-example-content.NAMESPACE.svc.cluster.local + port: + number: 8080 + 4: | apiVersion: v1 imagePullSecrets: - name: github @@ -133,7 +153,7 @@ matches the snapshot: metadata: name: RELEASE-NAME-example-content namespace: NAMESPACE - 4: | + 5: | apiVersion: v1 kind: Service metadata: diff --git a/charts/example-content/values.yaml b/charts/example-content/values.yaml index e10456c85..aa39d4528 100644 --- a/charts/example-content/values.yaml +++ b/charts/example-content/values.yaml @@ -3,15 +3,20 @@ image: name: ghcr.io/openmfp/example-content istio: + enabled: true virtualService: hosts: - - your-host.com + - "*" matchers: - match: - uri: - exact: /ui/example-content - - uri: - prefix: /ui/example-content/ + prefix: /ui/ + # matchers: + # - match: + # - uri: + # exact: /ui/example-content + # - uri: + # prefix: /ui/example-content/ contentConfigurations: # -- This content configuration enables a basic homepage in the portal diff --git a/charts/extension-manager-operator-crds/Chart.yaml b/charts/extension-manager-operator-crds/Chart.yaml index 95b8ef1e5..8338b8b22 100644 --- a/charts/extension-manager-operator-crds/Chart.yaml +++ b/charts/extension-manager-operator-crds/Chart.yaml @@ -3,5 +3,5 @@ name: extension-manager-operator-crds description: A Helm chart for Kubernetes type: application -version: 0.1.7 +version: 0.1.8 appVersion: "0.0.0" diff --git a/charts/extension-manager-operator/charts/common-0.2.7.tgz b/charts/extension-manager-operator/charts/common-0.2.7.tgz index 5749aba34..41874f087 100644 Binary files a/charts/extension-manager-operator/charts/common-0.2.7.tgz and b/charts/extension-manager-operator/charts/common-0.2.7.tgz differ diff --git a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.7.tgz b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.7.tgz index 4de85fb24..6241c3a7f 100644 Binary files a/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.7.tgz and b/charts/extension-manager-operator/charts/extension-manager-operator-crds-0.1.7.tgz differ diff --git a/charts/infra/charts/common-0.2.7.tgz b/charts/infra/charts/common-0.2.7.tgz index 5749aba34..41874f087 100644 Binary files a/charts/infra/charts/common-0.2.7.tgz and b/charts/infra/charts/common-0.2.7.tgz differ diff --git a/charts/keycloak/charts/common-0.2.7.tgz b/charts/keycloak/charts/common-0.2.7.tgz index 5749aba34..41874f087 100644 Binary files a/charts/keycloak/charts/common-0.2.7.tgz and b/charts/keycloak/charts/common-0.2.7.tgz differ diff --git a/charts/keycloak/templates/crossplane/realm.yaml b/charts/keycloak/templates/crossplane/realm.yaml index 9444ef503..98209e591 100644 --- a/charts/keycloak/templates/crossplane/realm.yaml +++ b/charts/keycloak/templates/crossplane/realm.yaml @@ -1,4 +1,4 @@ -{{- if eq (include "common.getNestedValue" (dict "Values" .Values "key" "crossplane.enabled")) "true" -}} +{{- if eq (include "common.getKeyValue" (dict "Values" .Values "key" "crossplane.enabled")) "true" -}} apiVersion: realm.keycloak.crossplane.io/v1alpha1 kind: Realm metadata: diff --git a/charts/openmfp-crds/Chart.yaml b/charts/openmfp-crds/Chart.yaml index 3c4928160..170db7f7d 100644 --- a/charts/openmfp-crds/Chart.yaml +++ b/charts/openmfp-crds/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: openmfp-crds description: A chart containing CRD Definitions for OpenMFP type: application -version: 0.0.15 +version: 0.0.16 appVersion: "0.0.0" dependencies: diff --git a/charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz b/charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz index 799a2434c..cfc6e8622 100644 Binary files a/charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz and b/charts/openmfp-crds/charts/account-operator-crds-0.1.11.tgz differ diff --git a/charts/openmfp-crds/charts/extension-manager-operator-crds-0.1.7.tgz b/charts/openmfp-crds/charts/extension-manager-operator-crds-0.1.7.tgz index 4de85fb24..6241c3a7f 100644 Binary files a/charts/openmfp-crds/charts/extension-manager-operator-crds-0.1.7.tgz and b/charts/openmfp-crds/charts/extension-manager-operator-crds-0.1.7.tgz differ diff --git a/charts/openmfp/Chart.lock b/charts/openmfp/Chart.lock index 080b9f1f4..c41e3720c 100644 --- a/charts/openmfp/Chart.lock +++ b/charts/openmfp/Chart.lock @@ -1,10 +1,10 @@ dependencies: - name: example-content - repository: oci://ghcr.io/openmfp/helm-charts - version: 0.111.18 + repository: file://../example-content + version: 0.112.0 - name: portal - repository: oci://ghcr.io/openmfp/helm-charts - version: 0.71.38 + repository: file://../portal + version: 0.72.0 - name: infra repository: file://../infra version: 0.61.0 @@ -14,5 +14,5 @@ dependencies: - name: keycloak repository: file://../keycloak version: 0.61.0 -digest: sha256:816c23bc1b5b909df62bb115afd0859d18df81a022c69f51dadbd72f69311dd1 -generated: "2025-01-31T18:09:17.84755411+02:00" +digest: sha256:f9cc5e3295cf49f040846d7c7283027d5e3f644480be622a0c1746c4479ff467 +generated: "2025-02-01T16:29:13.469948+02:00" diff --git a/charts/openmfp/Chart.yaml b/charts/openmfp/Chart.yaml index bb2108857..0382a0fc1 100644 --- a/charts/openmfp/Chart.yaml +++ b/charts/openmfp/Chart.yaml @@ -7,12 +7,12 @@ appVersion: "0.0.0" dependencies: - name: example-content - version: 0.111.18 - repository: oci://ghcr.io/openmfp/helm-charts + version: 0.112.0 + repository: file://../example-content condition: components.example-content.enabled - name: portal - version: 0.71.38 - repository: oci://ghcr.io/openmfp/helm-charts + version: 0.72.0 + repository: file://../portal condition: components.portal.enabled - name: infra version: 0.61.0 diff --git a/charts/openmfp/charts/example-content-0.111.18.tgz b/charts/openmfp/charts/example-content-0.111.18.tgz deleted file mode 100644 index 6dcf0d9cf..000000000 Binary files a/charts/openmfp/charts/example-content-0.111.18.tgz and /dev/null differ diff --git a/charts/openmfp/charts/example-content-0.112.0.tgz b/charts/openmfp/charts/example-content-0.112.0.tgz new file mode 100644 index 000000000..26c1c3ad4 Binary files /dev/null and b/charts/openmfp/charts/example-content-0.112.0.tgz differ diff --git a/charts/openmfp/charts/extension-manager-operator-0.23.0.tgz b/charts/openmfp/charts/extension-manager-operator-0.23.0.tgz index 59c64a23b..19f2c665a 100644 Binary files a/charts/openmfp/charts/extension-manager-operator-0.23.0.tgz and b/charts/openmfp/charts/extension-manager-operator-0.23.0.tgz differ diff --git a/charts/openmfp/charts/infra-0.61.0.tgz b/charts/openmfp/charts/infra-0.61.0.tgz index c9a9f6cfc..b9a033c5e 100644 Binary files a/charts/openmfp/charts/infra-0.61.0.tgz and b/charts/openmfp/charts/infra-0.61.0.tgz differ diff --git a/charts/openmfp/charts/keycloak-0.61.0.tgz b/charts/openmfp/charts/keycloak-0.61.0.tgz index b1ef27187..edfb89351 100644 Binary files a/charts/openmfp/charts/keycloak-0.61.0.tgz and b/charts/openmfp/charts/keycloak-0.61.0.tgz differ diff --git a/charts/openmfp/charts/portal-0.71.38.tgz b/charts/openmfp/charts/portal-0.71.38.tgz deleted file mode 100644 index c39f2d3da..000000000 Binary files a/charts/openmfp/charts/portal-0.71.38.tgz and /dev/null differ diff --git a/charts/openmfp/charts/portal-0.72.0.tgz b/charts/openmfp/charts/portal-0.72.0.tgz new file mode 100644 index 000000000..b72b9a746 Binary files /dev/null and b/charts/openmfp/charts/portal-0.72.0.tgz differ diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml index cbad1e16b..4f2cc8018 100644 --- a/charts/portal/Chart.yaml +++ b/charts/portal/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Helm Chart for the openmfp Portal name: portal -version: 0.71.38 +version: 0.72.0 appVersion: "0.324.0" dependencies: - name: common diff --git a/charts/portal/README.md b/charts/portal/README.md index baee5c82a..257749744 100644 --- a/charts/portal/README.md +++ b/charts/portal/README.md @@ -14,7 +14,7 @@ Helm Chart for the openmfp Portal | cookieDomain | string | `"localhost"` | cookie domain | | developmentLandcsape | string | `"true"` | development landscape toggle | | environment | string | `"local"` | environment | -| extraEnvVars | object | `{}` | A way to provide additional experimental environment variables | +| extraEnvVars | list | `[{"name":"CRD_GATEWAY_API_URL","value":"http://localhost:8000/example-gateway/graphql"}]` | A way to provide additional experimental environment variables | | featureToggles | string | `"enableSessionAutoRefresh=true"` | | | frontendPort | int | `8000` | frontend port | | health.liveness.path | string | `"/rest/health"` | path used for the liveness probe | diff --git a/charts/portal/charts/common-0.2.7.tgz b/charts/portal/charts/common-0.2.7.tgz index 5749aba34..41874f087 100644 Binary files a/charts/portal/charts/common-0.2.7.tgz and b/charts/portal/charts/common-0.2.7.tgz differ diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 39587de26..a5ba1039f 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -34,7 +34,9 @@ baseDomains: cookieDomain: "localhost" # -- A way to provide additional experimental environment variables -extraEnvVars: {} +extraEnvVars: + - name: CRD_GATEWAY_API_URL + value: http://localhost:8000/example-gateway/graphql trust: openmfp: