Merge pull request #3588 from planetf1/issue3415

Release 2.2 - correct location of igc/atlas connectors in VDC chart
odpi · Sep 8, 2020 · e7502a5 · e7502a5
2 parents d41ccaa + a2df425
commit e7502a5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/...ata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/apache-atlas.yaml b/...ata-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/...tadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/configmap.yaml b/...tadata-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-hadoop-ecosystem-package
   {{ end }}
 
   {{ if or .Values.postgresql.enabled .Values.ranger.enabled }}

diff --git a/...metadata-resources/open-metadata-deployment/charts/odpi-egeria-vdc/templates/ibm-igc.yaml b/...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
@@ -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