From 232b89991273bab32520eb139d281c75e455924c Mon Sep 17 00:00:00 2001 From: orionjsa Date: Fri, 4 Nov 2022 12:37:57 +0100 Subject: [PATCH] feat(dependency-track): add annotations on deployment (#206) * feat(dependency-track): add annotations on deployment Signed-off-by: jsarasin * feat(dependency-track): bump chart verison Signed-off-by: jsarasin Signed-off-by: jsarasin Co-authored-by: jsarasin --- charts/dependency-track/Chart.yaml | 2 +- charts/dependency-track/README.md | 4 ++-- charts/dependency-track/templates/backend/deployment.yaml | 3 +++ charts/dependency-track/templates/frontend/deployment.yaml | 3 +++ charts/dependency-track/values.yaml | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/charts/dependency-track/Chart.yaml b/charts/dependency-track/Chart.yaml index ad3cbf5..056b3ee 100644 --- a/charts/dependency-track/Chart.yaml +++ b/charts/dependency-track/Chart.yaml @@ -4,7 +4,7 @@ description: | Dependency-Track is an intelligent Software Supply Chain Component Analysis platform that allows organizations to identify and reduce risk from the use of third-party and open source components. Dependency-Track takes a unique and highly beneficial approach by leveraging the capabilities of Software Bill-of-Materials (SBOM). This approach provides capabilities that traditional Software Composition Analysis (SCA) solutions cannot achieve. name: dependency-track home: https://dependencytrack.org/ -version: 1.5.3 +version: 1.5.4 icon: https://raw.githubusercontent.com/DependencyTrack/branding/master/dt-logo-black-text.svg keywords: - security diff --git a/charts/dependency-track/README.md b/charts/dependency-track/README.md index 03f6b01..336ca89 100644 --- a/charts/dependency-track/README.md +++ b/charts/dependency-track/README.md @@ -29,8 +29,8 @@ Dependency-Track is an intelligent Software Supply Chain Component Analysis plat | Key | Type | Default | Description | |-----|------|---------|-------------| -| apiserver | object | `{"affinity":{},"emptyDir":{"sizeLimit":"8Gi"},"enabled":true,"env":[],"fullnameOverride":"","image":{"pullPolicy":"IfNotPresent","repository":"dependencytrack/apiserver","tag":"4.6.2"},"initContainers":[],"livenessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/api/version","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"nameOverride":"","nodeSelector":{},"persistentVolume":{"accessModes":["ReadWriteOnce"],"annotations":{},"enabled":true,"size":"8Gi","storageClass":""},"podSecurityContext":{"fsGroup":1000},"readinessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"replicaCount":1,"resources":{"limits":{"cpu":4,"memory":"16Gi"},"requests":{"cpu":2,"memory":"4608Mi"}},"securityContext":{"readOnlyRootFilesystem":true,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000},"service":{"annotations":{},"port":80,"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true,"name":"apiserver-serviceaccount"},"tolerations":[]}` | config of the apiserver | -| frontend | object | `{"affinity":{},"emptyDir":{"sizeLimit":"8Gi"},"enabled":true,"env":[{"name":"API_BASE_URL","value":""}],"fullnameOverride":"","image":{"pullPolicy":"IfNotPresent","repository":"dependencytrack/frontend","tag":"4.6.1"},"initContainers":[],"livenessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"nameOverride":"","nodeSelector":{},"readinessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"replicaCount":2,"resources":{"limits":{"cpu":1,"memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"runAsUser":101},"service":{"annotations":{},"port":80,"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true,"name":"frontend-serviceaccount"},"tolerations":[]}` | config of the frontend | +| apiserver | object | `{"affinity":{},"emptyDir":{"sizeLimit":"8Gi"},"enabled":true,annotations":{},"env":[],"fullnameOverride":"","image":{"pullPolicy":"IfNotPresent","repository":"dependencytrack/apiserver","tag":"4.6.2"},"initContainers":[],"livenessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/api/version","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"nameOverride":"","nodeSelector":{},"persistentVolume":{"accessModes":["ReadWriteOnce"],"annotations":{},"enabled":true,"size":"8Gi","storageClass":""},"podSecurityContext":{"fsGroup":1000},"readinessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"replicaCount":1,"resources":{"limits":{"cpu":4,"memory":"16Gi"},"requests":{"cpu":2,"memory":"4608Mi"}},"securityContext":{"readOnlyRootFilesystem":true,"runAsGroup":1000,"runAsNonRoot":true,"runAsUser":1000},"service":{"annotations":{},"port":80,"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true,"name":"apiserver-serviceaccount"},"tolerations":[]}` | config of the apiserver | +| frontend | object | `{"affinity":{},"emptyDir":{"sizeLimit":"8Gi"},"enabled":true,annotations":{},"env":[{"name":"API_BASE_URL","value":""}],"fullnameOverride":"","image":{"pullPolicy":"IfNotPresent","repository":"dependencytrack/frontend","tag":"4.6.1"},"initContainers":[],"livenessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"nameOverride":"","nodeSelector":{},"readinessProbe":{"enabled":true,"failureThreshold":3,"initialDelaySeconds":60,"path":"/","periodSeconds":10,"successThreshold":1,"timeoutSeconds":2},"replicaCount":2,"resources":{"limits":{"cpu":1,"memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"runAsUser":101},"service":{"annotations":{},"port":80,"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":true,"name":"frontend-serviceaccount"},"tolerations":[]}` | config of the frontend | | frontend.env | list | `[{"name":"API_BASE_URL","value":""}]` | See https://docs.dependencytrack.org/getting-started/configuration/ for frontend ENV variables. | | global | object | `{"imageRegistry":"docker.io"}` | global configuration | | ingress | object | `{"annotations":{},"enabled":false,"host":"chart-example.local","tls":{"enabled":false,"secretName":""}}` | configuration of ingress | diff --git a/charts/dependency-track/templates/backend/deployment.yaml b/charts/dependency-track/templates/backend/deployment.yaml index 0e67354..33d245c 100644 --- a/charts/dependency-track/templates/backend/deployment.yaml +++ b/charts/dependency-track/templates/backend/deployment.yaml @@ -3,6 +3,9 @@ kind: Deployment metadata: name: {{ include "common.names.fullname" . }}-apiserver labels: {{- include "backend.labels.standard" . | nindent 4 }} + {{- with .Values.apiserver.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.apiserver.replicaCount }} {{- if .Values.apiserver.persistentVolume.enabled }} diff --git a/charts/dependency-track/templates/frontend/deployment.yaml b/charts/dependency-track/templates/frontend/deployment.yaml index 3c575bd..26095d2 100644 --- a/charts/dependency-track/templates/frontend/deployment.yaml +++ b/charts/dependency-track/templates/frontend/deployment.yaml @@ -3,6 +3,9 @@ kind: Deployment metadata: name: {{ include "common.names.fullname" . }}-frontend labels: {{- include "frontend.labels.standard" . | nindent 4 }} + {{- with .Values.frontend.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.frontend.replicaCount }} selector: diff --git a/charts/dependency-track/values.yaml b/charts/dependency-track/values.yaml index eecfae7..775ea77 100644 --- a/charts/dependency-track/values.yaml +++ b/charts/dependency-track/values.yaml @@ -12,6 +12,7 @@ global: # -- config of the frontend frontend: enabled: true + annotations: {} replicaCount: 2 image: repository: dependencytrack/frontend @@ -89,6 +90,7 @@ frontend: # -- config of the apiserver apiserver: enabled: true + annotations: {} # Max: 1 - DT is not designed for HA replicaCount: 1 image: