Upgrade to latest charts

rds/base/charts/all/Chart.lock

@@ -44,5 +44,11 @@ dependencies:
 - name: redis
   repository: file://../redis
   version: 16.13.2
-digest: sha256:643d0156dd67144f1b4fddf70d07155fbe6fc13ae31c06f0ef402f39b6580887
+- name: nextcloud
-generated: "2023-01-16T12:41:35.854+01:00"
+  repository: https://nextcloud.github.io/helm/
+  version: 3.5.4
+- name: owncloud
+  repository: https://owncloud-docker.github.io/helm-charts
+  version: 0.4.1
+digest: sha256:f1b7af01ca54c4afc63a5dd344e4b8ca30deb9e8312609c1397015dc0886c630
+generated: "2023-03-28T09:29:07.381386431+02:00"

rds/base/charts/all/Chart.yaml

@@ -1,106 +1,114 @@
 apiVersion: v2
-appVersion: "1.0"
+appVersion: ">0.2.5"
+description: A single chart for installing whole sciebo rds ecosystem.
+name: all
+version: 0.3.1
+home: https://www.research-data-services.org/
+type: application
+keywords:
+  - research
+  - data
+  - services
+  - zenodo
+maintainers:
+  - email: peter.heiss@uni-muenster.de
+    name: Heiss
+sources:
+  - https://github.com/Sciebo-RDS/Sciebo-RDS
+icon: https://www.research-data-services.org/img/sciebo.png
 dependencies:
-- condition: layer0-describo.enabled
+  - name: layer0-describo
-  name: layer0-describo
+    version: ^0.2.0
     repository: file://../layer0_describo
+    condition: layer0-describo.enabled
     tags:
       - layer0
-  version: ^0.2.0
+  - name: layer0-web
-- condition: layer0-web.enabled
+    version: ^0.3.0
-  name: layer0-web
     repository: file://../layer0_web
+    condition: layer0-web.enabled
     tags:
       - layer0
-  version: ^0.3.0
+  - name: layer0-helper-describo-token-updater
-- condition: feature.redis
+    version: ^0.2.0
-  name: layer0-helper-describo-token-updater
     repository: file://../layer0_helper_describo_token_updater
+    condition: feature.redis
     tags:
       - layer0
+  - name: layer1-port-openscienceframework
     version: ^0.2.0
-- condition: layer1-port-openscienceframework.enabled
-  name: layer1-port-openscienceframework
     repository: file://../layer1_port_openscienceframework
+    condition: layer1-port-openscienceframework.enabled
     tags:
       - layer1
+  - name: layer1-port-zenodo
     version: ^0.2.0
-- condition: layer1-port-zenodo.enabled
-  name: layer1-port-zenodo
     repository: file://../layer1_port_zenodo
+    condition: layer1-port-zenodo.enabled
     tags:
       - layer1
-  version: ^0.2.0
+  - name: layer1-port-owncloud
-- condition: layer1-port-owncloud.enabled
-  name: layer1-port-owncloud
-  repository: file://../layer1_port_owncloud
-  tags:
-  - layer1
     version: ^0.3.0
-- condition: layer1-port-reva.enabled
+    repository: file://../layer1_port_owncloud
-  name: layer1-port-reva
+    condition: layer1-port-owncloud.enabled
-  repository: file://../layer1_port_reva
     tags:
       - layer1
+  - name: layer1-port-reva
+    version: ^0.2.0
+    repository: file://../layer1_port_reva
+    condition: layer1-port-reva.enabled
+    tags:
+      - layer1
+  - name: layer2-exporter-service
     version: ^0.2.0
-- name: layer2-exporter-service
     repository: file://../layer2_exporter_service
     tags:
       - layer2
+  - name: layer2-port-service
     version: ^0.2.0
-- name: layer2-port-service
     repository: file://../layer2_port_service
     tags:
       - layer2
+  - name: layer2-metadata-service
     version: ^0.2.0
-- name: layer2-metadata-service
     repository: file://../layer2_metadata_service
     tags:
       - layer2
-  version: ^0.2.0
+  - name: layer3-token-storage
-- name: layer3-token-storage
+    version: ^0.3.0
     repository: file://../layer3_token_storage
     tags:
       - layer3
+  - name: layer3-research-manager
     version: ^0.3.0
-- name: layer3-research-manager
     repository: file://../layer3_research_manager
     tags:
       - layer3
