Skip to content

Commit

Permalink
feat: enable sidecar configuration (#276)
Browse files Browse the repository at this point in the history
* feat: enable sidecar configuration
  • Loading branch information
matthijsvanderloos authored and Indy Prentice committed Jun 9, 2023
1 parent 89e93d4 commit 18e902e
Show file tree
Hide file tree
Showing 35 changed files with 156 additions and 22 deletions.
14 changes: 7 additions & 7 deletions charts/datahub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@ description: A Helm chart for LinkedIn DataHub
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.163
version: 0.2.164
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 0.10.2
dependencies:
- name: datahub-gms
version: 0.2.146
version: 0.2.147
repository: file://./subcharts/datahub-gms
condition: datahub-gms.enabled
- name: datahub-frontend
version: 0.2.136
version: 0.2.137
repository: file://./subcharts/datahub-frontend
condition: datahub-frontend.enabled
- name: datahub-mae-consumer
version: 0.2.142
version: 0.2.143
repository: file://./subcharts/datahub-mae-consumer
condition: global.datahub_standalone_consumers_enabled
- name: datahub-mce-consumer
version: 0.2.144
version: 0.2.145
repository: file://./subcharts/datahub-mce-consumer
condition: global.datahub_standalone_consumers_enabled
- name: datahub-ingestion-cron
version: 0.2.131
version: 0.2.132
repository: file://./subcharts/datahub-ingestion-cron
condition: datahub-ingestion-cron.enabled
- name: acryl-datahub-actions
version: 0.2.135
version: 0.2.136
repository: file://./subcharts/acryl-datahub-actions
condition: acryl-datahub-actions.enabled
maintainers:
Expand Down
6 changes: 6 additions & 0 deletions charts/datahub/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| datahubUpgrade.securityContext | object | `{}` | Container security context for datahubUpgrade jobs |
| datahubUpgrade.podAnnotations | object | `{}` | Pod annotations for datahubUpgrade jobs |
| datahubUpgrade.restoreIndices.resources | object | '{}' | Kube Resource definitions for the datahub upgrade job 'restore indices' |
| datahubUpgrade.restoreIndices.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| elasticsearchSetupJob.enabled | bool | `true` | Enable setup job for elasicsearch |
| elasticsearchSetupJob.image.repository | string | `"linkedin/datahub-elasticsearch-setup"` | Image repository for elasticsearchSetupJob |
| elasticsearchSetupJob.image.tag | string | `"v0.10.0"` | Image repository for elasticsearchSetupJob |
Expand All @@ -47,6 +48,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| elasticsearchSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for elasticsearchSetupJob |
| elasticsearchSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for elasticsearchSetupJob |
| elasticsearchSetupJob.podAnnotations | object | `{}` | Pod annotations for elasticsearchSetupJob |
| elasticsearchSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| kafkaSetupJob.enabled | bool | `true` | Enable setup job for kafka |
| kafkaSetupJob.image.repository | string | `"linkedin/datahub-kafka-setup"` | Image repository for kafkaSetupJob |
| kafkaSetupJob.image.tag | string | `"v0.10.0"` | Image repository for kafkaSetupJob |
Expand All @@ -55,6 +57,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| kafkaSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for kafkaSetupJob |
| kafkaSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for kafkaSetupJob |
| kafkaSetupJob.podAnnotations | object | `{}` | Pod annotations for kafkaSetupJob |
| kafkaSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| mysqlSetupJob.enabled | bool | `false` | Enable setup job for mysql |
| mysqlSetupJob.image.repository | string | `"acryldata/datahub-mysql-setup"` | Image repository for mysqlSetupJob |
| mysqlSetupJob.image.tag | string | `"v0.10.0"` | Image repository for mysqlSetupJob |
Expand All @@ -63,6 +66,7 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| mysqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob |
| mysqlSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for mysqlSetupJob |
| mysqlSetupJob.podAnnotations | object | `{}` | Pod annotations for mysqlSetupJob |
| mysqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| postgresqlSetupJob.enabled | bool | `false` | Enable setup job for postgresql |
| postgresqlSetupJob.image.repository | string | `"acryldata/datahub-postgres-setup"` | Image repository for postgresqlSetupJob |
| postgresqlSetupJob.image.tag | string | `"v0.10.0"` | Image repository for postgresqlSetupJob |
Expand All @@ -71,6 +75,8 @@ helm install datahub datahub/datahub --values <<path-to-values-file>>
| postgresqlSetupJob.podSecurityContext | object | `{"fsGroup": 1000}` | Pod security context for mysqlSetupJob |
| postgresqlSetupJob.securityContext | object | `{"runAsUser": 1000}` | Container security context for mysqlSetupJob |
| postgresqlSetupJob.podAnnotations | object | `{}` | Pod annotations for mysqlSetupJob |
| postgresqlSetupJob.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| datahubSystemUpdate.extraSidecars | list | `[]` | Add additional sidecar containers to the job pod |
| global.strict_mode | boolean | true | Enables validations in helm charts to ensure features work as expected. Recommended NOT TO CHANGE. |
| global.datahub_standalone_consumers_enabled | boolean | true | Enable standalone consumers for kafka |
| global.datahub_analytics_enabled | boolean | true | Enable datahub usage analytics |
Expand Down
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/acryl-datahub-actions/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.135
version: 0.2.136
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 0.0.11
1 change: 1 addition & 0 deletions charts/datahub/subcharts/acryl-datahub-actions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Current chart version is `0.0.3`
| exporters.jmx.enabled | boolean | false | |
| extraLabels | object | `{}` | Extra labels for deployment configuration |
| extraEnvs | Extra [environment variables][] which will be appended to the `env:` definition for the container | `[]` |
| extraSidecars | list | `[]` | Add additional sidecar containers to the deployment pod(s) |
| extraVolumes | Templatable string of additional `volumes` to be passed to the `tpl` function | "" |
| extraVolumeMounts | Templatable string of additional `volumeMounts` to be passed to the `tpl` function | "" |
| fullnameOverride | string | `"acryl-datahub-actions"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
name: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretRef }}
key: {{ .Values.global.datahub.metadata_service_authentication.systemClientSecret.secretKey }}
{{- end }}
{{- if .Values.extraEnvs }}
{{- if .Values.extraEnvs }}
{{ toYaml .Values.extraEnvs | nindent 12 }}
{{- end }}
volumeMounts:
Expand All @@ -139,7 +139,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}

{{- with .Values.extraSidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/datahub/subcharts/acryl-datahub-actions/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ extraVolumeMounts: []

extraInitContainers: []

# Add extra sidecar containers to deployment pod
extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

resources: {}

nodeSelector: {}
Expand Down
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/datahub-frontend/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.136
version: 0.2.137
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v0.10.0
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-frontend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Current chart version is `0.2.0`
| exporters.jmx.enabled | boolean | false | |
| extraLabels | object | `{}` | Extra labels for deployment configuration |
| extraEnvs | Extra [environment variables][] which will be appended to the `env:` definition for the container | `[]` |
| extraSidecars | list | `[]` | Add additional sidecar containers to the deployment pod(s) |
| extraVolumes | Templatable string of additional `volumes` to be passed to the `tpl` function | "" |
| extraVolumeMounts | Templatable string of additional `volumeMounts` to be passed to the `tpl` function | "" |
| fullnameOverride | string | `"datahub-frontend"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}

