From 81e069cb2f57d6b1864e90ae27d7f1ac2d517e8c Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Tue, 8 Sep 2020 16:56:37 +0100 Subject: [PATCH 1/2] #3415 correction of external connector versions Signed-off-by: Nigel Jones --- .../charts/odpi-egeria-vdc/templates/apache-atlas.yaml | 9 +++++---- .../charts/odpi-egeria-vdc/templates/configmap.yaml | 4 +++- .../charts/odpi-egeria-vdc/templates/ibm-igc.yaml | 8 ++++---- .../charts/odpi-egeria-vdc/values.yaml | 2 ++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/apache-atlas.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/apache-atlas.yaml index 4052a931313..cd5d75807ff 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/apache-atlas.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/apache-atlas.yaml @@ -86,10 +86,11 @@ spec: - "-c" - > cd /opt/egeria/connectors && - wget ${EGERIA_ARTIFACTORY_RELEASE}/${ATLAS_CONNECTOR_URL_PATH}/${EGERIA_VERSION}/egeria-connector-apache-atlas-package-${EGERIA_VERSION}-jar-with-dependencies.jar && touch RELEASE; - if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_STAGING}/${ATLAS_CONNECTOR_URL_PATH}/${EGERIA_VERSION}/egeria-connector-apache-atlas-package-${EGERIA_VERSION}-jar-with-dependencies.jar && touch STAGING; fi; - if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${ATLAS_CONNECTOR_URL_PATH}/${EGERIA_VERSION}/egeria-connector-apache-atlas-package-${EGERIA_VERSION}-jar-with-dependencies.jar && touch SNAPSHOT; fi; - if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${ATLAS_CONNECTOR_URL_PATH}/${EGERIA_VERSION}-SNAPSHOT/egeria-connector-apache-atlas-package-${EGERIA_VERSION}-SNAPSHOT-jar-with-dependencies.jar && touch SNAPSHOT; fi + wget ${EGERIA_ARTIFACTORY_RELEASE}/${ATLAS_CONNECTOR_URL_PATH}/${ATLAS_CONNECTOR_VERSION}/egeria-connector-hadoop-ecosystem-package-${ATLAS_CONNECTOR_VERSION}-jar-with-dependencies.jar && touch RELEASE; + + if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_STAGING}/${ATLAS_CONNECTOR_URL_PATH}/${ATLAS_CONNECTOR_VERSION}/egeria-connector-hadoop-ecosystem-package-${ATLAS_CONNECTOR_VERSION}-jar-with-dependencies.jar && touch STAGING; fi; + if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${ATLAS_CONNECTOR_URL_PATH}/${ATLAS_CONNECTOR_VERSION}/egeria-connector-hadoop-ecosystem-package-${ATLAS_CONNECTOR_VERSION}-jar-with-dependencies.jar && touch SNAPSHOT; fi; + if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${ATLAS_CONNECTOR_URL_PATH}/${ATLAS_CONNECTOR_VERSION}-SNAPSHOT/egeria-connector-atlas-package-${ATLAS_CONNECTOR_VERSION}-SNAPSHOT-jar-with-dependencies.jar && touch SNAPSHOT; fi volumeMounts: - mountPath: /opt/egeria/connectors name: egeria-connector-volume diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml index 793a8858f82..994a5fbf1d8 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml @@ -24,6 +24,8 @@ data: EGERIA_ARTIFACTORY_STAGING: https://odpi.jfrog.io/odpi/egeria-staging-local EGERIA_ARTIFACTORY_SNAPSHOT: https://odpi.jfrog.io/odpi/egeria-snapshot-local EGERIA_VERSION: "{{ .Values.egeria.version }}" + ATLAS_CONNECTOR_VERSION: "{{ .Values.atlas.connectorversion }}" + IBM_CONNECTOR_VERSION: "{{ .Values.ibmigc.connectorversion }}" {{ if .Values.kafka.internal.enabled }} KAFKA_ENDPOINT: {{ .Release.Name }}-egeriakafka:9092 @@ -43,7 +45,7 @@ data: ATLAS_USER: {{ .Values.atlas.user }} ATLAS_PASS: {{ .Values.atlas.password }} ATLAS_KAFKA_ENDPOINT: {{ include "myapp.fullname" . }}-atlas-service:9027 - ATLAS_CONNECTOR_URL_PATH: org/odpi/egeria/egeria-connector-apache-atlas-package + ATLAS_CONNECTOR_URL_PATH: org/odpi/egeria/egeria-connector-apache-atlas-adapter {{ end }} {{ if or .Values.postgresql.enabled .Values.ranger.enabled }} diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/ibm-igc.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/ibm-igc.yaml index 513300403c0..f78bf0fe610 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/ibm-igc.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/ibm-igc.yaml @@ -116,10 +116,10 @@ spec: - "-c" - > cd /opt/egeria/connectors && - wget ${EGERIA_ARTIFACTORY_RELEASE}/${IBMIGC_CONNECTOR_URL_PATH}/${EGERIA_VERSION}/egeria-connector-ibm-information-server-package-${EGERIA_VERSION}-jar-with-dependencies.jar && touch RELEASE; - if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_STAGING}/${IBMIGC_CONNECTOR_URL_PATH}/${EGERIA_VERSION}/egeria-connector-ibm-information-server-package-${EGERIA_VERSION}-jar-with-dependencies.jar && touch STAGING; fi; - if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${IBMIGC_CONNECTOR_URL_PATH}/${EGERIA_VERSION}/egeria-connector-ibm-information-server-package-${EGERIA_VERSION}-jar-with-dependencies.jar && touch SNAPSHOT; fi; - if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${IBMIGC_CONNECTOR_URL_PATH}/${EGERIA_VERSION}-SNAPSHOT/egeria-connector-ibm-information-server-package-${EGERIA_VERSION}-SNAPSHOT-jar-with-dependencies.jar && touch SNAPSHOT; fi + wget ${EGERIA_ARTIFACTORY_RELEASE}/${IBMIGC_CONNECTOR_URL_PATH}/${IBM_CONNECTOR_VERSION}/egeria-connector-ibm-information-server-package-${IBM_CONNECTOR_VERSION}-jar-with-dependencies.jar && touch RELEASE; + if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_STAGING}/${IBMIGC_CONNECTOR_URL_PATH}/${IBM_CONNECTOR_VERSION}/egeria-connector-ibm-information-server-package-${IBM_CONNECTOR_VERSION}-jar-with-dependencies.jar && touch STAGING; fi; + if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${IBMIGC_CONNECTOR_URL_PATH}/${IBM_CONNECTOR_VERSION}/egeria-connector-ibm-information-server-package-${IBM_CONNECTOR_VERSION}-jar-with-dependencies.jar && touch SNAPSHOT; fi; + if [ $? -ne 0 ]; then wget ${EGERIA_ARTIFACTORY_SNAPSHOT}/${IBMIGC_CONNECTOR_URL_PATH}/${IBM_CONNECTOR_VERSION}-SNAPSHOT/egeria-connector-ibm-information-server-package-${IBM_CONNECTOR_VERSION}-SNAPSHOT-jar-with-dependencies.jar && touch SNAPSHOT; fi volumeMounts: - mountPath: /opt/egeria/connectors name: egeria-igc-connector-volume diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/values.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/values.yaml index af2c8ab68c6..318c03a6650 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/values.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/values.yaml @@ -87,6 +87,7 @@ atlas: user: admin password: admin proxyserver: apacheatlas + connectorversion: 2.1 gaian: enabled: true @@ -201,6 +202,7 @@ kafka: # Set external to "true" to use a pre-existing IBM IGC environment (outside your k8s cluster), # in which case, also provide the hostname, IP address and port number for the domain tier ibmigc: + connectorversion: 2.1 enabled: false user: isadmin password: isadmin From a2df425d01610141a6e2185a65a0c6cf0b170f66 Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Tue, 8 Sep 2020 16:45:29 +0000 Subject: [PATCH 2/2] #3415 corrected path for atlas connector Signed-off-by: Nigel Jones --- .../charts/odpi-egeria-vdc/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml index 994a5fbf1d8..7f03eef7edd 100644 --- a/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml +++ b/open-metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml @@ -45,7 +45,7 @@ data: ATLAS_USER: {{ .Values.atlas.user }} ATLAS_PASS: {{ .Values.atlas.password }} ATLAS_KAFKA_ENDPOINT: {{ include "myapp.fullname" . }}-atlas-service:9027 - ATLAS_CONNECTOR_URL_PATH: org/odpi/egeria/egeria-connector-apache-atlas-adapter + ATLAS_CONNECTOR_URL_PATH: org/odpi/egeria/egeria-connector-hadoop-ecosystem-package {{ end }} {{ if or .Values.postgresql.enabled .Values.ranger.enabled }}