From 0568d24e0f35ffa9a3443a2906446e019565e4e0 Mon Sep 17 00:00:00 2001 From: imand3r Date: Fri, 9 Jun 2023 12:06:49 -0700 Subject: [PATCH] Update spamcheck to v1.10.0 --- charts/gitlab/charts/spamcheck/Chart.yaml | 4 ++-- charts/gitlab/charts/spamcheck/templates/configmap.yaml | 2 +- charts/gitlab/charts/spamcheck/values.yaml | 2 +- doc/charts/gitlab/spamcheck/index.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/gitlab/charts/spamcheck/Chart.yaml b/charts/gitlab/charts/spamcheck/Chart.yaml index 6218f8540a..52f58e65c2 100644 --- a/charts/gitlab/charts/spamcheck/Chart.yaml +++ b/charts/gitlab/charts/spamcheck/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: spamcheck version: 7.0.4 -appVersion: 1.2.3 +appVersion: 1.10.0 description: GitLab Anti-Spam Engine keywords: - gitlab @@ -12,7 +12,7 @@ home: https://about.gitlab.com/ icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.svg sources: - https://gitlab.com/gitlab-org/charts/gitlab/tree/master/charts/gitlab/charts/spamcheck -- https://gitlab.com/gitlab-org/spamcheck +- https://gitlab.com/gitlab-org/gl-security/security-engineering/security-automation/spam/spamcheck maintainers: - name: GitLab Inc. email: support@gitlab.com diff --git a/charts/gitlab/charts/spamcheck/templates/configmap.yaml b/charts/gitlab/charts/spamcheck/templates/configmap.yaml index 3799e86d43..fc18e18977 100644 --- a/charts/gitlab/charts/spamcheck/templates/configmap.yaml +++ b/charts/gitlab/charts/spamcheck/templates/configmap.yaml @@ -8,7 +8,7 @@ metadata: {{- include "gitlab.standardLabels" . | nindent 4 }} {{- include "gitlab.commonLabels" . | nindent 4 }} data: - # See https://gitlab.com/gitlab-org/spamcheck/-/blob/main/config/config.example.yml + # See https://gitlab.com/gitlab-org/gl-security/security-engineering/security-automation/spam/spamcheck/-/blob/main/config/config.example.yml config.yaml: | grpc_addr: {{ .Values.service.internalPort | quote }} log_level: {{ .Values.logging.level | quote }} diff --git a/charts/gitlab/charts/spamcheck/values.yaml b/charts/gitlab/charts/spamcheck/values.yaml index 84eaffb6a1..4d334638ce 100644 --- a/charts/gitlab/charts/spamcheck/values.yaml +++ b/charts/gitlab/charts/spamcheck/values.yaml @@ -25,7 +25,7 @@ hpa: stabilizationWindowSeconds: 300 image: - repository: registry.gitlab.com/gitlab-com/gl-security/engineering-and-research/automation-team/spam/spamcheck + repository: registry.gitlab.com/gitlab-org/gl-security/security-engineering/security-automation/spam/spamcheck service: type: ClusterIP diff --git a/doc/charts/gitlab/spamcheck/index.md b/doc/charts/gitlab/spamcheck/index.md index e3ef5d23c6..18fda51057 100644 --- a/doc/charts/gitlab/spamcheck/index.md +++ b/doc/charts/gitlab/spamcheck/index.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Using the GitLab-Spamcheck chart **(PREMIUM SELF)** -The `spamcheck` sub-chart provides a deployment of [Spamcheck](https://gitlab.com/gitlab-org/spamcheck) which is an anti-spam engine developed by GitLab originally to combat the rising amount of spam in GitLab.com, and later made public to be used in self-managed GitLab instances. +The `spamcheck` sub-chart provides a deployment of [Spamcheck](https://gitlab.com/gitlab-org/gl-security/security-engineering/security-automation/spam/spamcheck) which is an anti-spam engine developed by GitLab originally to combat the rising amount of spam in GitLab.com, and later made public to be used in self-managed GitLab instances. ## Requirements @@ -65,7 +65,7 @@ The table below contains all the possible charts configurations that can be supp | `hpa.memory.targetAverageValue` | | Set the autoscaling memory target value | | `hpa.memory.targetAverageUtilization` | | Set the autoscaling memory target utilization | | `hpa.targetAverageValue` | | **DEPRECATED** Set the autoscaling CPU target value | -| `image.repository` | `registry.gitlab.com/gitlab-com/gl-security/engineering-and-research/automation-team/spam/spamcheck` | Spamcheck image repository | +| `image.repository` | `registry.gitlab.com/gitlab-org/gl-security/security-engineering/security-automation/spam/spamcheck` | Spamcheck image repository | | `logging.level` | `info` | Log level | | `maxReplicas` | `10` | HPA `maxReplicas` | | `maxUnavailable` | `1` | HPA `maxUnavailable` | -- GitLab