{{- with .Values.extraSidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/datahub/subcharts/datahub-frontend/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ extraVolumeMounts: []

extraInitContainers: []

# Add extra sidecar containers to deployment pod
extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

lifecycle: {}
# To add a new user to datahub in JAAS config without mounting the user.props file
# postStart:
Expand Down
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/datahub-gms/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description: A Helm chart for LinkedIn DataHub's datahub-gms component
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.146
version: 0.2.147
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v0.10.0
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-gms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Current chart version is `0.2.0`
| affinity | object | `{}` | |
| extraLabels | object | `{}` | Extra labels for deployment configuration |
| extraEnvs | Extra [environment variables][] which will be appended to the `env:` definition for the container | `[]` |
| extraSidecars | list | `[]` | Add additional sidecar containers to the deployment pod(s) |
| extraVolumes | Templatable string of additional `volumes` to be passed to the `tpl` function | "" |
| extraVolumeMounts | Templatable string of additional `volumeMounts` to be passed to the `tpl` function | "" |
| fullnameOverride | string | `"datahub-gms-deployment"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}

{{- with .Values.extraSidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/datahub/subcharts/datahub-gms/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,12 @@ extraVolumeMounts: []

extraInitContainers: []

# Add extra sidecar containers to deployment pod
extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/datahub-ingestion-cron/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.131
version: 0.2.132
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v0.10.0
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-ingestion-cron/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ A Helm chart for datahub's metadata-ingestion framework with kerberos authentica
| crons.extraInitContainers | object | `{}` | Init containers to add to the cronjob container |
| crons.serviceAccountName | string | | Service account name used for the cronjob container |
| crons.podAnnotations | object | `{}` | Annotations to add to the pods |
| extraSidecars | list | `[]` | Add additional sidecar containers to the deployment pod(s) |
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ spec:
schedule: {{ default "0 0 * * *" .schedule | quote}}
jobTemplate:
spec:
template:
template:
{{- with $val.podAnnotations }}
metadata:
annotations:
{{- toYaml . | nindent 12 }}
{{- toYaml . | nindent 12 }}
{{- end }}
spec:
{{- with $.Values.imagePullSecrets }}
Expand Down Expand Up @@ -68,5 +68,8 @@ spec:
{{- if .extraVolumes }}
{{- toYaml .extraVolumes | nindent 12 }}
{{- end }}
{{- if .extraSidecars }}
{{- toYaml .extraSidecars | nindent 10 }}
{{- end }}
---
{{- end }}
{{- end }}
14 changes: 14 additions & 0 deletions charts/datahub/subcharts/datahub-ingestion-cron/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,27 @@ crons: {}
##
#extraInitContainers: {}

## Add extra sidecar containers to job pod
##
# extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

## If you want to specify your own service account, set its name like so.
##
#serviceAccountName: "my-cron-service"

## Add your own pod annotations.
##
#podAnnotations: {}

# Add extra sidecar containers to deployment pod
extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

global:
datahub:
version: head
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/datahub-mae-consumer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.142
version: 0.2.143
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v0.10.0
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-mae-consumer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Current chart version is `0.2.0`
| exporters.jmx.enabled | boolean | false | |
| extraLabels | object | `{}` | Extra labels for deployment configuration |
| extraEnvs | Extra [environment variables][] which will be appended to the `env:` definition for the container | `[]` |
| extraSidecars | list | `[]` | Add additional sidecar containers to the deployment pod(s) |
| extraVolumes | Templatable string of additional `volumes` to be passed to the `tpl` function | "" |
| extraVolumeMounts | Templatable string of additional `volumeMounts` to be passed to the `tpl` function | "" |
| fullnameOverride | string | `"datahub-mae-consumer"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}

{{- with .Values.extraSidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/datahub/subcharts/datahub-mae-consumer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ extraVolumeMounts: []

extraInitContainers: []

# Add extra sidecar containers to deployment pod
extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down
2 changes: 1 addition & 1 deletion charts/datahub/subcharts/datahub-mce-consumer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.2.144
version: 0.2.145
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: v0.10.0
1 change: 1 addition & 0 deletions charts/datahub/subcharts/datahub-mce-consumer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Current chart version is `0.2.0`
| exporters.jmx.enabled | boolean | false | |
| extraLabels | object | `{}` | Extra labels for deployment configuration |
| extraEnvs | Extra [environment variables][] which will be appended to the `env:` definition for the container | `[]` |
| extraSidecars | list | `[]` | Add additional sidecar containers to the deployment pod(s) |
| extraVolumes | Templatable string of additional `volumes` to be passed to the `tpl` function | "" |
| extraVolumeMounts | Templatable string of additional `volumeMounts` to be passed to the `tpl` function | "" |
| fullnameOverride | string | `""` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.resources | nindent 12 }}

{{- with .Values.extraSidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/datahub/subcharts/datahub-mce-consumer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ extraVolumeMounts: []

extraInitContainers: []

# Add extra sidecar containers to deployment pod
extraSidecars: []
# - name: my-image-name
# image: my-image
# imagePullPolicy: Always

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ spec:
requests:
cpu: 300m
memory: 256Mi
{{- with .Values.datahubUpgrade.cleanupJob.extraSidecars }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.datahubUpgrade.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 12 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ spec:
requests:
cpu: 300m
memory: 256Mi
{{- with .Values.datahubUpgrade.extraSidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.datahubUpgrade.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 12 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ spec:
{{- end }}
resources:
{{- toYaml .Values.datahubUpgrade.restoreIndices.resources | nindent 16}}
{{- with .Values.datahubUpgrade.restoreIndices.extraSidecars }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.datahubUpgrade.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 12 }}
Expand Down
Loading

0 comments on commit 18e902e

Please sign in to comment.