Release on cdr version 0.3.15

eea · Dec 27, 2024 · 8e10a8c · 8e10a8c
1 parent fc4c9f8
commit 8e10a8c
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 2 deletions.
diff --git a/docs/cdr-0.3.15.tgz b/docs/cdr-0.3.15.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -2059,6 +2059,37 @@ entries:
     - casservice-1.0.0.tgz
     version: 1.0.0
   cdr:
+  - apiVersion: v2
+    appVersion: 6.7.3-199
+    created: "2024-12-27T12:11:36.362521+02:00"
+    dependencies:
+    - alias: zeoserver
+      name: rn-zeoserver
+      repository: https://eea.github.io/helm-charts
+      version: 0.1.5
+    - alias: varnish
+      condition: rn-varnish.enabled
+      name: rn-varnish
+      repository: https://eea.github.io/helm-charts
+      version: 0.1.5
+    - alias: local-converters
+      condition: rn-local-converters.enabled
+      name: rn-local-converters
+      repository: https://eea.github.io/helm-charts
+      version: 0.1.3
+    - alias: clamav
+      condition: rn-clamav.enabled
+      name: rn-clamav
+      repository: https://eea.github.io/helm-charts
+      version: 0.1.4
+    description: A CDR Helm chart for Kubernetes
+    digest: 962e1a05c4ba687b8a40e273a200a3479af11d434e2a1ccc2dcf07dc976a4e06
+    icon: https://raw.githubusercontent.com/eea/helm-charts/main/sources/cdr/logo_eionet.png
+    name: cdr
+    type: application
+    urls:
+    - cdr-0.3.15.tgz
+    version: 0.3.15
   - apiVersion: v2
     appVersion: 6.7.3-199
     created: "2024-12-23T13:55:47.763688+02:00"
@@ -9055,4 +9086,4 @@ entries:
     urls:
     - zz-testing-catalogrefresh-2.0.0.tgz
     version: 2.0.0
-generated: "2024-12-23T13:58:27.642737+02:00"
+generated: "2024-12-27T12:11:36.358588+02:00"
diff --git a/sources/cdr/Chart.yaml b/sources/cdr/Chart.yaml
@@ -5,7 +5,7 @@ icon: https://raw.githubusercontent.com/eea/helm-charts/main/sources/cdr/logo_ei
 
 type: application
 
-version: 0.3.14
+version: 0.3.15
 
 appVersion: "6.7.3-199"
 

diff --git a/sources/cdr/README.md b/sources/cdr/README.md
@@ -10,6 +10,9 @@ This chart is almost configured for production use.
 
 ## Releases
 
+### Version 0.3.15
+- Added cronjob for auto cleanup.
+
 ### Version 0.3.14
 - Updated appVersion to 6.7.3-199.
 

diff --git a/sources/cdr/questions.yaml b/sources/cdr/questions.yaml
@@ -245,6 +245,19 @@ questions:
     show_if: "cronautoenvcleanup.enabled"
     group: "Cron jobs"
 
+  - variable: cronautocleanup.enabled
+    label: "Enable Cron auto cleanup"
+    type: boolean
+    default: false
+    group: "Cron jobs"
+
+  - variable: cronautocleanup.schedule
+    label: "Cron auto cleanup Schedule"
+    type: string
+    default: "45 3 * * *"
+    show_if: "cronautocleanup.enabled"
+    group: "Cron jobs"
+
   - variable: cronautofallin.enabled
     label: "Enable Cron auto fallin"
     type: boolean

diff --git a/sources/cdr/templates/cron-auto-cleanup.yaml b/sources/cdr/templates/cron-auto-cleanup.yaml
@@ -0,0 +1,78 @@
+{{- if and .Values.cron.enabled .Values.cronautocleanup.enabled }}
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: {{ include "appl.fullname" . }}-cron-auto-cleanup
+  labels:
+    {{- include "appl.labels" . | nindent 4 }}
+    app.kubernetes.io/component: job
+
+spec:
+  schedule: "{{ .Values.cronautocleanup.schedule }}"
+  concurrencyPolicy: Forbid
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          {{- with .Values.imagePullSecrets }}
+          imagePullSecrets:
+            {{- toYaml . | nindent 8 }}
+          {{- end }}
+          serviceAccountName: {{ include "appl.serviceAccountName" . }}
+
+          containers:
+          - name: {{ include "appl.fullname" . }}
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            resources:
+              {{- toYaml .Values.cronautocleanup.resources | nindent 14 }}
+            command:
+            - /opt/zope/bin/instance
+            - run
+            - /opt/zope/bin/auto_cleanup
+            - --container
+            - /xmlexports/prefills/designation_types
+            - --recursive
+            - true
+            - --c_type
+            - File
+            - --prefix
+            - OLD_
+            - --threshold
+            - '5'
+            env:
+            - name: CACHE_PURGING_DOMAIN
+              value: '{{ .Values.instance.env.cachePurgingDomain }}'
+            - name: CACHE_PURGING_ENABLED
+              value: '{{ .Values.instance.env.cachePurgingEnabled }}'
+            - name: CACHE_PURGING_PROXY
+              value: '{{ .Values.instance.env.cachePurgingProxy }}'
+            - name: CACHE_PURGING_PROXY_PORT
+              value: '{{ .Values.instance.env.cachePurgingProxyPort }}'
+            - name: CACHE_PURGING_VHOST
+              value: '{{ .Values.instance.env.cachePurgingVhost }}'
+            - name: CACHE_SETTINGS_ENABLED
+              value: '{{ .Values.instance.env.cacheSettingsEnabled }}'
+            - name: CLAMAV_HOST
+              value: '{{ .Values.instance.env.clamavHost }}'
+            - name: GRAYLOG
+              value: '{{ .Values.instance.env.graylog }}'
+            - name: GRAYLOG_FACILITY
+              value: '{{ .Values.instance.env.graylogFacility }}'
+            - name: SENTRY_DSN
+              value: '{{ .Values.instance.env.sentryDSN }}'
+            - name: SENTRY_SITE
+              value: '{{ .Values.instance.env.sentrySite }}'
+            - name: SENTRY_ENVIRONMENT
+              value: '{{ .Values.instance.env.sentryEnvironment }}'
+            - name: SENTRY_RELEASE
+              value: '{{ include "appl.chart" . }}:{{ .Chart.AppVersion }}'
+            - name: TZ
+              value: '{{ .Values.timezone }}'
+            - name: ZEO_ADDRESS
+              value: '{{ .Values.instance.env.zeoAddress }}'
+            - name: ZOPE_THREADS
+              value: '{{ .Values.instance.env.zopeThreads }}'
+
+          restartPolicy: Never
+{{- end }}
diff --git a/sources/cdr/values.yaml b/sources/cdr/values.yaml
@@ -86,6 +86,15 @@ cronautoenvcleanup:
     limits:
       memory: 3Gi
 
+cronautocleanup:
+  enabled: false
+  schedule: "0 0 1 */3 *"
+  resources:
+    requests:
+      memory: 5Gi
+    limits:
+      memory: 5Gi
+
 cronautofallin:
   enabled: false
   schedule: "*/5 * 16 11 *"