From e527eb1318b7149e0b4b239becfe1f91fb3f6248 Mon Sep 17 00:00:00 2001 From: wslulciuc Date: Mon, 11 Apr 2022 11:25:40 -0700 Subject: [PATCH 1/2] Add pod annotation support for Marquez Signed-off-by: wslulciuc --- chart/README.md | 37 +++++++++++++------------ chart/templates/marquez/deployment.yaml | 10 +++++-- chart/values.yaml | 4 +++ 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/chart/README.md b/chart/README.md index 1e810f06f6..afe461d155 100644 --- a/chart/README.md +++ b/chart/README.md @@ -45,25 +45,26 @@ helm delete marquez ### [Marquez](https://github.com/MarquezProject/marquez) **parameters** -| Parameter | Description | Default | -|------------------------------|----------------------------------|--------------------------| -| `marquez.replicaCount` | Number of desired replicas | `1` | -| `marquez.image.registry` | Marquez image registry | `docker.io` | -| `marquez.image.repository` | Marquez image repository | `marquezproject/marquez` | -| `marquez.image.tag` | Marquez image tag | `0.15.0` | -| `marquez.image.pullPolicy` | Image pull policy | `IfNotPresent` | +| Parameter | Description | Default | +|------------------------------|----------------------------------------|--------------------------| +| `marquez.replicaCount` | Number of desired replicas | `1` | +| `marquez.image.registry` | Marquez image registry | `docker.io` | +| `marquez.image.repository` | Marquez image repository | `marquezproject/marquez` | +| `marquez.image.tag` | Marquez image tag | `0.15.0` | +| `marquez.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `marquez.existingSecretName` | Name of an existing secret containing db password ('marquez-db-password' key) | `nil` | -| `marquez.db.host` | PostgreSQL host | `localhost` | -| `marquez.db.port` | PostgreSQL port | `5432` | -| `marquez.db.name` | PostgreSQL database | `marquez` | -| `marquez.db.user` | PostgreSQL user | `buendia` | -| `marquez.db.password` | PostgreSQL password | `macondo` | -| `marquez.migrateOnStartup` | Execute Flyway migration | `true` | -| `marquez.hostname` | Marquez hostname | `localhost` | -| `marquez.port` | API host port | `5000` | -| `marquez.adminPort` | Heath/Liveness host port | `5001` | -| `marquez.resources.limits` | K8s resource limit overrides | `nil` | -| `marquez.resources.requests` | K8s resource requests overrides | `nil` | +| `marquez.db.host` | PostgreSQL host | `localhost` | +| `marquez.db.port` | PostgreSQL port | `5432` | +| `marquez.db.name` | PostgreSQL database | `marquez` | +| `marquez.db.user` | PostgreSQL user | `buendia` | +| `marquez.db.password` | PostgreSQL password | `macondo` | +| `marquez.migrateOnStartup` | Execute Flyway migration | `true` | +| `marquez.hostname` | Marquez hostname | `localhost` | +| `marquez.port` | API host port | `5000` | +| `marquez.adminPort` | Heath/Liveness host port | `5001` | +| `marquez.resources.limits` | K8s resource limit overrides | `nil` | +| `marquez.resources.requests` | K8s resource requests overrides | `nil` | +| `marquez.podAnnotations` | Additional pod annotations for Marquez | `{}` | ### [Marquez Web UI](https://github.com/MarquezProject/marquez-web) **parameters** diff --git a/chart/templates/marquez/deployment.yaml b/chart/templates/marquez/deployment.yaml index 9da6b73f16..3c9aa45a54 100644 --- a/chart/templates/marquez/deployment.yaml +++ b/chart/templates/marquez/deployment.yaml @@ -7,9 +7,13 @@ metadata: {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} app.kubernetes.io/component: marquez - {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} - {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} + {{- end }} + {{- range $key, $value := .Values.marquez.podAnnotations }} + {{ $key }}: {{ include "common.tplvalues.render" (dict "value" $value "context" $) | quote }} + {{- end }} spec: selector: matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} diff --git a/chart/values.yaml b/chart/values.yaml index 3edc5f7d16..4613390ecf 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -55,6 +55,10 @@ marquez: requests: {} # memory: 256Mi # cpu: 250m + podAnnotations: {} + ## - name: + ## value: + ## ## Properties related to Marquez frontend functionality ## From 7fff558c73c9df89413c77fe9b575762df4e7d09 Mon Sep 17 00:00:00 2001 From: wslulciuc Date: Mon, 11 Apr 2022 11:31:06 -0700 Subject: [PATCH 2/2] Update changelog Signed-off-by: wslulciuc --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03cbe8e2cf..9f48f9dd8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ ### Added -* Add support for `LifecycleStateChangeFacet` with an ability to softly delete datasets. +* Add support for `LifecycleStateChangeFacet` with an ability to softly delete datasets [@pawel-big-lebowski](https://github.com/pawel-big-lebowski) +* Enable pod specific annotations in Marquez Helm Chart via `marquez.podAnnotations` [@wslulciuc](https://github.com/wslulciuc) ## [0.21.0](https://github.com/MarquezProject/marquez/compare/0.20.0...0.21.0) - 2022-03-03