Commit 0d3fb3a5 authored by Hema Vishnu Pola [Microsoft]'s avatar Hema Vishnu Pola [Microsoft]
Browse files

merged from master, resolved conflicts.

parent 5a746447
......@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment