Skip to content

Commit 40012d8

Browse files
author
Your Name
committed
Bump up Version
1 parent 7a25844 commit 40012d8

File tree

7 files changed

+60
-35
lines changed

7 files changed

+60
-35
lines changed

‎charts/opencloud-microservices/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ maintainers:
1212
email: [email protected]
1313
url: https://opencloud.eu
1414
type: application
15-
version: 0.2.6
15+
version: 0.2.7
1616
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
17-
appVersion: 3.3.0
17+
appVersion: 3.4.0
1818
kubeVersion: ""
1919
sources:
2020
- https://github.com/opencloud-eu/helm

‎charts/opencloud-microservices/deployments/timoni/configmap.yaml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ data:
2323
# Global Configuration
2424
###############################################################################
2525
EXTERNAL_DOMAIN: "cloud.opencloud.test"
26-
TAG: "3.0.0"
26+
TAG: ""
2727

2828
###############################################################################
2929
# Deployment Strategy
@@ -134,14 +134,6 @@ data:
134134
###############################################################################
135135
DEMO_USERS_ENABLED: "false"
136136

137-
###############################################################################
138-
# Antivirus
139-
###############################################################################
140-
ANTIVIRUS_ENABLED: "true"
141-
ANTIVIRUS_INFECTED_FILE_HANDLING: "delete"
142-
ANTIVIRUS_ICAP_URL: ""
143-
ANTIVIRUS_ICAP_SERVICE: ""
144-
145137
###############################################################################
146138
# Collabora Configuration
147139
###############################################################################
@@ -172,6 +164,14 @@ data:
172164
WOPI_INGRESS_DOMAIN: "wopi.opencloud.test"
173165
WOPI_COLLABORA_TLS_HOST: "wopi-collabora.kube.opencloud.test"
174166

167+
###############################################################################
168+
# Antivirus
169+
###############################################################################
170+
ANTIVIRUS_ENABLED: "true"
171+
ANTIVIRUS_INFECTED_FILE_HANDLING: "abort"
172+
ANTIVIRUS_ICAP_URL: "http://clamav-icap.clamav:1344"
173+
ANTIVIRUS_ICAP_SERVICE: "avscan"
174+
175175
###############################################################################
176176
# ClamAV Configuration
177177
###############################################################################
@@ -181,9 +181,10 @@ data:
181181
CLAMAV_RESOURCES_REQUESTS_CPU: "250m"
182182
CLAMAV_RESOURCES_REQUESTS_MEMORY: "256Mi"
183183
CLAMAV_PERSISTENCE_SIZE: "10Gi"
184-
CLAMAV_FRESHCLAM_READONLY_ROOT_FILESYSTEM: "false"
185184
CLAMAV_FRESHCLAM_IMAGE_TAG: "1.4.0"
186185
CLAMAV_CLAMD_IMAGE_TAG: "1.4.0"
187186
CLAMAV_ICAP_IMAGE_TAG: "0.5.10"
188-
CLAMAV_ICAP_CLAMD_HOST: "opendesk-clamav-clamd"
189-
CLAMAV_MILTER_CLAMD_HOST: "opendesk-clamav-clamd"
187+
CLAMAV_ICAP_IMAGE_REPOSITORY: "bmi/opendesk/components/platform-development/images/clamav-icap"
188+
CLAMAV_ICAP_IMAGE_REGISTRY: "registry.opencode.de"
189+
CLAMAV_ICAP_CLAMD_HOST: "clamav-clamd"
190+
CLAMAV_MILTER_CLAMD_HOST: "clamav-clamd"

