diff --git a/charts/nextcloud/1.6.18/Chart.lock b/charts/nextcloud/1.6.18/Chart.lock deleted file mode 100644 index 265acc741b..0000000000 --- a/charts/nextcloud/1.6.18/Chart.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506 -generated: "2022-07-28T22:31:02.992776385+05:00" diff --git a/charts/nextcloud/1.6.18/Chart.yaml b/charts/nextcloud/1.6.18/Chart.yaml deleted file mode 100644 index 1b35ccfe1b..0000000000 --- a/charts/nextcloud/1.6.18/Chart.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v2 -appVersion: 25.0.4 -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -description: A file sharing server that puts the control and security of your own - data back into your hands. -home: https://nextcloud.com/ -icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg -keywords: -- nextcloud -- storage -- http -- web -- php -name: nextcloud -sources: -- https://github.com/nextcloud/docker -- https://github.com/nextcloud/helm -upstream_version: 2.3.2 -version: 1.6.18 diff --git a/charts/nextcloud/1.6.18/charts/common-2207.0.0.tgz b/charts/nextcloud/1.6.18/charts/common-2207.0.0.tgz deleted file mode 100644 index 2adf94b438..0000000000 Binary files a/charts/nextcloud/1.6.18/charts/common-2207.0.0.tgz and /dev/null differ diff --git a/charts/nextcloud/1.6.18/requirements.lock b/charts/nextcloud/1.6.18/requirements.lock deleted file mode 100644 index 3ead4ef6e6..0000000000 --- a/charts/nextcloud/1.6.18/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2207.0.0 - version: 2207.0.0 -digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6 -generated: "2021-05-10T13:07:35.423192+05:00" diff --git a/charts/nextcloud/1.6.18/templates/postgres-deployment.yaml b/charts/nextcloud/1.6.18/templates/postgres-deployment.yaml deleted file mode 100644 index c325ee8ced..0000000000 --- a/charts/nextcloud/1.6.18/templates/postgres-deployment.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{ $values := (. | mustDeepCopy) }} -{{ $_ := set $values "common" (dict "nameSuffix" "postgres") }} -{{ include "common.deployment.common_config" $values | nindent 0 }} -spec: {{ include "common.deployment.common_spec" $values | nindent 2 }} - template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }} - spec: - containers: - - name: {{ .Chart.Name }}-postgres - image: {{ template "postgres.imageName" . }} - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: {{ include "postgres.envVariableConfiguration" $values | nindent 10 }} - volumeMounts: {{ include "postgres.volumeMountsConfiguration" $values | nindent 10 }} - ports: - - name: postgres-tcp - containerPort: 5432 - protocol: TCP - volumes: {{ include "postgres.volumeConfiguration" $values | nindent 8 }} diff --git a/charts/nextcloud/1.6.18/templates/tests/deployment-check.yaml b/charts/nextcloud/1.6.18/templates/tests/deployment-check.yaml deleted file mode 100644 index 7a511a5786..0000000000 --- a/charts/nextcloud/1.6.18/templates/tests/deployment-check.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- $serviceName := (include "common.names.fullname" .) -}} -apiVersion: v1 -kind: Pod -metadata: - name: "{{ .Release.Name }}-nextcloud-test" - labels: - app: {{ .Release.Name }} - release: {{ .Release.Name }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: test-curl - image: alpine/curl - imagePullPolicy: "IfNotPresent" - command: - - /bin/sh - - -ec - - | - curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}/login - restartPolicy: Never diff --git a/charts/nextcloud/1.6.18/.helmignore b/library/ix-dev/charts/nextcloud/.helmignore similarity index 100% rename from charts/nextcloud/1.6.18/.helmignore rename to library/ix-dev/charts/nextcloud/.helmignore diff --git a/library/ix-dev/charts/nextcloud/Chart.lock b/library/ix-dev/charts/nextcloud/Chart.lock new file mode 100644 index 0000000000..cbceab51a7 --- /dev/null +++ b/library/ix-dev/charts/nextcloud/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +digest: sha256:a301ba0f99ec1e08a60a7f0a0320aa02d225993572f2f056f09520f06df88b37 +generated: "2023-03-22T15:32:05.580526674Z" diff --git a/library/ix-dev/charts/nextcloud/Chart.yaml b/library/ix-dev/charts/nextcloud/Chart.yaml new file mode 100644 index 0000000000..3001d482eb --- /dev/null +++ b/library/ix-dev/charts/nextcloud/Chart.yaml @@ -0,0 +1,29 @@ +name: nextcloud +description: A file sharing server that puts the control and security of your own + data back into your hands. +annotations: + title: Nextcloud +type: application +version: 1.6.19 +apiVersion: v2 +appVersion: '25.0.4' +kubeVersion: '>=1.16.0-0' +maintainers: + - name: truenas + url: https://www.truenas.com/ +dependencies: + - name: common + repository: file://../../../common/2207.0.0 + version: 2207.0.0 +home: https://nextcloud.com/ +icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg +sources: + - https://github.com/nextcloud/docker + - https://github.com/nextcloud/helm + - https://github.com/truenas/charts/tree/master/library/ix-dev/charts/nextcloud +keywords: + - nextcloud + - storage + - http + - web + - php diff --git a/charts/nextcloud/1.6.18/README.md b/library/ix-dev/charts/nextcloud/README.md similarity index 100% rename from charts/nextcloud/1.6.18/README.md rename to library/ix-dev/charts/nextcloud/README.md diff --git a/charts/nextcloud/1.6.18/app-readme.md b/library/ix-dev/charts/nextcloud/app-readme.md similarity index 100% rename from charts/nextcloud/1.6.18/app-readme.md rename to library/ix-dev/charts/nextcloud/app-readme.md diff --git a/library/ix-dev/charts/nextcloud/charts/common-2207.0.0.tgz b/library/ix-dev/charts/nextcloud/charts/common-2207.0.0.tgz new file mode 100644 index 0000000000..377bba19a1 Binary files /dev/null and b/library/ix-dev/charts/nextcloud/charts/common-2207.0.0.tgz differ diff --git a/charts/nextcloud/1.6.18/test_values.yaml b/library/ix-dev/charts/nextcloud/ci/test-values.yaml similarity index 83% rename from charts/nextcloud/1.6.18/test_values.yaml rename to library/ix-dev/charts/nextcloud/ci/test-values.yaml index 099bc378dd..a8926c1719 100644 --- a/charts/nextcloud/1.6.18/test_values.yaml +++ b/library/ix-dev/charts/nextcloud/ci/test-values.yaml @@ -9,10 +9,6 @@ dnsConfig: options: [] emptyDirVolumes: true environmentVariables: [] -image: - pullPolicy: IfNotPresent - repository: nextcloud - tag: 25.0.4 ixChartContext: {} nextcloud: datadir: /var/www/html/data @@ -20,11 +16,6 @@ nextcloud: install_ffmpeg: true password: changeme username: admin -nginx: - image: - pullPolicy: IfNotPresent - repository: nginx - tag: 1.23.3 postgresAppVolumeMounts: postgres-backup: emptyDir: true diff --git a/charts/nextcloud/item.yaml b/library/ix-dev/charts/nextcloud/item.yaml similarity index 100% rename from charts/nextcloud/item.yaml rename to library/ix-dev/charts/nextcloud/item.yaml diff --git a/charts/nextcloud/1.6.18/migrations/migrate_from_1.1.0 b/library/ix-dev/charts/nextcloud/migrations/migrate_from_1.1.0 similarity index 100% rename from charts/nextcloud/1.6.18/migrations/migrate_from_1.1.0 rename to library/ix-dev/charts/nextcloud/migrations/migrate_from_1.1.0 diff --git a/charts/nextcloud/1.6.18/questions.yaml b/library/ix-dev/charts/nextcloud/questions.yaml similarity index 100% rename from charts/nextcloud/1.6.18/questions.yaml rename to library/ix-dev/charts/nextcloud/questions.yaml diff --git a/charts/nextcloud/1.6.18/templates/NOTES.txt b/library/ix-dev/charts/nextcloud/templates/NOTES.txt similarity index 100% rename from charts/nextcloud/1.6.18/templates/NOTES.txt rename to library/ix-dev/charts/nextcloud/templates/NOTES.txt diff --git a/charts/nextcloud/1.6.18/templates/_nginx.tpl b/library/ix-dev/charts/nextcloud/templates/_nginx.tpl similarity index 100% rename from charts/nextcloud/1.6.18/templates/_nginx.tpl rename to library/ix-dev/charts/nextcloud/templates/_nginx.tpl diff --git a/charts/nextcloud/1.6.18/templates/_postgres.tpl b/library/ix-dev/charts/nextcloud/templates/_postgres.tpl similarity index 100% rename from charts/nextcloud/1.6.18/templates/_postgres.tpl rename to library/ix-dev/charts/nextcloud/templates/_postgres.tpl diff --git a/charts/nextcloud/1.6.18/templates/backup-postgres-config.yaml b/library/ix-dev/charts/nextcloud/templates/backup-postgres-config.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/backup-postgres-config.yaml rename to library/ix-dev/charts/nextcloud/templates/backup-postgres-config.yaml diff --git a/charts/nextcloud/1.6.18/templates/backup-postgres-hook.yaml b/library/ix-dev/charts/nextcloud/templates/backup-postgres-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/backup-postgres-hook.yaml rename to library/ix-dev/charts/nextcloud/templates/backup-postgres-hook.yaml diff --git a/charts/nextcloud/1.6.18/templates/cronjob.yaml b/library/ix-dev/charts/nextcloud/templates/cronjob.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/cronjob.yaml rename to library/ix-dev/charts/nextcloud/templates/cronjob.yaml diff --git a/charts/nextcloud/1.6.18/templates/deployment.yaml b/library/ix-dev/charts/nextcloud/templates/deployment.yaml similarity index 84% rename from charts/nextcloud/1.6.18/templates/deployment.yaml rename to library/ix-dev/charts/nextcloud/templates/deployment.yaml index 7c8ee1ad3b..15c62bdd12 100644 --- a/charts/nextcloud/1.6.18/templates/deployment.yaml +++ b/library/ix-dev/charts/nextcloud/templates/deployment.yaml @@ -28,6 +28,45 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - name: nginx-https containerPort: 443 protocol: TCP + livenessProbe: + httpGet: + scheme: HTTPS + path: /status.php + port: 443 + httpHeaders: + - name: Host + value: localhost + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 + readinessProbe: + httpGet: + scheme: HTTPS + path: /status.php + port: 443 + httpHeaders: + - name: Host + value: localhost + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 2 + startupProbe: + httpGet: + scheme: HTTPS + path: /status.php + port: 443 + httpHeaders: + - name: Host + value: localhost + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 60 + successThreshold: 1 {{ end }} - name: {{ .Chart.Name }} {{ include "common.resources.limitation" . | nindent 8 }} @@ -63,10 +102,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} httpHeaders: - name: Host value: localhost - initialDelaySeconds: 30 + initialDelaySeconds: 10 periodSeconds: 10 timeoutSeconds: 5 failureThreshold: 5 + successThreshold: 1 readinessProbe: httpGet: path: /status.php @@ -74,10 +114,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} httpHeaders: - name: Host value: localhost - initialDelaySeconds: 30 + initialDelaySeconds: 10 periodSeconds: 10 timeoutSeconds: 5 failureThreshold: 5 + successThreshold: 1 startupProbe: {{- if .Values.nextcloud.install_ffmpeg }} exec: @@ -94,10 +135,11 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }} - name: Host value: localhost {{- end }} - initialDelaySeconds: 60 + initialDelaySeconds: 10 periodSeconds: 10 timeoutSeconds: 5 - failureThreshold: 60 + failureThreshold: 5 + successThreshold: 1 volumeMounts: - name: nextcloud-data mountPath: /var/www/ diff --git a/charts/nextcloud/1.6.18/templates/nginx-configmap.yaml b/library/ix-dev/charts/nextcloud/templates/nginx-configmap.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/nginx-configmap.yaml rename to library/ix-dev/charts/nextcloud/templates/nginx-configmap.yaml diff --git a/charts/nextcloud/1.6.18/templates/nginx-secret.yaml b/library/ix-dev/charts/nextcloud/templates/nginx-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/nginx-secret.yaml rename to library/ix-dev/charts/nextcloud/templates/nginx-secret.yaml diff --git a/charts/nextcloud/1.6.18/templates/nuke-deployments-hook.yaml b/library/ix-dev/charts/nextcloud/templates/nuke-deployments-hook.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/nuke-deployments-hook.yaml rename to library/ix-dev/charts/nextcloud/templates/nuke-deployments-hook.yaml diff --git a/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml b/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml new file mode 100644 index 0000000000..b91bb90bd7 --- /dev/null +++ b/library/ix-dev/charts/nextcloud/templates/postgres-deployment.yaml @@ -0,0 +1,50 @@ +{{ $values := (. | mustDeepCopy) }} +{{ $_ := set $values "common" (dict "nameSuffix" "postgres") }} +{{ include "common.deployment.common_config" $values | nindent 0 }} +spec: {{ include "common.deployment.common_spec" $values | nindent 2 }} + template: {{ include "common.deployment.pod.metadata" $values | nindent 4 }} + spec: + containers: + - name: {{ .Chart.Name }}-postgres + image: {{ template "postgres.imageName" . }} + imagePullPolicy: {{ .Values.image.pullPolicy }} + env: {{ include "postgres.envVariableConfiguration" $values | nindent 10 }} + volumeMounts: {{ include "postgres.volumeMountsConfiguration" $values | nindent 10 }} + ports: + - name: postgres-tcp + containerPort: 5432 + protocol: TCP + readinessProbe: + exec: + command: + - sh + - -c + - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done" + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 2 + livenessProbe: + exec: + command: + - sh + - -c + - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done" + initialDelaySeconds: 10 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 5 + successThreshold: 1 + startupProbe: + exec: + command: + - sh + - -c + - "until pg_isready -U ${POSTGRES_USER} -h localhost; do sleep 2; done" + initialDelaySeconds: 10 + periodSeconds: 5 + timeoutSeconds: 2 + failureThreshold: 60 + successThreshold: 1 + volumes: {{ include "postgres.volumeConfiguration" $values | nindent 8 }} diff --git a/charts/nextcloud/1.6.18/templates/postgres-secret.yaml b/library/ix-dev/charts/nextcloud/templates/postgres-secret.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/postgres-secret.yaml rename to library/ix-dev/charts/nextcloud/templates/postgres-secret.yaml diff --git a/charts/nextcloud/1.6.18/templates/postgres-service.yaml b/library/ix-dev/charts/nextcloud/templates/postgres-service.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/postgres-service.yaml rename to library/ix-dev/charts/nextcloud/templates/postgres-service.yaml diff --git a/charts/nextcloud/1.6.18/templates/secrets.yaml b/library/ix-dev/charts/nextcloud/templates/secrets.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/secrets.yaml rename to library/ix-dev/charts/nextcloud/templates/secrets.yaml diff --git a/charts/nextcloud/1.6.18/templates/service.yaml b/library/ix-dev/charts/nextcloud/templates/service.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/service.yaml rename to library/ix-dev/charts/nextcloud/templates/service.yaml diff --git a/charts/nextcloud/1.6.18/templates/serviceaccount.yaml b/library/ix-dev/charts/nextcloud/templates/serviceaccount.yaml similarity index 100% rename from charts/nextcloud/1.6.18/templates/serviceaccount.yaml rename to library/ix-dev/charts/nextcloud/templates/serviceaccount.yaml diff --git a/charts/nextcloud/upgrade_info.json b/library/ix-dev/charts/nextcloud/upgrade_info.json similarity index 100% rename from charts/nextcloud/upgrade_info.json rename to library/ix-dev/charts/nextcloud/upgrade_info.json diff --git a/charts/nextcloud/upgrade_strategy b/library/ix-dev/charts/nextcloud/upgrade_strategy similarity index 100% rename from charts/nextcloud/upgrade_strategy rename to library/ix-dev/charts/nextcloud/upgrade_strategy diff --git a/charts/nextcloud/1.6.18/ix_values.yaml b/library/ix-dev/charts/nextcloud/values.yaml similarity index 100% rename from charts/nextcloud/1.6.18/ix_values.yaml rename to library/ix-dev/charts/nextcloud/values.yaml