From a04b26b851cd7df4c8e5ec37a88deb45517f077d Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 14 Dec 2023 22:05:05 +0000 Subject: [PATCH] chore: ci and clamav version bumps --- charts/clamav/Chart.yaml | 11 ++-- charts/clamav/README.md | 29 +++++----- charts/clamav/deploy.sh | 7 --- charts/clamav/templates/configmap.yaml | 14 ++--- charts/clamav/templates/statefulset.yaml | 14 ++--- charts/clamav/update.sh | 9 ++++ charts/clamav/values.yaml | 67 +++++++++++------------- charts/kubezero-ci/README.md | 10 ++-- charts/kubezero-ci/values.yaml | 8 +-- charts/kubezero-operators/update.sh | 2 + 10 files changed, 86 insertions(+), 85 deletions(-) delete mode 100755 charts/clamav/deploy.sh create mode 100755 charts/clamav/update.sh diff --git a/charts/clamav/Chart.yaml b/charts/clamav/Chart.yaml index 8b64b15..86badeb 100644 --- a/charts/clamav/Chart.yaml +++ b/charts/clamav/Chart.yaml @@ -1,18 +1,19 @@ apiVersion: v2 name: clamav -description: Chart for deploying a ClamavD on kubernetes as statfulSet +description: Chart for deploying a ClamAVd on Kubernetes as statfulSet type: application -version: "0.2.0" -appVersion: "1.1.0" +version: "0.3.0" +appVersion: "1.2.1" home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: - kubezero - clamav maintainers: - - name: Quarky9 + - name: Stefan Reimer + email: stefan@zero-downtime.net dependencies: - name: kubezero-lib version: ">= 0.1.6" repository: https://cdn.zero-downtime.net/charts/ -kubeVersion: ">= 1.25.0" +kubeVersion: ">= 1.26.0" diff --git a/charts/clamav/README.md b/charts/clamav/README.md index f7de6a3..6dd9f96 100644 --- a/charts/clamav/README.md +++ b/charts/clamav/README.md @@ -1,8 +1,8 @@ # clamav -![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.104.0](https://img.shields.io/badge/AppVersion-0.104.0-informational?style=flat-square) +![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.1](https://img.shields.io/badge/AppVersion-1.2.1-informational?style=flat-square) -Chart for deploying a ClamavD on kubernetes as statfulSet +Chart for deploying a ClamAVd on Kubernetes as statfulSet **Homepage:** @@ -10,32 +10,31 @@ Chart for deploying a ClamavD on kubernetes as statfulSet | Name | Email | Url | | ---- | ------ | --- | -| Quarky9 | | | +| Stefan Reimer | | | ## Requirements -Kubernetes: `>= 1.18.0` +Kubernetes: `>= 1.26.0` | Repository | Name | Version | |------------|------|---------| -| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.4 | +| https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| clamav.freshclam.mirrors | string | `"database.clamav.net"` | A list of clamav mirrors to be used by the clamav service | -| clamav.image | string | `"clamav/clamav"` | The clamav docker image | -| clamav.limits.connectionQueueLength | int | `100` | Maximum length the queue of pending connections may grow to | -| clamav.limits.fileSize | int | `20` | The largest file size scanable by clamav, in MB | -| clamav.limits.maxThreads | int | `4` | Maximum number of threads running at the same time. | -| clamav.limits.scanSize | int | `100` | The largest scan size permitted in clamav, in MB | -| clamav.limits.sendBufTimeout | int | `500` | | -| clamav.replicaCount | int | `1` | | -| clamav.resources | object | `{"requests":{"cpu":"300m","memory":"1300M"}}` | The resource requests and limits for the clamav service | -| clamav.version | string | `"unstable"` | The clamav docker image version - defaults to .Chart.appVersion | +| freshclam.mirrors | string | `"database.clamav.net"` | A list of clamav mirrors to be used by the clamav service | | fullnameOverride | string | `""` | override the full name of the clamav chart | +| image | object | `{"repository":"clamav/clamav","type":"base"}` | The clamav docker image | +| limits.connectionQueueLength | int | `100` | Maximum length the queue of pending connections may grow to | +| limits.fileSize | int | `20` | The largest file size scanable by clamav, in MB | +| limits.maxThreads | int | `4` | Maximum number of threads running at the same time. | +| limits.scanSize | int | `100` | The largest scan size permitted in clamav, in MB | +| limits.sendBufTimeout | int | `500` | | | nameOverride | string | `""` | override the name of the clamav chart | +| replicaCount | int | `1` | | +| resources | object | `{"requests":{"cpu":"300m","memory":"2000M"}}` | The resource requests and limits for the clamav service | | service.port | int | `3310` | The port to be used by the clamav service | ---------------------------------------------- diff --git a/charts/clamav/deploy.sh b/charts/clamav/deploy.sh deleted file mode 100755 index dc8c8a5..0000000 --- a/charts/clamav/deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -release=clamav -namespace=clamav - -helm template . --namespace $namespace --name-template $release > clamav.yaml -kubectl apply --namespace $namespace -f clamav.yaml diff --git a/charts/clamav/templates/configmap.yaml b/charts/clamav/templates/configmap.yaml index 9ebdc6e..3df2d07 100644 --- a/charts/clamav/templates/configmap.yaml +++ b/charts/clamav/templates/configmap.yaml @@ -19,28 +19,28 @@ data: User clamav ExitOnOOM yes Foreground yes - MaxScanSize {{.Values.clamav.limits.scanSize}}M - MaxFileSize {{.Values.clamav.limits.fileSize}}M + MaxScanSize {{.Values.limits.scanSize}}M + MaxFileSize {{.Values.limits.fileSize}}M # Close the connection when the data size limit is exceeded. # The value should match your MTA's limit for a maximum attachment size. # Default: 25M - StreamMaxLength {{.Values.clamav.limits.scanSize}}M + StreamMaxLength {{.Values.limits.scanSize}}M # Maximum length the queue of pending connections may grow to. # Default: 200 - MaxConnectionQueueLength {{.Values.clamav.limits.connectionQueueLength}} + MaxConnectionQueueLength {{.Values.limits.connectionQueueLength}} # Maximum number of threads running at the same time. # Default: 10 - MaxThreads {{.Values.clamav.limits.maxThreads}} + MaxThreads {{.Values.limits.maxThreads}} # This option specifies how long to wait (in milliseconds) if the send buffer # is full. # Keep this value low to prevent clamd hanging. # # Default: 500 - SendBufTimeout {{.Values.clamav.limits.sendBufTimeout}} + SendBufTimeout {{.Values.limits.sendBufTimeout}} freshclam.conf: | LogTime yes @@ -49,4 +49,4 @@ data: Checks 24 LogSyslog no DatabaseOwner root - DatabaseMirror {{ .Values.clamav.freshclam.mirrors }} + DatabaseMirror {{ .Values.freshclam.mirrors }} diff --git a/charts/clamav/templates/statefulset.yaml b/charts/clamav/templates/statefulset.yaml index c6efe89..09a3b66 100644 --- a/charts/clamav/templates/statefulset.yaml +++ b/charts/clamav/templates/statefulset.yaml @@ -6,7 +6,7 @@ metadata: labels: {{- include "kubezero-lib.labels" . | nindent 4 }} spec: - replicas: {{ .Values.clamav.replicaCount }} + replicas: {{ .Values.replicaCount }} selector: matchLabels: {{- include "kubezero-lib.selectorLabels" . | nindent 6 }} @@ -20,7 +20,7 @@ spec: spec: containers: - name: clamav - image: "{{ .Values.clamav.image }}:{{ default .Chart.AppVersion .Values.clamav.version }}_base" + image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}_{{ .Values.image.type }}" ports: - containerPort: 3310 name: clamav @@ -41,7 +41,7 @@ spec: successThreshold: 1 timeoutSeconds: 3 resources: - {{- toYaml .Values.clamav.resources | nindent 10 }} + {{- toYaml .Values.resources | nindent 10 }} volumeMounts: - mountPath: /var/lib/clamav name: signatures @@ -53,15 +53,15 @@ spec: - name: config-volume configMap: name: {{ include "kubezero-lib.fullname" . }} - {{- with .Values.clamav.nodeSelector }} + {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.clamav.affinity }} + {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.clamav.tolerations }} + {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} @@ -70,7 +70,7 @@ spec: name: signatures spec: accessModes: [ "ReadWriteOnce" ] - {{- with .Values.clamav.storageClassName }} + {{- with .Values.storageClassName }} storageClassName: {{ . }} {{- end }} resources: diff --git a/charts/clamav/update.sh b/charts/clamav/update.sh new file mode 100755 index 0000000..b09a8bf --- /dev/null +++ b/charts/clamav/update.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -ex + +. ../../scripts/lib-update.sh + +update_helm + + +update_docs diff --git a/charts/clamav/values.yaml b/charts/clamav/values.yaml index 0d1140a..531040e 100644 --- a/charts/clamav/values.yaml +++ b/charts/clamav/values.yaml @@ -1,46 +1,41 @@ -# Default values for clamav. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - # nameOverride -- override the name of the clamav chart nameOverride: "" # fullnameOverride -- override the full name of the clamav chart fullnameOverride: "" +# image -- The clamav docker image +image: + repository: clamav/clamav + # version: "latest" + type: base + +replicaCount: 1 + +freshclam: + # freshclam.mirrors -- A list of clamav mirrors to be used by the clamav service + mirrors: database.clamav.net +limits: + # limits.fileSize -- The largest file size scanable by clamav, in MB + fileSize: 20 + # limits.scanSize -- The largest scan size permitted in clamav, in MB + scanSize: 100 + # limits.connectionQueueLength -- Maximum length the queue of pending connections may grow to + connectionQueueLength: 100 + # limits.maxThreads --Maximum number of threads running at the same time. + maxThreads: 4 + # sendBufTimeout -- This option specifies how long to wait (in milliseconds) if the send buffer is full, keep low to avoid clamd hanging + sendBufTimeout: 500 + service: # service.port -- The port to be used by the clamav service port: 3310 -clamav: - # clamav.image -- The clamav docker image - image: clamav/clamav - # clamav.version -- The clamav docker image version - defaults to .Chart.appVersion - # version: "unstable" - - replicaCount: 1 - - freshclam: - # clamav.freshclam.mirrors -- A list of clamav mirrors to be used by the clamav service - mirrors: database.clamav.net - limits: - # clamav.limits.fileSize -- The largest file size scanable by clamav, in MB - fileSize: 20 - # clamav.limits.scanSize -- The largest scan size permitted in clamav, in MB - scanSize: 100 - # clamav.limits.connectionQueueLength -- Maximum length the queue of pending connections may grow to - connectionQueueLength: 100 - # clamav.limits.maxThreads --Maximum number of threads running at the same time. - maxThreads: 4 - # clamav.sendBufTimeout -- This option specifies how long to wait (in milliseconds) if the send buffer is full, keep low to avoid clamd hanging - sendBufTimeout: 500 - - - resources: - # clamav.resources -- The resource requests and limits for the clamav service - requests: - cpu: 300m - memory: 2000M - #limits: - # cpu: 2 - # memory: 4000M +resources: + # resources -- The resource requests and limits for the clamav service + requests: + cpu: 300m + memory: 2000M + #limits: + # cpu: 2 + # memory: 4000M diff --git a/charts/kubezero-ci/README.md b/charts/kubezero-ci/README.md index 215c0a3..aec01d9 100644 --- a/charts/kubezero-ci/README.md +++ b/charts/kubezero-ci/README.md @@ -1,6 +1,6 @@ # kubezero-ci -![Version: 0.8.4](https://img.shields.io/badge/Version-0.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.8.5](https://img.shields.io/badge/Version-0.8.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) KubeZero umbrella chart for all things CI @@ -20,9 +20,9 @@ Kubernetes: `>= 1.25.0` |------------|------|---------| | https://aquasecurity.github.io/helm-charts/ | trivy | 0.7.0 | | https://cdn.zero-downtime.net/charts/ | kubezero-lib | >= 0.1.6 | -| https://charts.jenkins.io | jenkins | 4.9.1 | +| https://charts.jenkins.io | jenkins | 4.9.2 | | https://dl.gitea.io/charts/ | gitea | 9.6.1 | -| https://docs.renovatebot.com/helm-charts | renovate | 37.68.4 | +| https://docs.renovatebot.com/helm-charts | renovate | 37.92.4 | # Jenkins - default build retention 10 builds, 32days @@ -65,6 +65,8 @@ Kubernetes: `>= 1.25.0` | gitea.gitea.demo | bool | `false` | | | gitea.gitea.metrics.enabled | bool | `false` | | | gitea.gitea.metrics.serviceMonitor.enabled | bool | `true` | | +| gitea.image.rootless | bool | `true` | | +| gitea.image.tag | string | `"1.21.2"` | | | gitea.istio.enabled | bool | `false` | | | gitea.istio.gateway | string | `"istio-ingress/private-ingressgateway"` | | | gitea.istio.url | string | `"git.example.com"` | | @@ -96,7 +98,7 @@ Kubernetes: `>= 1.25.0` | jenkins.agent.resources.requests.cpu | string | `""` | | | jenkins.agent.resources.requests.memory | string | `""` | | | jenkins.agent.showRawYaml | bool | `false` | | -| jenkins.agent.tag | string | `"v0.4.5"` | | +| jenkins.agent.tag | string | `"v0.4.6"` | | | jenkins.agent.yamlMergeStrategy | string | `"merge"` | | | jenkins.agent.yamlTemplate | string | `"apiVersion: v1\nkind: Pod\nspec:\n securityContext:\n fsGroup: 1000\n serviceAccountName: jenkins-podman-aws\n containers:\n - name: jnlp\n resources:\n requests:\n cpu: \"512m\"\n memory: \"1024Mi\"\n limits:\n cpu: \"4\"\n memory: \"6144Mi\"\n github.com/fuse: 1\n volumeMounts:\n - name: aws-token\n mountPath: \"/var/run/secrets/sts.amazonaws.com/serviceaccount/\"\n readOnly: true\n - name: host-registries-conf\n mountPath: \"/home/jenkins/.config/containers/registries.conf\"\n readOnly: true\n volumes:\n - name: aws-token\n projected:\n sources:\n - serviceAccountToken:\n path: token\n expirationSeconds: 86400\n audience: \"sts.amazonaws.com\"\n - name: host-registries-conf\n hostPath:\n path: /etc/containers/registries.conf\n type: File"` | | | jenkins.controller.JCasC.configScripts.zdt-settings | string | `"jenkins:\n noUsageStatistics: true\n disabledAdministrativeMonitors:\n - \"jenkins.security.ResourceDomainRecommendation\"\nappearance:\n themeManager:\n disableUserThemes: true\n theme: \"dark\"\nunclassified:\n buildDiscarders:\n configuredBuildDiscarders:\n - \"jobBuildDiscarder\"\n - defaultBuildDiscarder:\n discarder:\n logRotator:\n artifactDaysToKeepStr: \"32\"\n artifactNumToKeepStr: \"10\"\n daysToKeepStr: \"100\"\n numToKeepStr: \"10\"\n"` | | diff --git a/charts/kubezero-ci/values.yaml b/charts/kubezero-ci/values.yaml index f953fe7..72ed6b9 100644 --- a/charts/kubezero-ci/values.yaml +++ b/charts/kubezero-ci/values.yaml @@ -1,9 +1,9 @@ gitea: enabled: false - #image: - #tag: 1.17.4 - #rootless: true + image: + tag: 1.21.2 + rootless: true repliaCount: 1 @@ -161,7 +161,7 @@ jenkins: # Preconfigure agents to use zdt podman requires fuse/overlayfs agent: image: public.ecr.aws/zero-downtime/jenkins-podman - tag: v0.4.5 + tag: v0.4.6 #alwaysPullImage: true podRetention: "Default" showRawYaml: false diff --git a/charts/kubezero-operators/update.sh b/charts/kubezero-operators/update.sh index a681343..1b65154 100755 --- a/charts/kubezero-operators/update.sh +++ b/charts/kubezero-operators/update.sh @@ -15,3 +15,5 @@ helm template charts/eck-operator/charts/eck-operator-crds --name-template loggi rm -rf charts/eck-operator/charts yq eval -Mi 'del(.dependencies)' charts/eck-operator/Chart.yaml + +update_docs