diff --git a/.drone.star b/.drone.star index 77da484f987..cc2b79f8a60 100644 --- a/.drone.star +++ b/.drone.star @@ -1180,6 +1180,8 @@ def localApiTestPipeline(ctx): # SERVICES # #################### services = [] + if params["collaborationServiceNeeded"]: + services += fakeOffice() + collaboraService() + onlyofficeService() if run_on_k8s: services += k3sCluster(ocm = params["federationServer"]) if params["federationServer"]: @@ -1189,8 +1191,6 @@ def localApiTestPipeline(ctx): services += emailService() if params["antivirusNeeded"]: services += clamavService() - if params["collaborationServiceNeeded"]: - services += fakeOffice() + collaboraService() + onlyofficeService() #################### # PIPELINE # @@ -2871,35 +2871,39 @@ def ocisServerK8s(federation = False, antivirus = False, email = False, tika = F fed_name = FED_OCIS_SERVER_NAME fed_url = OCIS_FED_URL_K8S + steps = [] expose_ext_server_step = [] external_servers = [] - steps = prepareOcisDeployment() - if antivirus: - steps += enableAntivirusServiceK8s() - if email: - steps += enableEmailServiceK8s() - if tika: - steps += enableTikaServiceK8s() + environment = { + "ENABLE_ANTIVIRUS": antivirus, + "ENABLE_EMAIL": email, + "ENABLE_TIKA": tika, + "ENABLE_WOPI": wopi, + "ENABLE_OCM": federation, + } + if wopi: - steps += enableAppsIntegrationK8s() external_servers += [["collabora", 9980], ["fakeoffice", 8080], ["onlyoffice", 443]] + steps += waitForServices("online-offices", ["collabora:9980", "onlyoffice:443", "fakeoffice:8080"]) if external_servers: expose_ext_server_step = exposeExternalServersK8s(external_servers) + steps += prepareChartsK8s(environment) + steps += waitK3sCluster(name) + \ (waitK3sCluster(fed_name) if federation else []) + \ - setupOcisConfigMaps(name) + \ - (setupOcisConfigMaps(fed_name) if federation else []) + \ + setupConfigMapsK8s(name) + \ + (setupConfigMapsK8s(fed_name) if federation else []) + \ expose_ext_server_step + \ - deployOcis(name) + \ - (deployOcis(fed_name) if federation else []) + \ - streamK8sOcisLogs(name) + \ + deployOcisK8s(name) + \ + (deployOcisK8s(fed_name) if federation else []) + \ + streamOcisLogsK8s(name) + \ waitForOcis(name, url) + \ - (waitForOcis(fed_name, fed_url) if federation else []) - - return steps + ociswrapperK8s(name) + (waitForOcis(fed_name, fed_url) if federation else []) + \ + ociswrapperK8s(name) + return steps def redis(): return [ @@ -4027,49 +4031,21 @@ def waitK3sCluster(name = OCIS_SERVER_NAME): ], }] -def prepareOcisDeployment(): +def prepareChartsK8s(environment = []): commands = [ # build ocis wrapper "make -C %s build" % dirs["ocisWrapper"], # get ocis charts - "if [ ! -d %s/ocis-charts ]; then git clone --single-branch -b main --depth 1 https://github.com/owncloud/ocis-charts.git; fi" % dirs["base"], - # move CI values file - "mv %s/tests/config/drone/k8s/values.yaml %s/ocis-charts/charts/ocis/ci/deployment-values.yaml" % (dirs["base"], dirs["base"]), - # enable authbasic service - "cp -r %s/tests/config/drone/k8s/authbasic %s/ocis-charts/charts/ocis/templates/" % (dirs["base"], dirs["base"]), - # copy override template - "cp tests/config/drone/k8s/_zoverride.tpl ocis-charts/charts/ocis/templates/_common/", - "cd ocis-charts", - # patch activitylog service - "sed -i '/env:/a\\\\{{- include \"ocis.caEnv\" $ | nindent 12}}' ./charts/ocis/templates/activitylog/deployment.yaml", - "sed -i '/volumeMounts:/a\\\\{{- include \"ocis.caPath\" $ | nindent 12}}' ./charts/ocis/templates/activitylog/deployment.yaml", - "sed -i '/volumes:/a\\\\{{- include \"ocis.caVolume\" $ | nindent 8}}' ./charts/ocis/templates/activitylog/deployment.yaml", - # disable audit logs in console - "sed -i '/AUDIT_LOG_TO_CONSOLE/{n;s/true/false/;}' ./charts/ocis/templates/audit/deployment.yaml", - "sed -i '/{{- define \"ocis.basicServiceTemplates\" -}}/a\\\\ {{- $_ := set .scope \"appNameAuthBasic\" \"authbasic\" -}}' ./charts/ocis/templates/_common/_tplvalues.tpl", - "sed -i '/- name: IDM_ADMIN_PASSWORD/{n;N;N;N;d;}' ./charts/ocis/templates/idm/deployment.yaml", - "sed -i '/- name: IDM_ADMIN_PASSWORD/a\\\\\\n value: \"admin\"' ./charts/ocis/templates/idm/deployment.yaml", - "sed -i '/- name: STORAGE_PUBLICLINK_DEBUG_ADDR/i\\\\ {{- include \"ocis.persistentStore\" . | nindent 12 }}\\\n' ./charts/ocis/templates/storagepubliclink/deployment.yaml", - "sed -i '/- name: PROXY_HTTP_ADDR/i\\\\ - name: PROXY_ENABLE_BASIC_AUTH\\\n value: \"true\"' ./charts/ocis/templates/proxy/deployment.yaml", - "sed -i 's|/etc/ocis/sharing-banned-passwords.txt|config/drone/banned-password-list.txt|' ./charts/ocis/templates/sharing/deployment.yaml", - "sed -i 's|- name: configs|- name: banned-passwords|' ./charts/ocis/templates/sharing/deployment.yaml", - "sed -i 's|mountPath: /etc/ocis$|mountPath: /etc/ocis/config/drone|' ./charts/ocis/templates/sharing/deployment.yaml", - "sed -i 's|name: sharing-banned-passwords-{{ .appName }}|name: sharing-banned-passwords|' ./charts/ocis/templates/sharing/deployment.yaml", - "sed -i 's|/etc/ocis/sharing-banned-passwords.txt|config/drone/banned-password-list.txt|' ./charts/ocis/templates/frontend/deployment.yaml", - "sed -i 's|- name: configs|- name: banned-passwords|' ./charts/ocis/templates/frontend/deployment.yaml", - "sed -i 's|mountPath: /etc/ocis$|mountPath: /etc/ocis/config/drone|' ./charts/ocis/templates/frontend/deployment.yaml", - "sed -i 's|name: sharing-banned-passwords-{{ .appName }}|name: sharing-banned-passwords|' ./charts/ocis/templates/frontend/deployment.yaml", - # Patch thumbnails deployment to mount Unicode fonts (ConfigMaps created in k3sCluster) - "sed -i '/- name: THUMBNAILS_TRANSFER_TOKEN/i\\\\ - name: THUMBNAILS_TXT_FONTMAP_FILE\\\n value: /etc/ocis/fontsMap.json\\\n' ./charts/ocis/templates/thumbnails/deployment.yaml", - "sed -i '/volumeMounts:/a\\\\ - name: ocis-fonts-ttf\\\n mountPath: /etc/ocis/fonts\\\n - name: ocis-fonts-map\\\n mountPath: /etc/ocis/fontsMap.json\\\n subPath: fontsMap.json' ./charts/ocis/templates/thumbnails/deployment.yaml", - "sed -i '/volumes:/a\\\\ - name: ocis-fonts-ttf\\\n configMap:\\\n name: ocis-fonts-ttf\\\n - name: ocis-fonts-map\\\n configMap:\\\n name: ocis-fonts-map' ./charts/ocis/templates/thumbnails/deployment.yaml", - "sed -i -E 's|value: http:\\\\/\\\\/.*:9300|value: {{ $officeSuite.wopiSrc }}|' ./charts/ocis/templates/collaboration/deployment.yaml", - "cat ./charts/ocis/templates/collaboration/deployment.yaml", + "[ ! -d %s/ocis-charts ] && " % dirs["base"] + + "git clone --single-branch -b main --depth 1 https://github.com/owncloud/ocis-charts.git", + # prepare charts for the tests + "bash %s/tests/config/drone/k8s/setup.sh %s" % (dirs["base"], dirs["base"]), ] return [{ "name": "prepare-ocis-deployment", "image": OC_CI_GOLANG, + "environment": environment, "commands": commands, "volumes": [ { @@ -4079,18 +4055,15 @@ def prepareOcisDeployment(): ], }] -def setupOcisConfigMaps(name = OCIS_SERVER_NAME): +def setupConfigMapsK8s(name = OCIS_SERVER_NAME): step_name = "setup-configmaps-" + name commands = [ "export KUBECONFIG=%s/kubeconfig-$${DRONE_BUILD_NUMBER}-%s.yaml" % (dirs["base"], name), # Create namespace for oCIS deployment "kubectl create namespace ocis || true", - "kubectl create configmap -n ocis sharing-banned-passwords --from-file=banned-password-list.txt=%s/tests/config/drone/banned-password-list.txt" % dirs["base"], # Setup Unicode font support for thumbnails - create ConfigMaps - "echo '{\"defaultFont\": \"/etc/ocis/fonts/NotoSans.ttf\"}' > %s/fontsMap.json" % dirs["base"], "kubectl create configmap -n ocis ocis-fonts-ttf --from-file=%s/tests/config/drone/NotoSans.ttf" % dirs["base"], - "kubectl create configmap -n ocis ocis-fonts-map --from-file=%s/fontsMap.json" % dirs["base"], ] return [{ @@ -4100,39 +4073,27 @@ def setupOcisConfigMaps(name = OCIS_SERVER_NAME): "commands": commands, }] -def deployOcis(name = OCIS_SERVER_NAME): +def deployOcisK8s(name = OCIS_SERVER_NAME): step_name = "deploy-" + name - commands = [ - "export KUBECONFIG=%s/kubeconfig-$${DRONE_BUILD_NUMBER}-%s.yaml" % (dirs["base"], name), - "cd %s/ocis-charts" % dirs["base"], - ] - - if name == FED_OCIS_SERVER_NAME: - commands.extend([ - "sed -i 's|externalDomain: ocis-server|externalDomain: %s|' ./charts/ocis/ci/deployment-values.yaml" % FED_OCIS_SERVER_NAME, - ]) - - commands.extend([ - # [NOTE] - # Remove schema validation to add extra configs in values.yaml. - # Also this allows us to use fakeoffice as web-office server - "rm ./charts/ocis/values.schema.json", - "make helm-install-atomic", - ]) return [{ "name": step_name, "image": OC_CI_GOLANG, - "commands": commands, - "volumes": [ - { - "name": "gopath", - "path": "/go", - }, + "commands": [ + "export KUBECONFIG=%s/kubeconfig-$${DRONE_BUILD_NUMBER}-%s.yaml" % (dirs["base"], name), + "cd %s/ocis-charts" % dirs["base"], + # update external domain + "sed -i 's|externalDomain:.*|externalDomain: %s|' ./charts/ocis/ci/deployment-values.yaml" % name, + # [NOTE] + # Remove schema validation to add extra configs in values.yaml. + # Also this allows us to use fakeoffice as web-office server + "rm ./charts/ocis/values.schema.json || true", + # deploy ocis + "make helm-install-atomic", ], }] -def streamK8sOcisLogs(name = OCIS_SERVER_NAME): +def streamOcisLogsK8s(name = OCIS_SERVER_NAME): return [{ "name": "%s-logs" % name, "image": OC_CI_ALPINE, @@ -4143,36 +4104,6 @@ def streamK8sOcisLogs(name = OCIS_SERVER_NAME): ], }] -def enableAntivirusServiceK8s(): - return [{ - "name": "enable-antivirus-service", - "image": OC_CI_ALPINE, - "commands": [ - "cp -r %s/tests/config/drone/k8s/clamav %s/ocis-charts/charts/ocis/templates/" % (dirs["base"], dirs["base"]), - "sed -i '/^ virusscan:/,/^ *[^ ]/ s/enabled: .*/enabled: true/' %s/ocis-charts/charts/ocis/ci/deployment-values.yaml" % dirs["base"], - "sed -i '/name: ANTIVIRUS_SCANNER_TYPE/{n;s/value: *\"icap\"/value: \"clamav\"/}' %s/ocis-charts/charts/ocis/templates/antivirus/deployment.yaml" % dirs["base"], - "sed -i '/- name: ANTIVIRUS_SCANNER_TYPE/i\\\\ - name: ANTIVIRUS_CLAMAV_SOCKET\\\n value: \"tcp://clamav:3310\"' %s/ocis-charts/charts/ocis/templates/antivirus/deployment.yaml" % dirs["base"], - ], - }] - -def enableAppsIntegrationK8s(): - return [{ - "name": "enable-apps-integration", - "image": OC_CI_ALPINE, - "commands": [ - "sed -i '/^ appsIntegration:/,/^ *[^ ]/ s/enabled: .*/enabled: true/' %s/ocis-charts/charts/ocis/ci/deployment-values.yaml" % dirs["base"], - ], - }] - -def enableEmailServiceK8s(): - return [{ - "name": "copy-%s-service" % EMAIL_SMTP_HOST, - "image": OC_CI_ALPINE, - "commands": [ - "cp -r %s/tests/config/drone/k8s/mailpit %s/ocis-charts/charts/ocis/templates/" % (dirs["base"], dirs["base"]), - ], - }] - def exposeEmailServiceK8s(name = OCIS_SERVER_NAME): return [{ "name": EMAIL_SMTP_HOST, @@ -4193,6 +4124,7 @@ def exposeAntivirusServiceK8s(name = OCIS_SERVER_NAME): "commands": [ "export KUBECONFIG=kubeconfig-$${DRONE_BUILD_NUMBER}-%s.yaml" % name, "until test -f $${KUBECONFIG}; do sleep 1s; done", + "kubectl get pods -A", # expose antivirus service via NodePort "kubectl -n ocis expose deployment antivirus --type=NodePort --port=9277 --name=antivirus-np", "kubectl -n ocis patch svc antivirus-np -p '{\"spec\":{\"ports\":[{\"port\":9277,\"nodePort\":30277}]}}'", @@ -4219,18 +4151,6 @@ def ociswrapperK8s(name = OCIS_SERVER_NAME, ocis_url = OCIS_URL_K8S): ], }] -def enableTikaServiceK8s(): - return [{ - "name": "tika", - "type": "docker", - "image": OC_CI_ALPINE, - "commands": [ - "until test -f %s/ocis-charts/charts/ocis/templates/search/deployment.yaml; do sleep 1s; done" % dirs["base"], - "cp -r %s/tests/config/drone/k8s/tika %s/ocis-charts/charts/ocis/templates/" % (dirs["base"], dirs["base"]), - "sed -i '/^[[:space:]]*storagesystem:/i\\\\ search:\\\n extractor:\\\n type: \"tika\"\\\n tika:\\\n url: \"http://tika:9998\"\\\n persistence:\\\n enabled: true\\\n accessModes:\\\n - ReadWriteOnce' %s/ocis-charts/charts/ocis/ci/deployment-values.yaml" % dirs["base"], - ], - }] - def exposeNodePortsK8s(services = [], name = OCIS_SERVER_NAME): commands = [] for idx, service in enumerate(services): diff --git a/.gitignore b/.gitignore index 778edd15ff2..f9988f0c791 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,6 @@ go.work.sum .envrc CLAUDE.md .claude/ + +# charts +ocis-charts/ \ No newline at end of file diff --git a/tests/config/drone/k8s/_zoverride.tpl b/tests/config/drone/k8s/_zoverride.tpl deleted file mode 100644 index e0d06d7f914..00000000000 --- a/tests/config/drone/k8s/_zoverride.tpl +++ /dev/null @@ -1,29 +0,0 @@ -{{/* - -DO NOT RENAME THIS FILE - -Filename: _zoverride.tpl - -Override filename starts with 'z' -to make sure it is loaded after all other templates. - -Using the existing variable definitions -which are already included in most of the templates. -*/}} - -{{- define "ocis.caPath" -}} -- name: logdir - mountPath: /logs -{{- end -}} - -{{- define "ocis.caVolume" -}} -- name: logdir - hostPath: - path: /logs - type: Directory -{{- end -}} - -{{- define "ocis.caEnv" -}} -- name: OCIS_LOG_FILE - value: /logs/ocis.log -{{- end -}} diff --git a/tests/config/drone/k8s/setup.sh b/tests/config/drone/k8s/setup.sh new file mode 100644 index 00000000000..354703ee0b5 --- /dev/null +++ b/tests/config/drone/k8s/setup.sh @@ -0,0 +1,70 @@ +#!/bin/bash + +set -e + +ROOT="." +if [[ -n "$1" ]]; then + ROOT="$1" +fi + +CFG_DIR="$ROOT/tests/config/drone/k8s" +CHT_DIR="$ROOT/ocis-charts/charts/ocis" +TPL_DIR="$CHT_DIR/templates" + +if [[ ! -d "$ROOT/ocis-charts" ]]; then + echo "Error: ocis-charts not found in $ROOT/ocis-charts. Please clone it first." + exit 1 +fi + +# patch ocis service templates +for service in "$TPL_DIR"/*/; do + if [[ -f "$service/deployment.yaml" ]]; then + if grep -qE 'ocis.caEnv' "$service/deployment.yaml"; then + sed -i '/.*ocis.caEnv.*/a\{{- include "ocis.extraEnvs" . | nindent 12 }}' "$service/deployment.yaml" + sed -i '/.*ocis.caPath.*/a\{{- include "ocis.extraVolMounts" . | nindent 12 }}' "$service/deployment.yaml" + sed -i '/.*ocis.caVolume.*/a\{{- include "ocis.extraVolumes" . | nindent 8 }}' "$service/deployment.yaml" + else + sed -i '/env:/a\{{- include "ocis.extraEnvs" . | nindent 12 }}' "$service/deployment.yaml" + sed -i '/volumeMounts:/a\{{- include "ocis.extraVolMounts" . | nindent 12 }}' "$service/deployment.yaml" + sed -i '/volumes:/a\{{- include "ocis.extraVolumes" . | nindent 8 }}' "$service/deployment.yaml" + fi + fi +done + +# copy custom template resources +cp -r $CFG_DIR/templates/* $TPL_DIR/ + +# add authbasic service +sed -i "/{{- define \"ocis.basicServiceTemplates\" -}}/a\ {{- \$_ := set .scope \"appNameAuthBasic\" \"authbasic\" -}}" $TPL_DIR/_common/_tplvalues.tpl + +if [[ "$ENABLE_ANTIVIRUS" == "true" ]]; then + # TODO: use external service + cp -r $CFG_DIR/clamav $TPL_DIR/ + sed -i '/virusscan:/{n;s|false|true|}' $CFG_DIR/values.yaml +fi + +if [[ "$ENABLE_EMAIL" == "true" ]]; then + # TODO: use external service + cp -r $CFG_DIR/mailpit $TPL_DIR/ + sed -i '/emailNotifications:/{n;s|false|true|}' $CFG_DIR/values.yaml +fi + +if [[ "$ENABLE_TIKA" == "true" ]]; then + # TODO: use external service + cp -r $CFG_DIR/tika $TPL_DIR/ + sed -i 's|type: basic|type: tika|' $CFG_DIR/values.yaml +fi + +if [[ "$ENABLE_WOPI" == "true" ]]; then + sed -i '/appsIntegration:/{n;s|false|true|}' $CFG_DIR/values.yaml + # patch collaboration service + # - allow dynamic wopi src + sed -i -E "s|value: http://.*:9300|value: {{ \$officeSuite.wopiSrc }}|" $TPL_DIR/collaboration/deployment.yaml +fi + +if [[ "$ENABLE_OCM" == "true" ]]; then + sed -i '/ocm:/{n;s|false|true|}' $CFG_DIR/values.yaml +fi + +# move custom values file +cp $CFG_DIR/values.yaml "$CHT_DIR/ci/deployment-values.yaml" diff --git a/tests/config/drone/k8s/authbasic/deployment.yaml b/tests/config/drone/k8s/templates/authbasic/deployment.yaml similarity index 95% rename from tests/config/drone/k8s/authbasic/deployment.yaml rename to tests/config/drone/k8s/templates/authbasic/deployment.yaml index 84dc0a06087..1e4c727651e 100644 --- a/tests/config/drone/k8s/authbasic/deployment.yaml +++ b/tests/config/drone/k8s/templates/authbasic/deployment.yaml @@ -73,6 +73,7 @@ spec: key: jwt-secret {{- include "ocis.caEnv" $ | nindent 12}} + {{- include "ocis.extraEnvs" . | nindent 12}} {{- include "ocis.livenessProbe" . | nindent 10 }} @@ -91,6 +92,7 @@ spec: mountPath: /etc/ocis/ldap-ca readOnly: true {{- include "ocis.caPath" $ | nindent 12}} + {{- include "ocis.extraVolMounts" . | nindent 12}} {{- include "ocis.imagePullSecrets" $ | nindent 6 }} volumes: @@ -100,3 +102,4 @@ spec: secret: secretName: {{ include "secrets.ldapCASecret" . }} {{- include "ocis.caVolume" $ | nindent 8}} + {{- include "ocis.extraVolumes" . | nindent 8}} diff --git a/tests/config/drone/k8s/authbasic/hpa.yaml b/tests/config/drone/k8s/templates/authbasic/hpa.yaml similarity index 100% rename from tests/config/drone/k8s/authbasic/hpa.yaml rename to tests/config/drone/k8s/templates/authbasic/hpa.yaml diff --git a/tests/config/drone/k8s/authbasic/pdb.yaml b/tests/config/drone/k8s/templates/authbasic/pdb.yaml similarity index 100% rename from tests/config/drone/k8s/authbasic/pdb.yaml rename to tests/config/drone/k8s/templates/authbasic/pdb.yaml diff --git a/tests/config/drone/k8s/authbasic/services.yaml b/tests/config/drone/k8s/templates/authbasic/services.yaml similarity index 100% rename from tests/config/drone/k8s/authbasic/services.yaml rename to tests/config/drone/k8s/templates/authbasic/services.yaml diff --git a/tests/config/drone/k8s/templates/configmaps.yaml b/tests/config/drone/k8s/templates/configmaps.yaml new file mode 100644 index 00000000000..55b329b9c4c --- /dev/null +++ b/tests/config/drone/k8s/templates/configmaps.yaml @@ -0,0 +1,63 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: ocis-fonts-map + namespace: {{ template "ocis.namespace" . }} +data: + fontsMap.json: | + {"defaultFont": "/etc/ocis/fonts/NotoSans.ttf"} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: ocmproviders + namespace: {{ template "ocis.namespace" . }} +data: + ocmproviders.json: | + [ + { + "name": "ocis", + "full_name": "ocis server", + "organization": "ownCloud", + "domain": "ocis-server", + "homepage": "https://ocis-server", + "services": [ + { + "endpoint": { + "type": { + "name": "OCM", + "description": "ownCloud Open Cloud Mesh API" + }, + "name": "ocis-server - OCM API", + "path": "https://ocis-server/ocm/", + "is_monitored": true + }, + "api_version": "0.0.1", + "host": "https://ocis-server" + } + ] + }, + { + "name": "federation ocis", + "full_name": "federation ocis server", + "organization": "ownCloud", + "domain": "federation-ocis-server", + "homepage": "https://federation-ocis-server", + "services": [ + { + "endpoint": { + "type": { + "name": "OCM", + "description": "federation ownCloud Open Cloud Mesh API" + }, + "name": "federation-ocis-server - OCM API", + "path": "https://federation-ocis-server/ocm/", + "is_monitored": true + }, + "api_version": "0.0.1", + "host": "https://federation-ocis-server" + } + ] + } + ] diff --git a/tests/config/drone/k8s/templates/extra.tpl b/tests/config/drone/k8s/templates/extra.tpl new file mode 100644 index 00000000000..a1327e675e9 --- /dev/null +++ b/tests/config/drone/k8s/templates/extra.tpl @@ -0,0 +1,53 @@ +{{- define "ocis.extraVolMounts" -}} +- name: logdir + mountPath: /logs +{{- if eq .appName "thumbnails" }} +- name: ocis-fonts-ttf + mountPath: /etc/ocis/fonts +- name: ocis-fonts-map + mountPath: /etc/ocis/fontsMap.json + subPath: fontsMap.json +{{- end -}} +{{- end -}} + +{{- define "ocis.extraVolumes" -}} +- name: logdir + hostPath: + path: /logs + type: Directory +{{- if eq .appName "thumbnails" }} +- name: ocis-fonts-ttf + configMap: + name: ocis-fonts-ttf +- name: ocis-fonts-map + configMap: + name: ocis-fonts-map +{{- end -}} +{{- end -}} + +{{- define "ocis.extraEnvs" -}} +- name: OCIS_LOG_FILE + value: /logs/ocis.log +{{- if eq .appName "idm" }} +- name: IDM_ADMIN_PASSWORD + value: admin +{{- end -}} +{{- if eq .appName "proxy" }} +- name: PROXY_ENABLE_BASIC_AUTH + value: "true" +{{- end -}} +{{- if eq .appName "audit" }} +- name: AUDIT_LOG_TO_CONSOLE + value: "false" +{{- end -}} +{{- if eq .appName "thumbnails" }} +- name: THUMBNAILS_TXT_FONTMAP_FILE + value: /etc/ocis/fontsMap.json +{{- end -}} +{{- if eq .appName "antivirus" }} +- name: ANTIVIRUS_SCANNER_TYPE + value: clamav +- name: ANTIVIRUS_CLAMAV_SOCKET + value: "tcp://clamav:3310" +{{- end -}} +{{- end -}} diff --git a/tests/config/drone/k8s/values.yaml b/tests/config/drone/k8s/values.yaml index c028090cfe8..8d2bd9506b7 100644 --- a/tests/config/drone/k8s/values.yaml +++ b/tests/config/drone/k8s/values.yaml @@ -7,63 +7,6 @@ ingress: enabled: true ingressClassName: traefik externalDomain: ocis-server -extraResources: - - | - apiVersion: v1 - kind: ConfigMap - metadata: - name: ocmproviders - namespace: {{ template "ocis.namespace" . }} - labels: - {{- include "ocis.labels" . | nindent 8 }} - data: - ocmproviders.json: | - [ - { - "name": "ocis", - "full_name": "ocis server", - "organization": "ownCloud", - "domain": "ocis-server", - "homepage": "https://ocis-server", - "services": [ - { - "endpoint": { - "type": { - "name": "OCM", - "description": "ownCloud Open Cloud Mesh API" - }, - "name": "ocis-server - OCM API", - "path": "https://ocis-server/ocm/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "https://ocis-server" - } - ] - }, - { - "name": "federation ocis", - "full_name": "federation ocis server", - "organization": "ownCloud", - "domain": "federation-ocis-server", - "homepage": "https://federation-ocis-server", - "services": [ - { - "endpoint": { - "type": { - "name": "OCM", - "description": "federation ownCloud Open Cloud Mesh API" - }, - "name": "federation-ocis-server - OCM API", - "path": "https://federation-ocis-server/ocm/", - "is_monitored": true - }, - "api_version": "0.0.1", - "host": "https://federation-ocis-server" - } - ] - } - ] logging: level: error @@ -75,7 +18,7 @@ features: authapp: enabled: true emailNotifications: - enabled: true + enabled: false smtp: host: mailpit port: 1025 @@ -90,7 +33,7 @@ features: policies: enabled: false ocm: - enabled: true + enabled: false providersConfigRef: "ocmproviders" sharing: passwordPolicies: @@ -217,5 +160,14 @@ services: events: consumer: concurrency: 10 + search: + extractor: + type: basic + tika: + url: http://tika:9998 + persistence: + enabled: true + accessModes: + - ReadWriteOnce secretRefs: notificationsSmtpSecretRef: notifications-smtp-secret