-  version: ^0.3.0
+  - name: jaeger
-- condition: feature.jaeger
+    version: ^0.34.0
-  name: jaeger
     repository: file://../jaeger
+    condition: feature.jaeger
     tags:
       - monitoring
-  version: ^0.34.0
+  - name: redis-cluster
-- alias: redis
+    alias: redis
-  condition: feature.redis
-  name: redis-cluster
-  repository: file://../redis-cluster
-  tags:
-  - storage
     version: ^7.6.1
-- alias: redis-helper
+    repository: file://../redis-cluster
     condition: feature.redis
-  name: redis
-  repository: file://../redis
     tags:
       - storage
+  - name: redis
+    alias: redis-helper
     version: ^16.10.1
-description: A single chart for installing whole sciebo rds ecosystem.
+    repository: file://../redis
-home: https://www.research-data-services.org/
+    condition: feature.redis
-icon: https://www.research-data-services.org/img/sciebo.png
+    tags:
-keywords:
+      - storage
-- research
+  - name: nextcloud
-- data
+    version: ^3.5.2
-- services
+    repository: https://nextcloud.github.io/helm/
-- zenodo
+    condition: feature.nextcloud
-maintainers:
+  - name: owncloud
-- email: peter.heiss@uni-muenster.de
+    version: ^0.4.1
-  name: Heiss
+    repository: https://owncloud-docker.github.io/helm-charts
-name: all
+    condition: feature.owncloud
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: application
-version: 0.2.10

rds/base/charts/all/charts/layer0-describo/Chart.yaml

@@ -1,28 +0,0 @@
-apiVersion: v2
-appVersion: "1.0"
-dependencies:
-- name: postgresql
-  repository: file://../postgresql
-  tags:
-  - storage
-  version: 10.14.3
-- alias: layer0-describo-common
-  name: common
-  repository: file://../common
-  version: ^0.1.0
-description: A Helm chart for Kubernetes
-home: https://www.research-data-services.org/
-icon: https://www.research-data-services.org/img/sciebo.png
-keywords:
-- research
-- data
-- services
-- describo
-maintainers:
-- email: peter.heiss@uni-muenster.de
-  name: Heiss
-name: layer0-describo
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: application
-version: 0.2.9

rds/base/charts/all/charts/layer0-helper-describo-token-updater/Chart.yaml

@@ -1,26 +0,0 @@
-apiVersion: v2
-appVersion: "1.0"
-dependencies:
-- alias: layer0-helper-describo-token-updater-common
-  name: common
-  repository: file://../common
-  version: ^0.1.0
-description: A Helm chart for Kubernetes
-home: https://www.research-data-services.org/
-icon: https://www.research-data-services.org/img/sciebo.png
-keywords:
-- research
-- data
-- services
-- describo
-- describo-online
-- updater
-- layer3-token-storage
-maintainers:
-- email: peter.heiss@uni-muenster.de
-  name: Heiss
-name: layer0-helper-describo-token-updater
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: application
-version: 0.2.1

rds/base/charts/all/charts/layer0-helper-describo-token-updater/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer0-helper-describo-token-updater/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer0-helper-describo-token-updater/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer0-web/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer0-web/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer0-web/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer1-port-openscienceframework/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer1-port-openscienceframework/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer1-port-openscienceframework/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer1-port-openscienceframework/templates/configmap.yaml

@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portosfconfig
-  namespace: {{ .Release.Namespace  }}
-data:
-    OPENSCIENCEFRAMEWORK_OAUTH_CLIENT_ID: {{ .Values.environment.OAUTH_CLIENT_ID | quote }}
-    OPENSCIENCEFRAMEWORK_ADDRESS: {{ .Values.environment.ADDRESS | quote }}
-    OPENSCIENCEFRAMEWORK_API_ADDRESS: {{ .Values.environment.API_ADDRESS | quote }}
-    OPENSCIENCEFRAMEWORK_OAUTH_CLIENT_SECRET: {{ .Values.environment.OAUTH_CLIENT_SECRET | quote }}

rds/base/charts/all/charts/layer1-port-owncloud/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer1-port-owncloud/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer1-port-owncloud/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer1-port-reva/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer1-port-reva/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer1-port-reva/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer1-port-zenodo/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer1-port-zenodo/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer1-port-zenodo/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer1-port-zenodo/templates/configmap.yaml

