Revert to 0.1.2

charts/datahub/.helmignore

@@ -20,4 +20,5 @@
 .project
 .idea/
 *.tmproj
-.vscode/
+.vscode/
+charts/*.tgz

charts/datahub/Chart.yaml

@@ -4,13 +4,13 @@ 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.5
+version: 0.1.2
 # 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.8.5
+appVersion: latest #0.3.1
 dependencies:
   - name: datahub-gms
-    version: 0.2.2
+    version: 0.2.1
     repository: file://./subcharts/datahub-gms
     condition: datahub-gms.enabled
   - name: datahub-frontend
@@ -20,15 +20,15 @@ dependencies:
   - name: datahub-mae-consumer
     version: 0.2.1
     repository: file://./subcharts/datahub-mae-consumer
-    condition: global.datahub_standalone_consumers_enabled
+    condition: datahub-mae-consumer.enabled
   - name: datahub-mce-consumer
     version: 0.2.1
     repository: file://./subcharts/datahub-mce-consumer
-    condition: global.datahub_standalone_consumers_enabled
+    condition: datahub-mce-consumer.enabled
   - name: datahub-ingestion-cron
     version: 0.2.1
     repository: file://./subcharts/datahub-ingestion-cron
     condition: datahub-ingestion-cron.enabled
   - name: datahub-jmxexporter
     version: 0.2.1
-    repository: file://./subcharts/datahub-jmxexporter
+    repository: file://./subcharts/datahub-jmxexporter

charts/datahub/README.md

@@ -17,47 +17,46 @@ helm install datahub datahub/
 |-----|------|---------|-------------|
 | datahub-frontend.enabled | bool | `true` | Enable Datahub Front-end |
 | datahub-frontend.image.repository | string | `"linkedin/datahub-frontend-react"` | Image repository for datahub-frontend |
-| datahub-frontend.image.tag | string | `"v0.8.5"` | Image tag for datahub-frontend |
+| datahub-frontend.image.tag | string | `"latest"` | Image tag for datahub-frontend |
 | datahub-gms.enabled | bool | `true` | Enable GMS |
 | datahub-gms.image.repository | string | `"linkedin/datahub-gms"` | Image repository for datahub-gms |
-| datahub-gms.image.tag | string | `"v0.8.5"` | Image tag for datahub-gms |
+| datahub-gms.image.tag | string | `"latest"` | Image tag for datahub-gms |
 | datahub-mae-consumer.enabled | bool | `true` | Enable MAE Consumer |
 | datahub-mae-consumer.image.repository | string | `"linkedin/datahub-mae-consumer"` | Image repository for datahub-mae-consumer |
-| datahub-mae-consumer.image.tag | string | `"v0.8.5"` | Image tag for datahub-mae-consumer |
+| datahub-mae-consumer.image.tag | string | `"latest"` | Image tag for datahub-mae-consumer |
 | datahub-mce-consumer.enabled | bool | `true` | Enable MCE Consumer |
 | datahub-mce-consumer.image.repository | string | `"linkedin/datahub-mce-consumer"` | Image repository for datahub-mce-consumer |
-| datahub-mce-consumer.image.tag | string | `"v0.8.5"` | Image tag for datahub-mce-consumer |
+| datahub-mce-consumer.image.tag | string | `"latest"` | Image tag for datahub-mce-consumer |
 | datahub-ingestion-cron.enabled | bool | `false` | Enable cronjob for periodic ingestion |
 | 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.8.5"` | Image repository for elasticsearchSetupJob |
+| elasticsearchSetupJob.image.tag | string | `"latest"` | Image repository for elasticsearchSetupJob |
 | 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.8.5"` | Image repository for kafkaSetupJob |
+| kafkaSetupJob.image.tag | string | `"latest"` | Image repository for kafkaSetupJob |
 | mysqlSetupJob.enabled | bool | `false` | Enable setup job for mysql |
 | mysqlSetupJob.image.repository | string | `""` | Image repository for mysqlSetupJob |
 | mysqlSetupJob.image.tag | string | `""` | Image repository for mysqlSetupJob |
 | global.datahub_analytics_enabled | boolean | true | Enable datahub usage analytics |
 | global.datahub.appVersion | string | `"1.0"` | App version for annotation |
 | global.datahub.gms.port | string | `"8080"` | Port of GMS service |
-| global.elasticsearch.host | string | `"elasticsearch-master"` | Elasticsearch host name (endpoint) |
+| global.elasticsearch.host | string | `"elasticsearch"` | Elasticsearch host name (endpoint) |
 | global.elasticsearch.port | string | `"9200"` | Elasticsearch port |
-| global.kafka.bootstrap.server | string | `"prerequisites-broker:9092"` | Kafka bootstrap servers (with port) |
-| global.kafka.zookeeper.server | string | `"prerequisites-zookeeper:2181"` | Kafka zookeeper servers (with port) |
-| global.kafka.schemaregistry.url | string | `"http://prerequisites-cp-schema-registry:8081"` | URL to kafka schema registry |
-| global.neo4j.host | string | `"prerequisites-neo4j:7474"` | Neo4j host address (with port) |
-| global.neo4j.uri | string | `"bolt://prerequisites-neo4j"` | Neo4j URI |
+| global.kafka.bootstrap.server | string | `"broker:9092"` | Kafka bootstrap servers (with port) |
+| global.kafka.zookeeper.server | string | `"zookeeper:2181"` | Kafka zookeeper servers (with port) |
+| global.kafka.schemaregistry.url | string | `"http://schema-registry:8081"` | URL to kafka schema registry |
+| global.neo4j.host | string | `"neo4j:7474"` | Neo4j host address (with port) |
+| global.neo4j.uri | string | `"bolt://neo4j"` | Neo4j URI |
 | global.neo4j.username | string | `"neo4j"` | Neo4j user name |
 | global.neo4j.password.secretRef | string | `"neo4j-secrets"` | Secret that contains the Neo4j password |
 | global.neo4j.password.secretKey | string | `"neo4j-password"` | Secret key that contains the Neo4j password |
 | global.sql.datasource.driver | string | `"com.mysql.jdbc.Driver"` | Driver for the SQL database |
-| global.sql.datasource.host | string | `"prerequisites-mysql:3306"` | SQL database host (with port) |
-| global.sql.datasource.hostForMysqlClient | string | `"prerequisites-mysql"` | SQL database host (without port) |
-| global.sql.datasource.url | string | `"jdbc:mysql://prerequisites-mysql:3306/datahub?verifyServerCertificate=false\u0026useSSL=true"` | URL to access SQL database |
-| global.sql.datasource.username | string | `"root"` | SQL user name |
+| global.sql.datasource.host | string | `"mysql:3306"` | SQL database host (with port) |
+| global.sql.datasource.hostForMysqlClient | string | `"mysql"` | SQL database host (without port) |
+| global.sql.datasource.url | string | `"jdbc:mysql://mysql:3306/datahub?verifyServerCertificate=false\u0026useSSL=true"` | URL to access SQL database |
+| global.sql.datasource.username | string | `"datahub"` | SQL user name |
 | global.sql.datasource.password.secretRef | string | `"mysql-secrets"` | Secret that contains the MySQL password |
 | global.sql.datasource.password.secretKey | string | `"mysql-password"` | Secret key that contains the MySQL password |
-| global.graph_service_impl | string | `neo4j` | One of `neo4j` or `elasticsearch`. Determines which backend to use for the GMS graph service. Elastic is recommended for a simplified deployment. Neo4j will be the default for now to maintain backwards compatibility.
 
 ## Optional Chart Values
 

charts/datahub/quickstart-values.yaml

@@ -4,51 +4,61 @@ datahub-gms:
   enabled: true
   image:
     repository: linkedin/datahub-gms
-    tag: "v0.8.5"
+    tag: "latest"
 
 datahub-frontend:
   enabled: true
   image:
     repository: linkedin/datahub-frontend-react
-    tag: "v0.8.5"
+    tag: "latest"
   # Set up ingress to expose react front-end
   ingress:
     enabled: false
 
+datahub-mae-consumer:
+  enabled: true
+  image:
+    repository: linkedin/datahub-mae-consumer
+    tag: "latest"
+
+datahub-mce-consumer:
+  enabled: true
+  image:
+    repository: linkedin/datahub-mce-consumer
+    tag: "latest"
+
 elasticsearchSetupJob:
   enabled: true
   image:
     repository: linkedin/datahub-elasticsearch-setup
-    tag: "v0.8.5"
+    tag: "latest"
 
 kafkaSetupJob:
   enabled: true
   image:
     repository: linkedin/datahub-kafka-setup
-    tag: "v0.8.5"
+    tag: "latest"
 
 mysqlSetupJob:
   enabled: true
   image:
     repository: acryldata/datahub-mysql-setup
-    tag: "v0.8.5"
-
-datahubUpgrade:
-  enabled: true
-  image:
-    repository: acryldata/datahub-upgrade
-    tag: "v0.8.5"
+    tag: "latest"
 
 datahub-ingestion-cron:
   enabled: false
 
 global:
-  graph_service_impl: neo4j
-
   elasticsearch:
     host: "elasticsearch-master"
     port: "9200"
     indexPrefix: demo
+    useSSL: "true"
+    auth:
+      username: test
+      password:
+        secretRef: test
+        secretKey: test
 
   kafka:
     bootstrap:
@@ -71,7 +81,7 @@ global:
       host: "prerequisites-mysql:3306"
       hostForMysqlClient: "prerequisites-mysql"
       port: "3306"
-      url: "jdbc:mysql://prerequisites-mysql:3306/datahub?verifyServerCertificate=false&useSSL=true&useUnicode=yes&characterEncoding=UTF-8&enabledTLSProtocols=TLSv1.2"
+      url: "jdbc:mysql://prerequisites-mysql:3306/datahub?verifyServerCertificate=false&useSSL=true&useUnicode=yes&characterEncoding=UTF-8"
       driver: "com.mysql.jdbc.Driver"
       username: "root"
       password:
@@ -81,6 +91,4 @@ global:
   datahub:
     gms:
       port: "8080"
-    mae_consumer:
-      port: "9091"
     appVersion: "1.0"

charts/datahub/subcharts/datahub-frontend/README.md

@@ -20,7 +20,7 @@ Current chart version is `0.2.0`
 | global.datahub.gms.port | string | `"8080"` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"linkedin/datahub-frontend-react"` |  |
-| image.tag | string | `"v0.8.5"` |  |
+| image.tag | string | `"latest"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.enabled | bool | `false` |  |

charts/datahub/subcharts/datahub-frontend/templates/service.yaml

@@ -4,10 +4,6 @@ metadata:
   name: {{ include "datahub-frontend.fullname" . }}
   labels:
     {{- include "datahub-frontend.labels" . | nindent 4 }}
-  {{- with .Values.service.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/datahub/subcharts/datahub-frontend/values.yaml

@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: linkedin/datahub-frontend-react
-  tag: "v0.8.5"
+  tag: "latest"
   pullPolicy: Always
 
 imagePullSecrets: []
@@ -39,10 +39,6 @@ securityContext: {}
 service:
   type: LoadBalancer
   port: 9002
-  # Annotations to add to the service, this will help in adding 
-  # Internal load balancer or various other annotation support in AWS 
-  annotations: {}
-    # service.beta.kubernetes.io/aws-load-balancer-internal: "true"
 
 ingress:
   enabled: false

charts/datahub/subcharts/datahub-gms/Chart.yaml

@@ -14,7 +14,7 @@ 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.2
+version: 0.2.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

charts/datahub/subcharts/datahub-gms/README.md

@@ -36,10 +36,9 @@ Current chart version is `0.2.0`
 | global.sql.datasource.username | string | `"datahub"` |  |
 | global.sql.datasource.password.secretRef | string | `"mysql-secrets"` |  |
 | global.sql.datasource.password.secretKey | string | `"mysql-password"` |  |
-| global.graph_service_impl | string | `neo4j` | One of `neo4j` or `elasticsearch`. Determines which backend to use for the GMS graph service. Elastic is recommended for a simplified deployment. Neo4j will be the default for now to maintain backwards compatibility.
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"linkedin/datahub-gms"` |  |
-| image.tag | string | `"v0.8.5"` |  |
+| image.tag | string | `"latest"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
 | ingress.enabled | bool | `false` |  |

charts/datahub/subcharts/datahub-gms/templates/deployment.yaml

@@ -73,14 +73,6 @@ spec:
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
           env:
-            {{- if not .Values.global.datahub_standalone_consumers_enabled }}
-            - name: MCE_CONSUMER_ENABLED
-              value: "true"
-            - name: MAE_CONSUMER_ENABLED
-              value: "true"
-            {{- end }}
-            - name: DATAHUB_ANALYTICS_ENABLED
-              value: "{{ .Values.global.datahub_analytics_enabled }}"
             - name: EBEAN_DATASOURCE_USERNAME
               value: "{{ .Values.global.sql.datasource.username }}"
             - name: EBEAN_DATASOURCE_PASSWORD
@@ -115,9 +107,6 @@ spec:
                   name: "{{ .password.secretRef }}"
                   key: "{{ .password.secretKey }}"
             {{- end }}
-            - name: GRAPH_SERVICE_IMPL
-              value: {{ .Values.global.graph_service_impl }}
-            {{- if eq .Values.global.graph_service_impl "neo4j" }}
             - name: NEO4J_HOST
               value: "{{ .Values.global.neo4j.host }}"
             - name: NEO4J_URI
@@ -129,7 +118,6 @@ spec:
                 secretKeyRef:
                   name: "{{ .Values.global.neo4j.password.secretRef }}"
                   key: "{{ .Values.global.neo4j.password.secretKey }}"
-            {{- end }}
             {{- if .Values.global.springKafkaConfigurationOverrides }}
             {{- range $configName, $configValue := .Values.global.springKafkaConfigurationOverrides }}
             - name: SPRING_KAFKA_PROPERTIES_{{ $configName | replace "." "_" | upper }}