add configs for web embed mode

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

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/).
 

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]

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
@@ -1813,6 +1813,13 @@ services:
       privacyURL:
       # Specifies the login url
       loginURL:
+      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

charts/ocis/templates/web/deployment.yaml

@@ -71,6 +71,21 @@ spec:
               value: {{ .Values.services.web.config.theme.path | quote }}
             {{- end }}
 
+            {{- 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.embed.target }}
+            - name: WEB_OPTION_EMBED_TARGET
+              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
               value: "https://{{ .Values.externalDomain }}"
 

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
@@ -1812,6 +1812,13 @@ services:
       privacyURL:
       # Specifies the login url
       loginURL:
+      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