Skip to content

Commit 143bcfe

Browse files
author
Your Name
committed
Bump up Version
1 parent f54363b commit 143bcfe

File tree

10 files changed

+156
-182
lines changed

10 files changed

+156
-182
lines changed

‎charts/opencloud-microservices/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainers:
1212
email: [email protected]
1313
url: https://opencloud.eu
1414
type: application
15-
version: 0.3.6
15+
version: 0.3.7
1616
# renovate: datasource=docker depName=opencloudeu/opencloud-rolling
1717
appVersion: 3.6.0
1818
kubeVersion: ""

‎charts/opencloud-microservices/deployments/helm/helmfile.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,10 @@ releases:
9797
# Space Administrator Role set to 100GB
9898
'2aadd357-682c-406b-8874-293091995fdd': 0
9999
virusscan:
100-
enabled: false
100+
enabled: true
101101
infectedFileHandling: "abort"
102-
icap:
103-
url: "http://clamav-icap.clamav:1344"
104-
service: "avscan"
102+
scannerType: "clamav"
103+
clamavSocket: "tcp://clamav.clamav.svc.cluster.local:3310"
105104
appsIntegration:
106105
enabled: true
107106
wopiIntegration:

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

Lines changed: 55 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ bundle: {
22
apiVersion: "v1alpha1"
33
name: "clamav"
44
instances: {
5-
// "service-account": {
6-
// module: url: "oci://ghcr.io/stefanprodan/modules/flux-tenant"
7-
// namespace: "opencloud"
8-
// values: {
9-
// role: "namespace-admin"
10-
// resourceQuota: {
11-
// kustomizations: 100
12-
// helmreleases: 100
13-
// }
14-
// }
15-
// },
16-
5+
"service-account": {
6+
module: url: "oci://ghcr.io/stefanprodan/modules/flux-tenant"
7+
namespace: "clamav"
8+
values: {
9+
role: "namespace-admin"
10+
resourceQuota: {
11+
kustomizations: 100
12+
helmreleases: 100
13+
}
14+
}
15+
},
16+
1717
"clamav": {
1818
module: {
1919
url: "oci://ghcr.io/stefanprodan/modules/flux-helm-release"
@@ -22,87 +22,66 @@ bundle: {
2222
namespace: "clamav"
2323
values: {
2424
repository: {
25-
url: "https://gitlab.opencode.de/api/v4/projects/1381/packages/helm/stable"
25+
url: "https://wiremind.github.io/wiremind-helm-charts"
2626
}
2727
chart: {
28-
name: "opendesk-clamav"
29-
version: "4.0.6"
28+
name: "clamav"
29+
version: "3.7.1"
3030
}
3131
sync: {
3232
timeout: 5
3333
createNamespace: true
3434
}
3535
helmValues: {
36-
// Global persistence indirection (like _domainFilter pattern)
37-
_persistenceStorageClassName: string @timoni(runtime:string:PERSISTENCE_STORAGE_CLASS_NAME)
38-
_persistenceAccessModes: string @timoni(runtime:string:PERSISTENCE_ACCESS_MODES)
36+
_persistenceStorageClassName: string @timoni(runtime:string:CLAMAV_PERSISTENCE_STORAGE_CLASS)
37+
_persistenceAccessModes: string @timoni(runtime:string:CLAMAV_PERSISTENCE_ACCESS_MODES)
3938

40-
replicaCount: string @timoni(runtime:string:CLAMAV_REPLICA_COUNT)
41-
resources: {
42-
limits: {
43-
cpu: string @timoni(runtime:string:CLAMAV_RESOURCES_LIMITS_CPU)
44-
memory: string @timoni(runtime:string:CLAMAV_RESOURCES_LIMITS_MEMORY)
45-
}
46-
requests: {
47-
cpu: string @timoni(runtime:string:CLAMAV_RESOURCES_REQUESTS_CPU)
48-
memory: string @timoni(runtime:string:CLAMAV_RESOURCES_REQUESTS_MEMORY)
39+
replicaCount: int @timoni(runtime:number:CLAMAV_REPLICA_COUNT)
40+
41+
updateStrategy: {
42+
type: string @timoni(runtime:string:CLAMAV_UPDATE_STRATEGY_TYPE)
43+
rollingUpdate: {
44+
partition: int @timoni(runtime:number:CLAMAV_UPDATE_STRATEGY_PARTITION)
4945
}
5046
}
51-
persistence: {
52-
accessModes: [ "\(_persistenceAccessModes)" ]
53-
size: string @timoni(runtime:string:CLAMAV_PERSISTENCE_SIZE)
54-
storageClass: "\(_persistenceStorageClassName)"
47+
48+
hpa: {
49+
enabled: bool @timoni(runtime:bool:CLAMAV_HPA_ENABLED)
5550
}
56-
freshclam: {
57-
image: {
58-
tag: string @timoni(runtime:string:CLAMAV_FRESHCLAM_IMAGE_TAG)
59-
}
60-
}
61-
clamd: {
62-
image: {
63-
tag: string @timoni(runtime:string:CLAMAV_CLAMD_IMAGE_TAG)
64-
}
51+
52+
podDisruptionBudget: {
53+
enabled: bool @timoni(runtime:bool:CLAMAV_PDB_ENABLED)
54+
minAvailable: int @timoni(runtime:number:CLAMAV_PDB_MIN_AVAILABLE)
6555
}
66-
icap: {
67-
image: {
68-
registry: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REGISTRY)
69-
repository: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_REPOSITORY)
70-
tag: string @timoni(runtime:string:CLAMAV_ICAP_IMAGE_TAG)
71-
}
72-
73-
settings: {
74-
clamdModClamdHost: string @timoni(runtime:string:CLAMAV_ICAP_CLAMD_HOST)
75-
tmpDir: "/icap-tmp"
76-
}
77-
78-
extraVolumes: [
79-
{
80-
name: "icap-tmp"
81-
emptyDir: {}
82-
}
83-
]
84-
85-
extraVolumeMounts: [
86-
{
87-
name: "icap-tmp"
88-
mountPath: "/icap-tmp"
89-
}
90-
]
91-
92-
lifecycleHooks: {
93-
postStart: {
94-
exec: {
95-
command: [
96-
"sh", "-c",
97-
"rm -f /var/run/c-icap/c-icap.* /var/tmp/c-icap.* || true"
98-
]
56+
57+
topologySpreadConstraints: [
58+
{
59+
maxSkew: int @timoni(runtime:number:CLAMAV_TOPOLOGY_MAX_SKEW)
60+
topologyKey: string @timoni(runtime:string:CLAMAV_TOPOLOGY_KEY)
61+
whenUnsatisfiable: string @timoni(runtime:string:CLAMAV_TOPOLOGY_UNSATISFIABLE)
62+
labelSelector: {
63+
matchLabels: {
64+
"app.kubernetes.io/name": "clamav"
9965
}
10066
}
10167
}
68+
]
69+
70+
persistentVolume: {
71+
enabled: bool @timoni(runtime:bool:CLAMAV_PERSISTENCE_ENABLED)
72+
size: string @timoni(runtime:string:CLAMAV_PERSISTENCE_SIZE)
73+
storageClass: "\(_persistenceStorageClassName)"
74+
accessModes: [ "\(_persistenceAccessModes)" ]
10275
}
103-
milter: {
104-
settings: {
105-
clamdHost: string @timoni(runtime:string:CLAMAV_MILTER_CLAMD_HOST)
76+
77+
resources: {
78+
limits: {
79+
cpu: string @timoni(runtime:string:CLAMAV_RESOURCES_LIMITS_CPU)
80+
memory: string @timoni(runtime:string:CLAMAV_RESOURCES_LIMITS_MEMORY)
81+
}
82+
requests: {
83+
cpu: string @timoni(runtime:string:CLAMAV_RESOURCES_REQUESTS_CPU)
84+
memory: string @timoni(runtime:string:CLAMAV_RESOURCES_REQUESTS_MEMORY)
10685
}
10786
}
10887
}

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

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,37 @@ metadata:
1010
namespace: clamav
1111
data:
1212
###############################################################################
13-
# Persistence StorageClass and AccessModes (global defaults)
13+
# High Availability Configuration
1414
###############################################################################
15-
PERSISTENCE_STORAGE_CLASS_NAME: ""
16-
# Comma-separated for runtime to split into a list, e.g. "ReadWriteMany" or "ReadWriteOnce,ReadOnlyMany"
17-
PERSISTENCE_ACCESS_MODES: "ReadWriteOnce"
15+
CLAMAV_REPLICA_COUNT: "1"
16+
CLAMAV_UPDATE_STRATEGY_TYPE: "RollingUpdate"
17+
CLAMAV_UPDATE_STRATEGY_PARTITION: "1"
18+
CLAMAV_HPA_ENABLED: "false"
19+
CLAMAV_PDB_ENABLED: "false"
20+
CLAMAV_PDB_MIN_AVAILABLE: "1"
21+
CLAMAV_TOPOLOGY_MAX_SKEW: "1"
22+
CLAMAV_TOPOLOGY_KEY: "kubernetes.io/hostname"
23+
CLAMAV_TOPOLOGY_UNSATISFIABLE: "ScheduleAnyway"
1824

1925
###############################################################################
20-
# ClamAV Configuration
26+
# Persistence Configuration
2127
###############################################################################
22-
CLAMAV_REPLICA_COUNT: "1"
23-
CLAMAV_RESOURCES_LIMITS_CPU: "500m"
24-
CLAMAV_RESOURCES_LIMITS_MEMORY: "512Mi"
25-
CLAMAV_RESOURCES_REQUESTS_CPU: "250m"
26-
CLAMAV_RESOURCES_REQUESTS_MEMORY: "256Mi"
27-
CLAMAV_PERSISTENCE_SIZE: "10Gi"
28-
CLAMAV_FRESHCLAM_IMAGE_TAG: "1.4.0"
29-
CLAMAV_CLAMD_IMAGE_TAG: "1.4.0"
30-
CLAMAV_ICAP_IMAGE_TAG: "0.5.10"
31-
CLAMAV_ICAP_IMAGE_REPOSITORY: "bmi/opendesk/components/platform-development/images/clamav-icap"
32-
CLAMAV_ICAP_IMAGE_REGISTRY: "registry.opencode.de"
33-
CLAMAV_ICAP_CLAMD_HOST: "clamav-clamd"
34-
CLAMAV_MILTER_CLAMD_HOST: "clamav-clamd"
28+
CLAMAV_PERSISTENCE_ENABLED: "true"
29+
CLAMAV_PERSISTENCE_SIZE: "100Mi"
30+
# For ReadWriteMany deployment, change to: ReadWriteMany
31+
CLAMAV_PERSISTENCE_ACCESS_MODES: "ReadWriteOnce"
32+
CLAMAV_PERSISTENCE_STORAGE_CLASS: ""
33+
34+
###############################################################################
35+
# Resource Configuration
36+
###############################################################################
37+
CLAMAV_RESOURCES_LIMITS_CPU: "6000m"
38+
CLAMAV_RESOURCES_LIMITS_MEMORY: "8Gi"
39+
CLAMAV_RESOURCES_REQUESTS_CPU: "500m"
40+
CLAMAV_RESOURCES_REQUESTS_MEMORY: "1Gi"
41+
42+
###############################################################################
43+
# Image Configuration
44+
###############################################################################
45+
# Leave empty to use default image tag from helm chart
46+
CLAMAV_IMAGE_TAG: ""

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,45 @@ runtime: {
55
{
66
query: "k8s:v1:ConfigMap:clamav:opencloud-config"
77
for: {
8-
"PERSISTENCE_STORAGE_CLASS_NAME": "obj.data.PERSISTENCE_STORAGE_CLASS_NAME"
9-
"PERSISTENCE_ACCESS_MODES": "obj.data.PERSISTENCE_ACCESS_MODES"
108
"CLAMAV_REPLICA_COUNT": "obj.data.CLAMAV_REPLICA_COUNT"
9+
"CLAMAV_UPDATE_STRATEGY_TYPE": "obj.data.CLAMAV_UPDATE_STRATEGY_TYPE"
10+
"CLAMAV_UPDATE_STRATEGY_PARTITION": "obj.data.CLAMAV_UPDATE_STRATEGY_PARTITION"
11+
"CLAMAV_HPA_ENABLED": "obj.data.CLAMAV_HPA_ENABLED"
12+
"CLAMAV_PDB_ENABLED": "obj.data.CLAMAV_PDB_ENABLED"
13+
"CLAMAV_PDB_MIN_AVAILABLE": "obj.data.CLAMAV_PDB_MIN_AVAILABLE"
14+
"CLAMAV_TOPOLOGY_MAX_SKEW": "obj.data.CLAMAV_TOPOLOGY_MAX_SKEW"
15+
"CLAMAV_TOPOLOGY_KEY": "obj.data.CLAMAV_TOPOLOGY_KEY"
16+
"CLAMAV_TOPOLOGY_UNSATISFIABLE": "obj.data.CLAMAV_TOPOLOGY_UNSATISFIABLE"
17+
"CLAMAV_PERSISTENCE_ENABLED": "obj.data.CLAMAV_PERSISTENCE_ENABLED"
18+
"CLAMAV_PERSISTENCE_SIZE": "obj.data.CLAMAV_PERSISTENCE_SIZE"
19+
"CLAMAV_PERSISTENCE_ACCESS_MODES": "obj.data.CLAMAV_PERSISTENCE_ACCESS_MODES"
20+
"CLAMAV_PERSISTENCE_STORAGE_CLASS": "obj.data.CLAMAV_PERSISTENCE_STORAGE_CLASS"
1121
"CLAMAV_RESOURCES_LIMITS_CPU": "obj.data.CLAMAV_RESOURCES_LIMITS_CPU"
1222
"CLAMAV_RESOURCES_LIMITS_MEMORY": "obj.data.CLAMAV_RESOURCES_LIMITS_MEMORY"
1323
"CLAMAV_RESOURCES_REQUESTS_CPU": "obj.data.CLAMAV_RESOURCES_REQUESTS_CPU"
1424
"CLAMAV_RESOURCES_REQUESTS_MEMORY": "obj.data.CLAMAV_RESOURCES_REQUESTS_MEMORY"
15-
"CLAMAV_PERSISTENCE_SIZE": "obj.data.CLAMAV_PERSISTENCE_SIZE"
16-
"CLAMAV_FRESHCLAM_IMAGE_TAG": "obj.data.CLAMAV_FRESHCLAM_IMAGE_TAG"
17-
"CLAMAV_CLAMD_IMAGE_TAG": "obj.data.CLAMAV_CLAMD_IMAGE_TAG"
18-
"CLAMAV_ICAP_IMAGE_TAG": "obj.data.CLAMAV_ICAP_IMAGE_TAG"
19-
"CLAMAV_ICAP_IMAGE_REPOSITORY": "obj.data.CLAMAV_ICAP_IMAGE_REPOSITORY"
20-
"CLAMAV_ICAP_IMAGE_REGISTRY": "obj.data.CLAMAV_ICAP_IMAGE_REGISTRY"
21-
"CLAMAV_ICAP_CLAMD_HOST": "obj.data.CLAMAV_ICAP_CLAMD_HOST"
22-
"CLAMAV_MILTER_CLAMD_HOST": "obj.data.CLAMAV_MILTER_CLAMD_HOST"
25+
"CLAMAV_IMAGE_TAG": "obj.data.CLAMAV_IMAGE_TAG"
2326
}
2427
}
2528
]
2629
defaults: {
27-
PERSISTENCE_STORAGE_CLASS_NAME: ""
28-
PERSISTENCE_ACCESS_MODES: "ReadWriteOnce"
29-
CLAMAV_REPLICA_COUNT: "1"
30-
CLAMAV_RESOURCES_LIMITS_CPU: "500m"
31-
CLAMAV_RESOURCES_LIMITS_MEMORY: "512Mi"
32-
CLAMAV_RESOURCES_REQUESTS_CPU: "250m"
33-
CLAMAV_RESOURCES_REQUESTS_MEMORY: "256Mi"
34-
CLAMAV_PERSISTENCE_SIZE: "10Gi"
35-
CLAMAV_FRESHCLAM_IMAGE_TAG: "1.4.0"
36-
CLAMAV_CLAMD_IMAGE_TAG: "1.4.0"
37-
CLAMAV_ICAP_IMAGE_TAG: "0.5.10"
38-
CLAMAV_ICAP_IMAGE_REPOSITORY: "c6o/kgotham"
39-
CLAMAV_ICAP_IMAGE_REGISTRY: "quay.io"
40-
CLAMAV_ICAP_CLAMD_HOST: "opendesk-clamav-clamd"
41-
CLAMAV_MILTER_CLAMD_HOST: "opendesk-clamav-clamd"
30+
CLAMAV_REPLICA_COUNT: 2
31+
CLAMAV_UPDATE_STRATEGY_TYPE: "RollingUpdate"
32+
CLAMAV_UPDATE_STRATEGY_PARTITION: 0
33+
CLAMAV_HPA_ENABLED: false
34+
CLAMAV_PDB_ENABLED: true
35+
CLAMAV_PDB_MIN_AVAILABLE: 1
36+
CLAMAV_TOPOLOGY_MAX_SKEW: 1
37+
CLAMAV_TOPOLOGY_KEY: "kubernetes.io/hostname"
38+
CLAMAV_TOPOLOGY_UNSATISFIABLE: "ScheduleAnyway"
39+
CLAMAV_PERSISTENCE_ENABLED: true
40+
CLAMAV_PERSISTENCE_SIZE: "100Mi"
41+
CLAMAV_PERSISTENCE_ACCESS_MODES: "ReadWriteMany"
42+
CLAMAV_PERSISTENCE_STORAGE_CLASS: ""
43+
CLAMAV_RESOURCES_LIMITS_CPU: "1000m"
44+
CLAMAV_RESOURCES_LIMITS_MEMORY: "2Gi"
45+
CLAMAV_RESOURCES_REQUESTS_CPU: "500m"
46+
CLAMAV_RESOURCES_REQUESTS_MEMORY: "1Gi"
47+
CLAMAV_IMAGE_TAG: ""
4248
}
4349
}

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎charts/opencloud-microservices/templates/antivirus/deployment.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ spec:
5151
- name: ANTIVIRUS_INFECTED_FILE_HANDLING
5252
value: {{ .Values.features.virusscan.infectedFileHandling | quote }}
5353
- name: ANTIVIRUS_SCANNER_TYPE
54-
value: "icap"
54+
value: {{ .Values.features.virusscan.scannerType | quote }}
55+
- name: ANTIVIRUS_CLAMAV_SOCKET
56+
value: {{ .Values.features.virusscan.clamavSocket | quote }}
5557
- name: ANTIVIRUS_ICAP_SCAN_TIMEOUT
5658
value: {{ .Values.features.virusscan.icap.timeout | quote }}
5759
- name: ANTIVIRUS_ICAP_URL

0 commit comments

Comments
 (0)