diff --git a/charts/datahub/README.md b/charts/datahub/README.md index 6eb573e88..c07a9435a 100644 --- a/charts/datahub/README.md +++ b/charts/datahub/README.md @@ -159,12 +159,12 @@ helm install datahub datahub/datahub --values <> | mysqlSetupJob.password.secretRef | string | `"mysql-secrets"` | Secret that contains the mysqlSetupJob SQL password (overrides global value) | | mysqlSetupJob.password.secretKey | string | `"mysql-password"` | Secret key that contains the mysqlSetupJob SQL password (overrides global value) | | mysqlSetupJob.password.value | string | `"mysql-password"` | Alternative to using the secret above, uses raw string value for mysqlSetupJob SQL login (overrides global value) | -| mysqlSetupJob.image.registry | string | `"docker.io"` | Default image registry to be used by the job. | +| mysqlSetupJob.image.registry | string | `` | Image registry override to be used by the job. | | postgresqlSetupJob.username | string | `root` | SQL username for postgresqlSetupJob (overrides global value) | | postgresqlSetupJob.password.secretRef | string | `"mysql-secrets"` | Secret that contains the postgresqlSetupJob SQL password (overrides global value) | | postgresqlSetupJob.password.secretKey | string | `"mysql-password"` | Secret key that contains the postgresqlSetupJob SQL password (overrides global value) | | postgresqlSetupJob.password.value | string | `"mysql-password"` | Alternative to using the secret above, uses raw string value for postgresqlSetupJob SQL login (overrides global value) | -| postgresqlSetupJob.image.registry | string | `"docker.io"` | Default image registry to be used by the job. | +| postgresqlSetupJob.image.registry | string | `` | Image registry override to be used by the job. | | acryl-datahub-actions.ingestionSecretFiles.name | string | `""` | Name of the k8s secret that holds any secret files (e.g., SSL certificates and private keys) that are used in your ingestion recipes. The keys in the secret will be mounted as individual files under `/etc/datahub/ingestion-secret-files` | | acryl-datahub-actions.ingestionSecretFiles.defaultMode | string | `""` | The permission mode for the volume that mounts k8s secret under `/etc/datahub/ingestion-secret-files`, default value is 0444 which allows read access by owner, group, and other users | | global.credentialsAndCertsSecrets.name | string | `""` | Name of the secret that holds SSL certificates (keystores, truststores) | @@ -180,10 +180,10 @@ helm install datahub datahub/datahub --values <> | global.kafka.schemaregistry.glue.region | string | `""` | Region of the AWS Glue schema registry | | global.kafka.schemaregistry.glue.registry | string | `""` | Name of the AWS Glue schema registry | | datahub.metadata_service_authentication.enabled | bool | `true` | Whether Metadata Service Authentication is enabled. | -| elasticsearchSetupJob.image.registry | string | `docker.io` | Default image registry to be used by the job. | -| kafkaSetupJob.image.registry | string | `docker.io` | Default image registry to be used by the job. | -| datahubUpgrade.image.registry | string | `docker.io` | Default image registry to be used by the job. | -| datahubSystemUpdate.image.registry | string | `docker.io` | Default image registry to be used by the job. | +| elasticsearchSetupJob.image.registry | string | `` | Image registry override to be used by the job. | +| kafkaSetupJob.image.registry | string | `` | Image registry override to be used by the job. | +| datahubUpgrade.image.registry | string | `` | Image registry override to be used by the job. | +| datahubSystemUpdate.image.registry | string | `` | Image registry override to be used by the job. | | global.datahub.metadata_service_authentication.systemClientId | string | `"__datahub_system"` | The internal system id that is used to communicate with DataHub GMS. Required if metadata_service_authentication is 'true'. | | global.datahub.metadata_service_authentication.systemClientSecret.secretRef | string | `datahub-auth-secrets` | The reference to a secret containing the internal system secret that is used to communicate with DataHub GMS. If a secret reference is not provided, a random one will be generated for you in a Kubernetes secret called `datahub-auth-secrets`. | | global.datahub.metadata_service_authentication.systemClientSecret.secretKey | string | `system_client_secret` | The key of a secret containing the internal system secret that is used to communicate with DataHub GMS. If a secret reference is not provided, a random one will be generated for you in a Kubernetes secret value named `system_client_secret` within a secret named `datahub-auth-secrets`. | @@ -205,4 +205,4 @@ helm install datahub datahub/datahub --values <> | global.datahub.encryptionKey.provisionSecret.secretValues.encryptionKey | string | `` | The encryption key value to be used if specified directly. | | global.datahub.enable_retention | bool | `false` | Whether or not to enable retention on local DB | | global.sql.datasource.hostForpostgresqlClient | string | `""` | SQL database host (without port) when using postgresqlSetupJob | -| global.imageRegistry | string | `""` | Optional docker image registry to be used by all services. | +| global.imageRegistry | string | `"docker.io"` | Default docker image registry to be used by all services. | diff --git a/charts/datahub/subcharts/acryl-datahub-actions/README.md b/charts/datahub/subcharts/acryl-datahub-actions/README.md index e653d3678..65c1aa94d 100644 --- a/charts/datahub/subcharts/acryl-datahub-actions/README.md +++ b/charts/datahub/subcharts/acryl-datahub-actions/README.md @@ -19,7 +19,7 @@ Current chart version is `0.0.3` | image.args | list | `[]` | Override the image's args. Used to configure custom startup or shutdown behavior | | image.command | list | `[]` | Override the image's command. Used to configure custom startup or shutdown behavior | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.registry | string | `"docker.io"` | Optional configuration of image registry to be used. | +| image.registry | string | `` | Image registry override to be used by the job. | | image.repository | string | `"acryldata/datahub-actions"` | | | image.tag | string | `"v0.0.6"` | | | imagePullSecrets | list | `[]` | | diff --git a/charts/datahub/subcharts/acryl-datahub-actions/values.yaml b/charts/datahub/subcharts/acryl-datahub-actions/values.yaml index 34a1f4e2c..dc4ea10ed 100644 --- a/charts/datahub/subcharts/acryl-datahub-actions/values.yaml +++ b/charts/datahub/subcharts/acryl-datahub-actions/values.yaml @@ -4,7 +4,6 @@ replicaCount: 1 image: - registry: docker.io repository: acryldata/datahub-actions tag: "v0.0.1" pullPolicy: IfNotPresent @@ -88,7 +87,7 @@ debug: enabled: false global: - imageRegistry: "" + imageRegistry: "docker.io" kafka: bootstrap: diff --git a/charts/datahub/subcharts/datahub-frontend/README.md b/charts/datahub/subcharts/datahub-frontend/README.md index 0818e2dc1..954964645 100644 --- a/charts/datahub/subcharts/datahub-frontend/README.md +++ b/charts/datahub/subcharts/datahub-frontend/README.md @@ -24,7 +24,7 @@ Current chart version is `0.2.0` | image.args | list | `[]` | Override the image's args. Used to configure custom startup or shutdown behavior | | image.command | list | `[]` | Override the image's command. Used to configure custom startup or shutdown behavior | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.registry | string | `"docker.io"` | Optional configuration of image registry to be used. | +| image.registry | string | `` | Image registry override to be used by the job. | | image.repository | string | `"acryldata/datahub-frontend-react"` | | | image.tag | string | `"head"` | | | imagePullSecrets | list | `[]` | | diff --git a/charts/datahub/subcharts/datahub-frontend/values.yaml b/charts/datahub/subcharts/datahub-frontend/values.yaml index e9e97bf68..883780cd7 100644 --- a/charts/datahub/subcharts/datahub-frontend/values.yaml +++ b/charts/datahub/subcharts/datahub-frontend/values.yaml @@ -7,7 +7,6 @@ replicaCount: 1 revisionHistoryLimit: 10 image: - registry: docker.io repository: acryldata/datahub-frontend-react tag: pullPolicy: IfNotPresent @@ -181,7 +180,7 @@ datahub: buffer: size: "10MB" global: - imageRegistry: "" + imageRegistry: "docker.io" datahub_analytics_enabled: true diff --git a/charts/datahub/subcharts/datahub-gms/README.md b/charts/datahub/subcharts/datahub-gms/README.md index dff47a613..7446f16fd 100644 --- a/charts/datahub/subcharts/datahub-gms/README.md +++ b/charts/datahub/subcharts/datahub-gms/README.md @@ -43,7 +43,7 @@ Current chart version is `0.2.0` | image.args | list | `[]` | Override the image's args. Used to configure custom startup or shutdown behavior | | image.command | list | `[]` | Override the image's command. Used to configure custom startup or shutdown behavior | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.registry | string | `"docker.io"` | Optional configuration of image registry to be used. | +| image.registry | string | `` | Image registry override to be used by the job. | | image.repository | string | `"acryldata/datahub-gms"` | | | image.tag | string | `"head"` | | | imagePullSecrets | list | `[]` | | diff --git a/charts/datahub/subcharts/datahub-gms/values.yaml b/charts/datahub/subcharts/datahub-gms/values.yaml index 7714e8f9f..06858edb6 100644 --- a/charts/datahub/subcharts/datahub-gms/values.yaml +++ b/charts/datahub/subcharts/datahub-gms/values.yaml @@ -7,7 +7,6 @@ replicaCount: 1 revisionHistoryLimit: 10 image: - registry: docker.io repository: acryldata/datahub-gms pullPolicy: IfNotPresent tag: @@ -142,7 +141,7 @@ readinessProbe: #This section is useful if we are installing this chart separately for testing # helm install datahub-gms datahub-gms/ global: - imageRegistry: "" + imageRegistry: "docker.io" datahub_analytics_enabled: true graph_service_impl: elasticsearch diff --git a/charts/datahub/subcharts/datahub-ingestion-cron/README.md b/charts/datahub/subcharts/datahub-ingestion-cron/README.md index 3e4c93423..cc95233e7 100644 --- a/charts/datahub/subcharts/datahub-ingestion-cron/README.md +++ b/charts/datahub/subcharts/datahub-ingestion-cron/README.md @@ -7,7 +7,7 @@ A Helm chart for datahub's metadata-ingestion framework with kerberos authentica | Key | Type | Default | Description | |----------------------------------|---------|------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | -| image.registry | string | `"docker.io"` | Optional configuration of image registry to be used. | +| image.registry | string | `` | Image registry override to be used by the job. | | image.repository | string | `"acryldata/datahub-ingestion"` | DataHub Ingestion image repository | | image.tag | string | `"head"` | DataHub Ingestion image tag | | imagePullSecrets | array | `[]` (does not add image pull secrets to deployed pods) | Docker registry secret names as an array | diff --git a/charts/datahub/subcharts/datahub-ingestion-cron/values.yaml b/charts/datahub/subcharts/datahub-ingestion-cron/values.yaml index 942144788..0482a1f57 100644 --- a/charts/datahub/subcharts/datahub-ingestion-cron/values.yaml +++ b/charts/datahub/subcharts/datahub-ingestion-cron/values.yaml @@ -3,7 +3,6 @@ # Declare variables to be passed into your templates. image: - registry: docker.io repository: acryldata/datahub-ingestion tag: pullPolicy: IfNotPresent @@ -143,7 +142,7 @@ crons: {} #suspend: true global: - imageRegistry: "" + imageRegistry: "docker.io" datahub: version: head diff --git a/charts/datahub/subcharts/datahub-mae-consumer/README.md b/charts/datahub/subcharts/datahub-mae-consumer/README.md index cc2a4ddf4..c7164650e 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/README.md +++ b/charts/datahub/subcharts/datahub-mae-consumer/README.md @@ -37,7 +37,7 @@ Current chart version is `0.2.0` | image.args | list | `[]` | Override the image's args. Used to configure custom startup or shutdown behavior | | image.command | list | `[]` | Override the image's command. Used to configure custom startup or shutdown behavior | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.registry | string | `"docker.io"` | Optional configuration of image registry to be used. | +| image.registry | string | `` | Image registry override to be used by the job. | | image.repository | string | `"acryldata/datahub-mae-consumer"` | | | image.tag | string | `"head"` | | | imagePullSecrets | list | `[]` | | diff --git a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml index 8f5410598..49bf07e5d 100644 --- a/charts/datahub/subcharts/datahub-mae-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mae-consumer/values.yaml @@ -7,7 +7,6 @@ replicaCount: 1 revisionHistoryLimit: 10 image: - registry: docker.io repository: acryldata/datahub-mae-consumer pullPolicy: IfNotPresent tag: @@ -135,7 +134,7 @@ readinessProbe: failureThreshold: 8 global: - imageRegistry: "" + imageRegistry: "docker.io" graph_service_impl: elasticsearch datahub_analytics_enabled: true diff --git a/charts/datahub/subcharts/datahub-mce-consumer/README.md b/charts/datahub/subcharts/datahub-mce-consumer/README.md index be93b7d3b..5a6ec04a1 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/README.md +++ b/charts/datahub/subcharts/datahub-mce-consumer/README.md @@ -26,7 +26,7 @@ Current chart version is `0.2.0` | image.args | list | `[]` | Override the image's args. Used to configure custom startup or shutdown behavior | | image.command | list | `[]` | Override the image's command. Used to configure custom startup or shutdown behavior | | image.pullPolicy | string | `"IfNotPresent"` | | -| image.registry | string | `"docker.io"` | Optional configuration of image registry to be used. | +| image.registry | string | `` | Image registry override to be used by the job. | | image.repository | string | `"acryldata/datahub-mce-consumer"` | | | image.tag | string | `"head"` | | | imagePullSecrets | list | `[]` | | diff --git a/charts/datahub/subcharts/datahub-mce-consumer/values.yaml b/charts/datahub/subcharts/datahub-mce-consumer/values.yaml index 7d6038be5..359aa8172 100644 --- a/charts/datahub/subcharts/datahub-mce-consumer/values.yaml +++ b/charts/datahub/subcharts/datahub-mce-consumer/values.yaml @@ -7,7 +7,6 @@ replicaCount: 1 revisionHistoryLimit: 10 image: - registry: docker.io repository: acryldata/datahub-mce-consumer pullPolicy: IfNotPresent tag: @@ -136,7 +135,7 @@ readinessProbe: failureThreshold: 4 global: - imageRegistry: "" + imageRegistry: "docker.io" elasticsearch: host: "elasticsearch-master" diff --git a/charts/datahub/templates/_helpers.tpl b/charts/datahub/templates/_helpers.tpl index 7dc4c4e21..4cc884418 100644 --- a/charts/datahub/templates/_helpers.tpl +++ b/charts/datahub/templates/_helpers.tpl @@ -77,6 +77,6 @@ Return the appropriate apiVersion for cronjob. Create image registry, name and tag for a datahub component */}} {{- define "datahub.image" -}} -{{- $registry := .imageRegistry | default .image.registry -}} +{{- $registry := .image.registry | default .imageRegistry -}} {{ $registry }}/{{ .image.repository }}:{{ required "Global or specific tag is required" (.image.tag | default .version) -}} {{- end -}} diff --git a/charts/datahub/values.yaml b/charts/datahub/values.yaml index 75fccc604..3f1431697 100644 --- a/charts/datahub/values.yaml +++ b/charts/datahub/values.yaml @@ -123,7 +123,6 @@ datahub-ingestion-cron: elasticsearchSetupJob: enabled: true image: - registry: docker.io repository: acryldata/datahub-elasticsearch-setup # tag: "v0.11.0" # defaults to .global.datahub.version # Add custom command / arguments to this job. Useful if you need a custom startup or shutdown script @@ -162,7 +161,6 @@ elasticsearchSetupJob: kafkaSetupJob: enabled: true image: - registry: docker.io repository: acryldata/datahub-kafka-setup # tag: "v0.11.0" # defaults to .global.datahub.version # Add custom command / arguments to this job. Useful if you need a custom startup or shutdown script @@ -197,7 +195,6 @@ kafkaSetupJob: mysqlSetupJob: enabled: true image: - registry: docker.io repository: acryldata/datahub-mysql-setup # tag: "v0.11.0" # defaults to .global.datahub.version # Add custom command / arguments to this job. Useful if you need a custom startup or shutdown script @@ -237,7 +234,6 @@ mysqlSetupJob: postgresqlSetupJob: enabled: false image: - registry: docker.io repository: acryldata/datahub-postgres-setup # tag: "v0.11.0" # defaults to .global.datahub.version # Add custom command / arguments to this job. Useful if you need a custom startup or shutdown script @@ -282,7 +278,6 @@ postgresqlSetupJob: datahubUpgrade: enabled: true image: - registry: docker.io repository: acryldata/datahub-upgrade # tag: "v0.11.0" # defaults to .global.datahub.version batchSize: 1000 @@ -363,7 +358,6 @@ datahubUpgrade: ## Includes: Elasticsearch Indices Creation/Reindex (See global.elasticsearch.index for additional configuration) datahubSystemUpdate: image: - registry: docker.io repository: acryldata/datahub-upgrade # tag: # Add custom command / arguments to this job. Useful if you need a custom startup or shutdown script @@ -419,7 +413,7 @@ global: graph_service_impl: elasticsearch datahub_analytics_enabled: true datahub_standalone_consumers_enabled: false - imageRegistry: "" + imageRegistry: "docker.io" elasticsearch: host: "elasticsearch-master"