Clean nextcloud chart stripping to basics

test/nextcloud/2.3.2/templates/config.yaml

-{{- if .Values.nextcloud.configs -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "nextcloud.fullname" . }}-config
-  labels:
-    app.kubernetes.io/name: {{ include "nextcloud.name" . }}
-    helm.sh/chart: {{ include "nextcloud.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-{{- range $key, $value := .Values.nextcloud.configs }}
-  {{ $key }}: |-
-{{ $value | indent 4 }}
-{{- end }}
-{{- if .Values.nextcloud.defaultConfigs }}
-{{- if index .Values.nextcloud.defaultConfigs ".htaccess" }}
-  .htaccess: |-
-    # line below if for Apache 2.4
-    <ifModule mod_authz_core.c>
-    Require all denied
-    </ifModule>
-    # line below if for Apache 2.2
-    <ifModule !mod_authz_core.c>
-    deny from all
-    </ifModule>
-    # section for Apache 2.2 and 2.4
-    <ifModule mod_autoindex.c>
-    IndexIgnore *
-    </ifModule>
-{{- end }}
-{{- if index .Values.nextcloud.defaultConfigs "redis.config.php" }}
-  redis.config.php: |-
-    <?php
-    if (getenv('REDIS_HOST')) {
-      $CONFIG = array (
-        'memcache.distributed' => '\OC\Memcache\Redis',
-        'memcache.locking' => '\OC\Memcache\Redis',
-        'redis' => array(
-          'host' => getenv('REDIS_HOST'),
-          'port' => getenv('REDIS_HOST_PORT') ?: 6379,
-        ),
-      );
-    }
-{{- end }}
-{{- if index .Values.nextcloud.defaultConfigs "apache-pretty-urls.config.php" }}
-  apache-pretty-urls.config.php: |-
-    <?php
-    $CONFIG = array (
-      'htaccess.RewriteBase' => '/',
-    );
-{{- end }}
-{{- if index .Values.nextcloud.defaultConfigs "apcu.config.php" }}
-  apcu.config.php: |-
-    <?php
-    $CONFIG = array (
-      'memcache.local' => '\OC\Memcache\APCu',
-    );
-{{- end }}
-{{- if index .Values.nextcloud.defaultConfigs "apps.config.php" }}
-  apps.config.php: |-
-    <?php
-    $CONFIG = array (
-      "apps_paths" => array (
-          0 => array (
-                  "path"     => OC::$SERVERROOT."/apps",
-                  "url"      => "/apps",
-                  "writable" => false,
-          ),
-          1 => array (
-                  "path"     => OC::$SERVERROOT."/custom_apps",
-                  "url"      => "/custom_apps",
-                  "writable" => true,
-          ),
-      ),
-    );
-{{- end }}
-{{- if index .Values.nextcloud.defaultConfigs "autoconfig.php" }}
-  autoconfig.php: |-
-    <?php
-    $autoconfig_enabled = false;
-    if (getenv('SQLITE_DATABASE')) {
-        $AUTOCONFIG["dbtype"] = "sqlite";
-        $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE');
-        $autoconfig_enabled = true;
-    } elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
-        $AUTOCONFIG["dbtype"] = "mysql";
-        $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE');
-        $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER');
-        $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD');
-        $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST');
-        $autoconfig_enabled = true;
-    } elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
-        $AUTOCONFIG["dbtype"] = "pgsql";
-        $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB');
-        $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER');
-        $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD');
-        $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST');
-        $autoconfig_enabled = true;
-    }
-    if ($autoconfig_enabled) {
-        if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
-            $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
-        }
-        $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-    }
-{{- end }}
-{{- if index .Values.nextcloud.defaultConfigs "smtp.config.php" }}
-  smtp.config.php: |-
-    <?php
-    if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) {
-      $CONFIG = array (
-        'mail_smtpmode' => 'smtp',
-        'mail_smtphost' => getenv('SMTP_HOST'),
-        'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
-        'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
-        'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'),
-        'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
-        'mail_smtpname' => getenv('SMTP_NAME') ?: '',
-        'mail_smtppassword' => getenv('SMTP_PASSWORD') ?: '',
-        'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
-        'mail_domain' => getenv('MAIL_DOMAIN'),
-      );
-    }
-{{- end }}
-{{- end }}
-{{- end }}

test/nextcloud/2.3.2/templates/deployment.yaml

@@ -82,44 +82,25 @@ spec:
         volumeMounts:
         - name: nextcloud-data
           mountPath: /var/www/
-          subPath: {{ ternary "root" (printf "%s/%s" .Values.nextcloud.persistence.subPath "root") (empty .Values.nextcloud.persistence.subPath) }}
+          subPath: "root"
         - name: nextcloud-data
           mountPath: /var/www/html
-          subPath: {{ ternary "html" (printf "%s/%s" .Values.nextcloud.persistence.subPath "html") (empty .Values.nextcloud.persistence.subPath) }}
+          subPath: "html"
         - name: nextcloud-data
           mountPath: {{ .Values.nextcloud.datadir }}
-          subPath: {{ ternary "data" (printf "%s/%s" .Values.nextcloud.persistence.subPath "data") (empty .Values.nextcloud.persistence.subPath) }}
+          subPath: "data"
         - name: nextcloud-data
           mountPath: /var/www/html/config