‎charts/opencloud-microservices/deployments/timoni/job.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
apiVersion: batch/v1
2+
kind: Job
3+
metadata:
4+
name: clamav-db-chown
5+
namespace: clamav
6+
spec:
7+
backoffLimit: 1
8+
template:
9+
spec:
10+
restartPolicy: Never
11+
containers:
12+
- name: chown
13+
image: busybox:1.36
14+
imagePullPolicy: IfNotPresent
15+
command: ["/bin/sh", "-c", "chown -R 100:100 /var/lib/clamav"]
16+
volumeMounts:
17+
- name: clamav-database
18+
mountPath: /var/lib/clamav
19+
volumes:
20+
- name: clamav-database
21+
persistentVolumeClaim:
22+
claimName: clamav-db

‎charts/opencloud-microservices/deployments/timoni/opencloud.cue‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ bundle: {
2121
namespace: "opencloud"
2222
values: {
2323
repository: {
24-
url: "oci://ghcr.io/suse-coder/helm-charts"
24+
url: "oci://ghcr.io/opencloud-eu/helm-charts"
2525
}
2626
chart: {
2727
name: "opencloud-microservices"
28-
version: "0.2.5"
28+
version: "0.2.7"
2929
}
3030
sync: {
3131
timeout: 10
@@ -554,14 +554,18 @@ bundle: {
554554
url: "https://gitlab.opencode.de/api/v4/projects/1381/packages/helm/stable"
555555
}
556556
chart: {
557-
name: "opendesk-clamav/opendesk-clamav"
557+
name: "opendesk-clamav"
558558
version: "4.0.6"
559559
}
560560
sync: {
561-
timeout: 10
561+
timeout: 5
562562
createNamespace: true
563563
}
564564
helmValues: {
565+
// Global persistence indirection (like _domainFilter pattern)
566+
_persistenceStorageClassName: string @timoni(runtime:string:PERSISTENCE_STORAGE_CLASS_NAME)
567+
_persistenceAccessModes: string @timoni(runtime:string:PERSISTENCE_ACCESS_MODES)
568+
565569
replicaCount: string @timoni(runtime:string:CLAMAV_REPLICA_COUNT)
566570
resources: {
567571
limits: {
@@ -574,12 +578,11 @@ bundle: {
574578
}
575579
}
576580
persistence: {
581+
accessModes: [ "\(_persistenceAccessModes)" ]
577582
size: string @timoni(runtime:string:CLAMAV_PERSISTENCE_SIZE)
583+
storageClass: "\(_persistenceStorageClassName)"
578584
}
579585
freshclam: {
580-
containerSecurityContext: {
581-
readOnlyRootFilesystem: bool @timoni(runtime:bool:CLAMAV_FRESHCLAM_READONLY_ROOT_FILESYSTEM)
582-
}
583586
image: {
584587
tag: string @timoni(runtime:string:CLAMAV_FRESHCLAM_IMAGE_TAG)
585588
}
@@ -591,6 +594,8 @@ bundle: {
591594
}
592595
icap: {
593596
image: {
597+
registry: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REGISTRY)
598+
repository: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REPOSITORY)
594599
tag: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_TAG)
595600
}
596601
settings: {

‎charts/opencloud-microservices/deployments/timoni/runtime.cue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,11 @@ runtime: {
134134
"CLAMAV_RESOURCES_REQUESTS_CPU": "obj.data.CLAMAV_RESOURCES_REQUESTS_CPU"
135135
"CLAMAV_RESOURCES_REQUESTS_MEMORY": "obj.data.CLAMAV_RESOURCES_REQUESTS_MEMORY"
136136
"CLAMAV_PERSISTENCE_SIZE": "obj.data.CLAMAV_PERSISTENCE_SIZE"
137-
"CLAMAV_FRESHCLAM_READONLY_ROOT_FILESYSTEM": "obj.data.CLAMAV_FRESHCLAM_READONLY_ROOT_FILESYSTEM"
138137
"CLAMAV_FRESHCLAM_IMAGE_TAG": "obj.data.CLAMAV_FRESHCLAM_IMAGE_TAG"
139138
"CLAMAV_CLAMD_IMAGE_TAG": "obj.data.CLAMAV_CLAMD_IMAGE_TAG"
140139
"CLAMAV_ICAP_IMAGE_TAG": "obj.data.CLAMAV_ICAP_IMAGE_TAG"
140+
"CLAMAV_ICAP_IMAGE_REPOSITORY": "obj.data.CLAMAV_ICAP_IMAGE_REPOSITORY"
141+
"CLAMAV_ICAP_IMAGE_REGISTRY": "obj.data.CLAMAV_ICAP_IMAGE_REGISTRY"
141142
"CLAMAV_ICAP_CLAMD_HOST": "obj.data.CLAMAV_ICAP_CLAMD_HOST"
142143
"CLAMAV_MILTER_CLAMD_HOST": "obj.data.CLAMAV_MILTER_CLAMD_HOST"
143144
}
@@ -252,17 +253,16 @@ runtime: {
252253

253254
DEMO_USERS_ENABLED: false
254255
ANTIVIRUS_ENABLED: false
255-
ANTIVIRUS_INFECTED_FILE_HANDLING: "delete"
256-
ANTIVIRUS_ICAP_URL: ""
257-
ANTIVIRUS_ICAP_SERVICE: ""
256+
ANTIVIRUS_INFECTED_FILE_HANDLING: "abort"
257+
ANTIVIRUS_ICAP_URL: "http://opendesk-clamav-icap.clamav:1344"
258+
ANTIVIRUS_ICAP_SERVICE: "avscan"
258259

259260
CLAMAV_REPLICA_COUNT: "1"
260261
CLAMAV_RESOURCES_LIMITS_CPU: "500m"
261262
CLAMAV_RESOURCES_LIMITS_MEMORY: "512Mi"
262263
CLAMAV_RESOURCES_REQUESTS_CPU: "250m"
263264
CLAMAV_RESOURCES_REQUESTS_MEMORY: "256Mi"
264265
CLAMAV_PERSISTENCE_SIZE: "10Gi"
265-
CLAMAV_FRESHCLAM_READONLY_ROOT_FILESYSTEM: false
266266
CLAMAV_FRESHCLAM_IMAGE_TAG: "1.4.0"
267267
CLAMAV_CLAMD_IMAGE_TAG: "1.4.0"
268268
CLAMAV_ICAP_IMAGE_TAG: "0.5.10"

‎charts/opencloud-microservices/deployments/timoni/sa.yaml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ roleRef:
7171
apiVersion: v1
7272
kind: ServiceAccount
7373
metadata:
74-
name: clamav-sa
74+
name: flux
7575
namespace: clamav
7676
---
7777
# 2) Role — full power *inside* that namespace
@@ -81,12 +81,9 @@ metadata:
8181
name: clamav-role
8282
namespace: clamav
8383
rules:
84-
- apiGroups: [""]
85-
resources: ["pods", "services", "configmaps", "secrets"]
86-
verbs: ["get", "list", "watch", "create", "update", "patch"]
87-
- apiGroups: ["apps"]
88-
resources: ["deployments", "daemonsets", "statefulsets"]
89-
verbs: ["get", "list", "watch", "create", "update", "patch"]
84+
- apiGroups: ["*"] # core & all groups
85+
resources: ["*"] # every namespaced resource
86+
verbs: ["*"] # get, list, create, delete, …
9087
---
9188
# 3) RoleBinding — ties the Role to the SA
9289
apiVersion: rbac.authorization.k8s.io/v1
@@ -96,7 +93,7 @@ metadata:
9693
namespace: clamav
9794
subjects:
9895
- kind: ServiceAccount
99-
name: clamav-sa
96+
name: flux
10097
namespace: clamav
10198
roleRef:
10299
apiGroup: rbac.authorization.k8s.io

‎charts/opencloud-microservices/values.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1879,7 +1879,7 @@
18791879
"type": "integer"
18801880
},
18811881
"url": {
1882-
"default": null,
1882+
"default": "",
18831883
"description": "Sets the icap url",
18841884
"format": "uri",
18851885
"required": [],

0 commit comments

Comments
 (0)