From 5e447fce72b367e4e551de7b0539ad439df18500 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Wed, 8 Nov 2023 15:28:11 +0100 Subject: [PATCH 1/3] add configs for web embed mode --- charts/ocis/docs/values.adoc.yaml | 4 ++++ charts/ocis/templates/web/deployment.yaml | 10 ++++++++++ charts/ocis/values.yaml | 4 ++++ 3 files changed, 18 insertions(+) diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index dfdc5b52..01693fc5 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -1813,6 +1813,10 @@ services: privacyURL: # Specifies the login url loginURL: + # Specifies the mode web is running in. Currently supported values are "embed" and "" (default). + mode: "" + # Specifies how web is being integrated when running in "embed"-mode. Currently supported values are "location" and "" (default). + embedTarget: "" # -- Persistence settings. # @default -- see detailed persistence configuration options below diff --git a/charts/ocis/templates/web/deployment.yaml b/charts/ocis/templates/web/deployment.yaml index aceeb62f..8a62baa5 100644 --- a/charts/ocis/templates/web/deployment.yaml +++ b/charts/ocis/templates/web/deployment.yaml @@ -71,6 +71,16 @@ spec: value: {{ .Values.services.web.config.theme.path | quote }} {{- end }} + {{- if .Values.services.web.config.mode }} + - name: WEB_OPTION_MODE + value: {{ .Values.services.web.config.mode | quote }} + {{- end }} + + {{- if .Values.services.web.config.embedTarget }} + - name: WEB_OPTION_EMBED_TARGET + value: {{ .Values.services.web.config.embedTarget | quote }} + {{- end }} + - name: WEB_UI_CONFIG_SERVER value: "https://{{ .Values.externalDomain }}" diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index a6808fee..4c3ce007 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -1812,6 +1812,10 @@ services: privacyURL: # Specifies the login url loginURL: + # Specifies the mode web is running in. Currently supported values are "embed" and "" (default). + mode: "" + # Specifies how web is being integrated when running in "embed"-mode. Currently supported values are "location" and "" (default). + embedTarget: "" # -- Persistence settings. # @default -- see detailed persistence configuration options below From 673dacb43bbb2fc6f1e78f77b15bd9e8adb19c98 Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Wed, 22 Nov 2023 08:00:55 +0100 Subject: [PATCH 2/3] adjust embed config to new structure --- charts/ocis/docs/values.adoc.yaml | 11 +++++++---- charts/ocis/templates/web/deployment.yaml | 15 ++++++++++----- charts/ocis/values.yaml | 11 +++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index 01693fc5..ca12152b 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -1813,10 +1813,13 @@ services: privacyURL: # Specifies the login url loginURL: - # Specifies the mode web is running in. Currently supported values are "embed" and "" (default). - mode: "" - # Specifies how web is being integrated when running in "embed"-mode. Currently supported values are "location" and "" (default). - embedTarget: "" + embed: + # Specifies if web "embed"-mode is enabled. Defaults to not being set (= disabled). + enabled: "" + # Specifies how web is being integrated when running in "embed"-mode. Currently supported values are "location" and "" (default). + target: "" + # Specifies a URL under which web can be integrated via iFrame. This needs to be specified when web is running in "embed"-mode. + messagesOrigin: "" # -- Persistence settings. # @default -- see detailed persistence configuration options below diff --git a/charts/ocis/templates/web/deployment.yaml b/charts/ocis/templates/web/deployment.yaml index 8a62baa5..765b3c84 100644 --- a/charts/ocis/templates/web/deployment.yaml +++ b/charts/ocis/templates/web/deployment.yaml @@ -71,14 +71,19 @@ spec: value: {{ .Values.services.web.config.theme.path | quote }} {{- end }} - {{- if .Values.services.web.config.mode }} - - name: WEB_OPTION_MODE - value: {{ .Values.services.web.config.mode | quote }} + {{- if .Values.services.web.config.embed.enabled }} + - name: WEB_OPTION_EMBED_ENABLED + value: {{ .Values.services.web.config.embed.enabled | quote }} {{- end }} - {{- if .Values.services.web.config.embedTarget }} + {{- if .Values.services.web.config.embed.target }} - name: WEB_OPTION_EMBED_TARGET - value: {{ .Values.services.web.config.embedTarget | quote }} + value: {{ .Values.services.web.config.embed.target | quote }} + {{- end }} + + {{- if .Values.services.web.config.embed.messagesOrigin }} + - name: WEB_OPTION_EMBED_MESSAGES_ORIGIN + value: {{ .Values.services.web.config.embed.messagesOrigin | quote }} {{- end }} - name: WEB_UI_CONFIG_SERVER diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index 4c3ce007..c8e24aee 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -1812,10 +1812,13 @@ services: privacyURL: # Specifies the login url loginURL: - # Specifies the mode web is running in. Currently supported values are "embed" and "" (default). - mode: "" - # Specifies how web is being integrated when running in "embed"-mode. Currently supported values are "location" and "" (default). - embedTarget: "" + embed: + # Specifies if web "embed"-mode is enabled. Defaults to not being set (= disabled). + enabled: "" + # Specifies how web is being integrated when running in "embed"-mode. Currently supported values are "location" and "" (default). + target: "" + # Specifies a URL under which web can be integrated via iFrame. This needs to be specified when web is running in "embed"-mode. + messagesOrigin: "" # -- Persistence settings. # @default -- see detailed persistence configuration options below From 3c34ffa20c2ca2752d914ff8b0698572b54346db Mon Sep 17 00:00:00 2001 From: Jannik Stehle Date: Wed, 22 Nov 2023 10:59:54 +0100 Subject: [PATCH 3/3] update ocis to 5.0.0-alpha.3 --- charts/ocis/Chart.yaml | 2 +- charts/ocis/README.md | 2 +- charts/ocis/docs/values-desc-table.adoc | 2 +- charts/ocis/docs/values.adoc.yaml | 2 +- charts/ocis/values.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/ocis/Chart.yaml b/charts/ocis/Chart.yaml index e61044f6..b212bc56 100644 --- a/charts/ocis/Chart.yaml +++ b/charts/ocis/Chart.yaml @@ -10,7 +10,7 @@ maintainers: url: https://owncloud.com type: application version: 0.5.0 -appVersion: 5.0.0-alpha.2 +appVersion: 5.0.0-alpha.3 kubeVersion: "" # please see https://doc.owncloud.com/ocis/next/deployment/container/orchestration/orchestration.html#get-the-chart for compatible Kubernetes versions sources: - https://github.com/owncloud/ocis-charts diff --git a/charts/ocis/README.md b/charts/ocis/README.md index abd7fb25..a64ef21a 100644 --- a/charts/ocis/README.md +++ b/charts/ocis/README.md @@ -2,7 +2,7 @@ [comment]: # (DONT EDIT THIS FILE, it is autogenerated. Instead you need to edit README.md.gotmpl) # ownCloud Infinite Scale (oCIS) Helm chart -![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0-alpha.2](https://img.shields.io/badge/AppVersion-5.0.0--alpha.2-informational?style=flat-square) +![Version: 0.5.0](https://img.shields.io/badge/Version-0.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0-alpha.3](https://img.shields.io/badge/AppVersion-5.0.0--alpha.3-informational?style=flat-square) Installs [ownCloud Infinite Scale](https://doc.owncloud.com/ocis/next/). diff --git a/charts/ocis/docs/values-desc-table.adoc b/charts/ocis/docs/values-desc-table.adoc index 8eb102c7..88d8b72d 100644 --- a/charts/ocis/docs/values-desc-table.adoc +++ b/charts/ocis/docs/values-desc-table.adoc @@ -808,7 +808,7 @@ a| [subs=-attributes] a| [subs=-attributes] +string+ a| [subs=-attributes] -`"0885717d215567b105aaae2fadf687594fd0eef834a6c11e6cc1f55c58abc950"` +`"3b056182307344f79544f44d91808dabf9014c200554f9ed17719366b526bf63"` | Image sha / digest (optional). | image.tag a| [subs=-attributes] diff --git a/charts/ocis/docs/values.adoc.yaml b/charts/ocis/docs/values.adoc.yaml index ca12152b..9fea8d35 100644 --- a/charts/ocis/docs/values.adoc.yaml +++ b/charts/ocis/docs/values.adoc.yaml @@ -7,7 +7,7 @@ image: # -- Image tag. Defaults to the chart's appVersion. tag: "latest" # -- Image sha / digest (optional). - sha: "0885717d215567b105aaae2fadf687594fd0eef834a6c11e6cc1f55c58abc950" # oCIS as of 5.0.0-alpha.2 + sha: "3b056182307344f79544f44d91808dabf9014c200554f9ed17719366b526bf63" # oCIS as of 5.0.0-alpha.3 # -- Image pull policy pullPolicy: IfNotPresent # -- Names of the secret containing the credentials to pull an image from the registry. More diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index c8e24aee..5dd49e91 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -6,7 +6,7 @@ image: # -- Image tag. Defaults to the chart's appVersion. tag: "latest" # -- Image sha / digest (optional). - sha: "0885717d215567b105aaae2fadf687594fd0eef834a6c11e6cc1f55c58abc950" # oCIS as of 5.0.0-alpha.2 + sha: "3b056182307344f79544f44d91808dabf9014c200554f9ed17719366b526bf63" # oCIS as of 5.0.0-alpha.3 # -- Image pull policy pullPolicy: IfNotPresent # -- Names of the secret containing the credentials to pull an image from the registry. More