-          subPath: {{ ternary "config" (printf "%s/%s" .Values.nextcloud.persistence.subPath "config") (empty .Values.nextcloud.persistence.subPath) }}
+          subPath: "config"
         - name: nextcloud-data
           mountPath: /var/www/html/custom_apps
-          subPath: {{ ternary "custom_apps" (printf "%s/%s" .Values.nextcloud.persistence.subPath "custom_apps") (empty .Values.nextcloud.persistence.subPath) }}
+          subPath: "custom_apps"
         - name: nextcloud-data
           mountPath: /var/www/tmp
-          subPath: {{ ternary "tmp" (printf "%s/%s" .Values.nextcloud.persistence.subPath "tmp") (empty .Values.nextcloud.persistence.subPath) }}
+          subPath: "tmp"
         - name: nextcloud-data
           mountPath: /var/www/html/themes
-          subPath: {{ ternary "themes" (printf "%s/%s" .Values.nextcloud.persistence.subPath "themes") (empty .Values.nextcloud.persistence.subPath) }}
-        {{- range $key, $value := .Values.nextcloud.configs }}
-        - name: nextcloud-config
-          mountPath: /var/www/html/config/{{ $key }}
-          subPath: {{ $key }}
-        {{- end }}
-        {{- if .Values.nextcloud.configs }}
-        {{- range $key, $value := .Values.nextcloud.defaultConfigs }}
-        {{- if $value }}
-        - name: nextcloud-config
-          mountPath: /var/www/html/config/{{ $key }}
-          subPath: {{ $key }}
-        {{- end }}
-        {{- end }}
-        {{- end }}
-        {{- range $key, $value := .Values.nextcloud.phpConfigs }}
-        - name: nextcloud-phpconfig
-          mountPath: /usr/local/etc/php/conf.d/{{ $key }}
-          subPath: {{ $key }}
-        {{- end }}
+          subPath: "themes"
       volumes:
       - name: nextcloud-data
       {{- if ne (include "configuredHostPath" .) "" }}
@@ -128,16 +109,6 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
-      {{- if .Values.nextcloud.configs }}
-      - name: nextcloud-config
-        configMap:
-          name: {{ template "nextcloud.fullname" . }}-config
-      {{- end }}
-      {{- if .Values.nextcloud.phpConfigs }}
-      - name: nextcloud-phpconfig
-        configMap:
-          name: {{ template "nextcloud.fullname" . }}-phpconfig
-      {{- end }}
       # Will mount configuration files as www-data (id: 33) for nextcloud
       securityContext:
         fsGroup: 33

test/nextcloud/2.3.2/templates/php-config.yaml

-{{- if .Values.nextcloud.phpConfigs -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "nextcloud.fullname" . }}-phpconfig
-  labels:
-    app.kubernetes.io/name: {{ include "nextcloud.name" . }}
-    helm.sh/chart: {{ include "nextcloud.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-data:
-{{- range $key, $value := .Values.nextcloud.phpConfigs }}
-  {{ $key }}: |-
-{{ $value | indent 4 }}
-{{- end }}
-{{- end }}

test/nextcloud/2.3.2/values.yaml

@@ -11,56 +11,6 @@ nextcloud:
   username: admin
   password: changeme
   datadir: /var/www/html/data
-  persistence:
-    subPath:
-  # PHP Configuration files
-  # Will be injected in /usr/local/etc/php/conf.d
-  phpConfigs: {}
-  # Default config files
-  # IMPORTANT: Will be used only if you put extra configs, otherwise default will come from nextcloud itself
-  # Default confgurations can be found here: https://github.com/nextcloud/docker/tree/master/16.0/apache/config
-  defaultConfigs:
-    # To protect /var/www/html/config
-    .htaccess: true
-    # Redis default configuration
-    redis.config.php: true
-    # Apache configuration for rewrite urls
-    apache-pretty-urls.config.php: true
-    # Define APCu as local cache
-    apcu.config.php: true
-    # Apps directory configs
-    apps.config.php: true
-    # Used for auto configure database
-    autoconfig.php: true
-    # SMTP default configuration
-    smtp.config.php: true
-  # Extra config files created in /var/www/html/config/
-  # ref: https://docs.nextcloud.com/server/15/admin_manual/configuration_server/config_sample_php_parameters.html#multiple-config-php-file
-  configs: {}
-
-  # For example, to use S3 as primary storage
-  # ref: https://docs.nextcloud.com/server/13/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3
-  #
-  #  configs:
-  #    s3.config.php: |-
-  #      <?php
-  #      $CONFIG = array (
-  #        'objectstore' => array(
-  #          'class' => '\\OC\\Files\\ObjectStore\\S3',
-  #          'arguments' => array(
-  #            'bucket'     => 'my-bucket',
-  #            'autocreate' => true,
-  #            'key'        => 'xxx',
-  #            'secret'     => 'xxx',
-  #            'region'     => 'us-east-1',
-  #            'use_ssl'    => true
-  #          )
-  #        )
-  #      );
-
-  ## Strategy used to replace old pods
-  ## IMPORTANT: use with care, it is suggested to leave as that for upgrade purposes
-  ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
   strategy: "Recreate"
 
 postgresql:
@@ -72,4 +22,4 @@ postgresql:
     datasetName: "ix-postgres_data"
 
 service:
-  nodePort: 9000
+  nodePort: 9000
\ No newline at end of file