merged from master, resolved conflicts.

charts/helm-config.yaml

@@ -29,24 +29,6 @@ global:
     admin: #{ADMIN_EMAIL}#
     sslServer: https://acme-v02.api.letsencrypt.org/directory  # Production
 
-<<<<<<< HEAD
-  ################################################################################
-  # Specify the Gitlab branch being used for image creation
-  # ie: community.opengroup.org:5555/osdu/platform/system/storage/{{ .Values.global.branch }}/storage:latest
-  #
-  image:
-    repository: ${ENV_REGISTRY}
-    branch: ${BRANCH}
-    tag: ${TAG}
-
-  ################################################################################
-  # Specify the istio specific values
-  # based64 encoded username and password
-  #
-  istio:
-    username: ${ISTIO_USERNAME}
-    password: ${ISTIO_PASSWORD}
-=======
 ################################################################################
 # Specify the istio specific values
 # based64 encoded username and password
@@ -54,4 +36,3 @@ global:
 istio:
   username: #{istio-username}#
   password: #{istio-password}#
->>>>>>> master