@@ -1,9 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: portzenodoconfig
-  namespace: {{ .Release.Namespace  }}
-data:
-  ZENODO_OAUTH_CLIENT_ID: {{ .Values.environment.OAUTH_CLIENT_ID | quote }}
-  ZENODO_ADDRESS: {{ .Values.environment.ADDRESS | quote }}
-  ZENODO_OAUTH_CLIENT_SECRET: {{ .Values.environment.OAUTH_CLIENT_SECRET | quote }}

rds/base/charts/all/charts/layer2-exporter-service/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer2-exporter-service/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer2-exporter-service/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer2-metadata-service/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer2-metadata-service/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer2-metadata-service/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer2-port-service/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer2-port-service/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer2-port-service/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer3-research-manager/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer3-research-manager/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer3-research-manager/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/charts/layer3-token-storage/charts/common/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

rds/base/charts/all/charts/layer3-token-storage/charts/common/Chart.yaml

@@ -1,8 +0,0 @@
-apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
-name: common
-sources:
-- https://github.com/Sciebo-RDS/Sciebo-RDS
-type: library
-version: 0.1.2

rds/base/charts/all/charts/layer3-token-storage/charts/common/templates/_deployment.tpl

@@ -1,65 +0,0 @@
-
-{{/*
-Return the proper image name
-{{ include "common.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
-*/}}
-{{- define "common.image" -}}
-{{- $registryName := .imageRoot.registry -}}
-{{- $repositoryName := .imageRoot.repository -}}
-{{- if .repository -}}
-{{- $repositoryName = .repository -}}
-{{- end -}}
-{{- $tag := .imageRoot.tag | toString -}}
-{{- if .global }}
-    {{- if .global.image }}
-        {{- if .global.image.registry }}
-            {{- $registryName = .global.image.registry -}}
-        {{- end -}}
-        {{- if .global.image.tag -}}
-            {{- $tag = .global.image.tag | toString -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if $registryName }}
-{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
-{{- else -}}
-{{- printf "%s:%s" $repositoryName $tag -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "common.ingressAnnotations" -}}
-{{- $annotations := dict -}}
-{{- with .Values.ingress.annotations }}
-    {{- $annotations = . -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.annotations }}
-            {{- $annotations = mustMergeOverwrite .Values.global.ingress.annotations $annotations -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- toYaml $annotations -}}
-{{- end -}}
-
-
-{{- define "common.tlsSecretName" -}}
-{{- $secretName := "" -}}
-{{- if .Values.ingress }}
-    {{- if .Values.ingress.tls }}
-        {{- if .Values.ingress.tls.secretName }}
-            {{- $secretName = .Values.ingress.tls.secretName -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- if .Values.global }}
-    {{- if .Values.global.ingress }}
-        {{- if .Values.global.ingress.tls }}
-            {{- if .Values.global.ingress.tls.secretName }}
-                {{- $secretName = .Values.global.ingress.tls.secretName -}}
-            {{- end -}}
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-{{- printf "%s" $secretName -}}
-{{- end -}}

rds/base/charts/all/values.yaml

@@ -32,6 +32,8 @@ namespace:
 feature:
   jaeger: false
   redis: true
+  nextcloud: false
+  owncloud: false
 layer0-web:
   enabled: true
   environment:

rds/base/charts/common/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 1.16.0
-description: A Helm chart for Kubernetes
 name: common
-sources:
+description: A Helm chart for Kubernetes
-- https://github.com/Sciebo-RDS/Sciebo-RDS
 type: library
 version: 0.1.2
+appVersion: "1.16.0"
+sources:
+  - https://github.com/Sciebo-RDS/Sciebo-RDS

rds/base/charts/jaeger/Chart.yaml

@@ -20,4 +20,4 @@ maintainers:
 name: jaeger
 sources:
 - https://hub.docker.com/u/jaegertracing/
-version: 0.34.0
+version: 0.34.1

rds/base/charts/jaeger/charts/cassandra/Chart.yaml

@@ -3,6 +3,7 @@ appVersion: 3.11.6
 description: Apache Cassandra is a free and open-source distributed database management
   system designed to handle large amounts of data across many commodity servers, providing
   high availability with no single point of failure.
+engine: gotpl
 home: http://cassandra.apache.org
 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Cassandra_logo.svg/330px-Cassandra_logo.svg.png
 keywords: