Updated cdr to 0.1.4

eea · Jul 24, 2024 · f13abc9 · f13abc9
1 parent 7c32d18
commit f13abc9
Show file tree

Hide file tree

Showing 9 changed files with 265 additions and 236 deletions.
diff --git a/docs/cdr-0.1.4.tgz b/docs/cdr-0.1.4.tgz
diff --git a/docs/index.yaml b/docs/index.yaml
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.1.3
+version: 0.1.4
 
 appVersion: "6.7.3-193"
 

diff --git a/sources/cdr/README.md b/sources/cdr/README.md
@@ -18,6 +18,10 @@ This chart is almost configured for production use.
 ## Releases
 
 <dl>
+
+  <dt>Version 0.1.4</dt>
+  <dd>Get the image and tag from image section.</dd>
+
   <dt>Version 0.1.3</dt>
   <dd>Changed rabbitmq to externalName.</dd>
 

diff --git a/sources/cdr/templates/cron-auto-env-cleanup-cronjob.yaml b/sources/cdr/templates/cron-auto-env-cleanup-cronjob.yaml
@@ -22,7 +22,7 @@ spec:
 
           containers:
           - name: cron-auto-env-cleanup
-            image: "{{ .Values.instance.repository }}:{{ .Values.instance.tag | default .Chart.AppVersion }}"
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             resources:
               {{- toYaml .Values.cronautoenvcleanup.resources | nindent 14 }}
@@ -44,4 +44,4 @@ spec:
             - name: ZEO_ADDRESS
               value: "{{ .Values.instance.env.zeoAddress }}"
           restartPolicy: Never
-{{- end }}
+{{- end }}
diff --git a/sources/cdr/templates/cron-auto-fallin-cronjob.yaml b/sources/cdr/templates/cron-auto-fallin-cronjob.yaml
@@ -22,7 +22,7 @@ spec:
 
           containers:
           - name: cron-auto-fallin
-            image: "{{ .Values.instance.repository }}:{{ .Values.instance.tag | default .Chart.AppVersion }}"
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             resources:
               {{- toYaml .Values.cronautofallin.resources | nindent 14 }}
@@ -107,4 +107,4 @@ spec:
             - name: {{ .Values.deployment }}-tmpdir-storage
               persistentVolumeClaim:
                 claimName: {{ .Values.deployment }}-tmpdir-storage
-{{- end }}
+{{- end }}
diff --git a/sources/cdr/templates/cron-zipcache-cleanup-cronjob.yaml b/sources/cdr/templates/cron-zipcache-cleanup-cronjob.yaml
@@ -22,7 +22,7 @@ spec:
 
           containers:
           - name: cron-zipcache-cleanup
-            image: "{{ .Values.instance.repository }}:{{ .Values.instance.tag | default .Chart.AppVersion }}"
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
             imagePullPolicy: {{ .Values.image.pullPolicy }}
             resources:
               {{- toYaml .Values.cronzipcachecleanup.resources | nindent 14 }}
@@ -77,4 +77,4 @@ spec:
             - name: {{ .Values.deployment }}-tmpdir-storage
               persistentVolumeClaim:
                 claimName: {{ .Values.deployment }}-tmpdir-storage
-{{- end }}
+{{- end }}
diff --git a/sources/cdr/templates/instance-deployment.yaml b/sources/cdr/templates/instance-deployment.yaml
@@ -27,7 +27,7 @@ spec:
 
       containers:
       - name: instance
-        image: "{{ .Values.instance.repository }}:{{ .Values.instance.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
 
         ports:

diff --git a/sources/cdr/values.yaml b/sources/cdr/values.yaml
@@ -7,13 +7,11 @@ deployment: cdr
 timezone: Europe/Copenhagen
 
 # used by the cron-zeopack job
-cdrUser: ''
-cdrPass: ''
+cdrUser: ""
+cdrPass: ""
 
 instance:
   enabled: true
-  repository: eeacms/reportek-cdr
-  tag: ""
   replicaCount: 1
   port: 8080
   resources:
@@ -25,8 +23,8 @@ instance:
       memory: 2Gi
   env:
     beakerPath: /sessions
-    beakerSecret: ''
-    sentryDSN: ''
+    beakerSecret: ""
+    sentryDSN: ""
     zopeThreads: 4
     deploymentHost: cdr.eionet.europa.eu
     cachePurgingDomain: cdr.eionet.europa.eu
@@ -36,12 +34,12 @@ instance:
     cachePurgingVhost: true
     cacheSettingsEnabled: true
     clamavHost: clamav
-    graylog: ''
-    graylogFacility: ''
+    graylog: ""
+    graylogFacility: ""
     rabbitmqEnabled: false
-    rabbitmqHost: ''
-    rabbitmqUser: ''
-    rabbitmqPass: ''
+    rabbitmqHost: ""
+    rabbitmqUser: ""
+    rabbitmqPass: ""
     rabbitmqPort: 5672
     zipCacheEnabled: true
     zipCachePath: /opt/zope/var
@@ -153,7 +151,7 @@ rn-clamav:
     targetMemoryUtilizationPercentage: 80
 
 rabbitmq:
-  externalName: 
+  externalName:
 
 imagePullSecrets: []
 nameOverride: ""
@@ -202,7 +200,7 @@ ingress:
         - path: /(.*)
           pathType: Prefix
   tls:
-    - secretName: ''
+    - secretName: ""
       hosts:
         - cdr.eionet.europa.eu