From 91f3efcddd2d262822554d6e147d4fc65663c89e Mon Sep 17 00:00:00 2001 From: Alexander Chebotov Date: Tue, 2 Apr 2024 12:58:50 +0300 Subject: [PATCH 1/5] helm: Add subcomponent labels for celery beat and worker at deployment ``` apiVersion: apps/v1 kind: Deployment metadata: labels: defectdojo.org/component: celery defectdojo.org/subcomponent: worker spec: selector: matchLabels: defectdojo.org/component: celery defectdojo.org/subcomponent: worker template: metadata: labels: defectdojo.org/component: celery defectdojo.org/subcomponent: worker ``` 1, The first label is for deployment itself, it gives label for that particular deployment. 2, The second label is selector: matchLabels which tells the resources(service etc) to match the pod according to label. 3. The third label is podTemplate labels, the template is actually podTemplate. It describe the pod that it is launched. --- helm/defectdojo/Chart.yaml | 2 +- helm/defectdojo/templates/celery-beat-deployment.yaml | 2 ++ helm/defectdojo/templates/celery-worker-deployment.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 325080998b0..089b9a3475f 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.33.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.118-dev +version: 1.6.119-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap diff --git a/helm/defectdojo/templates/celery-beat-deployment.yaml b/helm/defectdojo/templates/celery-beat-deployment.yaml index 605e41b5b92..d91a2465925 100644 --- a/helm/defectdojo/templates/celery-beat-deployment.yaml +++ b/helm/defectdojo/templates/celery-beat-deployment.yaml @@ -18,12 +18,14 @@ spec: selector: matchLabels: defectdojo.org/component: celery + defectdojo.org/subcomponent: beat app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: labels: defectdojo.org/component: celery + defectdojo.org/subcomponent: beat app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.podLabels }} diff --git a/helm/defectdojo/templates/celery-worker-deployment.yaml b/helm/defectdojo/templates/celery-worker-deployment.yaml index b6ca15e687a..86d3b7f6508 100644 --- a/helm/defectdojo/templates/celery-worker-deployment.yaml +++ b/helm/defectdojo/templates/celery-worker-deployment.yaml @@ -18,12 +18,14 @@ spec: selector: matchLabels: defectdojo.org/component: celery + defectdojo.org/subcomponent: worker app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} template: metadata: labels: defectdojo.org/component: celery + defectdojo.org/subcomponent: worker app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.podLabels }} From 48b54cad71a0fef7d713fcc56e608e0dd68e9dc9 Mon Sep 17 00:00:00 2001 From: DefectDojo Date: Tue, 2 Apr 2024 10:23:21 +0000 Subject: [PATCH 2/5] Update helm lock file Signed-off-by: DefectDojo --- helm/defectdojo/Chart.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index a85360d4545..a8027f365ef 100644 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -13,6 +13,6 @@ dependencies: version: 11.16.2 - name: redis repository: https://charts.bitnami.com/bitnami - version: 19.0.1 -digest: sha256:7c38007c50dd3fddea2d065cf57848cf9ef65f6a3b9fc1ec6bf508214429704b -generated: "2024-03-25T19:30:19.499072006Z" + version: 19.0.2 +digest: sha256:49f98ae937b883b7fc9237b78f3d8434d012be145777a7ec682b563cd7c29c60 +generated: "2024-04-02T10:23:13.129890115Z" From 1ecb3131a29524ec0e76175611b5da23cafb3262 Mon Sep 17 00:00:00 2001 From: Alexander Chebotov Date: Wed, 3 Apr 2024 09:08:13 +0300 Subject: [PATCH 3/5] bump chart version --- helm/defectdojo/Chart.lock | 8 ++++---- helm/defectdojo/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index 8266558b2c2..a85360d4545 100644 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 9.19.1 - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 15.2.0 + version: 15.1.4 - name: postgresql-ha repository: https://charts.bitnami.com/bitnami version: 9.4.11 @@ -13,6 +13,6 @@ dependencies: version: 11.16.2 - name: redis repository: https://charts.bitnami.com/bitnami - version: 19.0.2 -digest: sha256:e4fa2641d160547748ba41a729ea67574601003b8f5da322832d88bd18acb6bd -generated: "2024-04-01T09:55:40.430476431Z" \ No newline at end of file + version: 19.0.1 +digest: sha256:7c38007c50dd3fddea2d065cf57848cf9ef65f6a3b9fc1ec6bf508214429704b +generated: "2024-03-25T19:30:19.499072006Z" diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 40bd74c814e..43c7a5afa3b 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.34.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.119-dev +version: 1.6.120-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap From 6e93ff21ae65cb43696f733c60163d00cbc2a28a Mon Sep 17 00:00:00 2001 From: DefectDojo Date: Wed, 3 Apr 2024 06:08:49 +0000 Subject: [PATCH 4/5] Update helm lock file Signed-off-by: DefectDojo --- helm/defectdojo/Chart.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index a85360d4545..84c7fc2ac9b 100644 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 9.19.1 - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 15.1.4 + version: 15.2.2 - name: postgresql-ha repository: https://charts.bitnami.com/bitnami version: 9.4.11 @@ -13,6 +13,6 @@ dependencies: version: 11.16.2 - name: redis repository: https://charts.bitnami.com/bitnami - version: 19.0.1 -digest: sha256:7c38007c50dd3fddea2d065cf57848cf9ef65f6a3b9fc1ec6bf508214429704b -generated: "2024-03-25T19:30:19.499072006Z" + version: 19.0.2 +digest: sha256:fc164ef5c2068b0ff687dadb9b6a66c0f9427671fff3e1e8f5a93d5d19f1f991 +generated: "2024-04-03T06:08:40.939089264Z" From bb22a945c0439b2ed87003f41944acc8d2073f36 Mon Sep 17 00:00:00 2001 From: Alexander Chebotov Date: Mon, 8 Apr 2024 19:19:04 +0300 Subject: [PATCH 5/5] revert changes --- helm/defectdojo/Chart.lock | 6 +++--- helm/defectdojo/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index 84c7fc2ac9b..04c171e2c57 100644 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -4,7 +4,7 @@ dependencies: version: 9.19.1 - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 15.2.2 + version: 15.2.0 - name: postgresql-ha repository: https://charts.bitnami.com/bitnami version: 9.4.11 @@ -14,5 +14,5 @@ dependencies: - name: redis repository: https://charts.bitnami.com/bitnami version: 19.0.2 -digest: sha256:fc164ef5c2068b0ff687dadb9b6a66c0f9427671fff3e1e8f5a93d5d19f1f991 -generated: "2024-04-03T06:08:40.939089264Z" +digest: sha256:e4fa2641d160547748ba41a729ea67574601003b8f5da322832d88bd18acb6bd +generated: "2024-04-01T09:55:40.430476431Z" diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 43c7a5afa3b..40bd74c814e 100644 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.34.0-dev" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.120-dev +version: 1.6.119-dev icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap