Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
Security and Compliance
entitlements
Commits
f61a49de
Commit
f61a49de
authored
Feb 03, 2021
by
Mingyang Zhu
Browse files
make domain configurable
parent
427f57a5
Pipeline
#24939
passed with stages
in 36 minutes and 23 seconds
Changes
5
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
devops/azure/chart/helm-config.yaml
View file @
f61a49de
...
@@ -16,3 +16,6 @@ image:
...
@@ -16,3 +16,6 @@ image:
server
:
server
:
servlet
:
servlet
:
contextPath
:
/api/entitlements/v2
contextPath
:
/api/entitlements/v2
config
:
domain
:
#{DOMAIN}#
\ No newline at end of file
devops/azure/chart/templates/deployment.yaml
View file @
f61a49de
...
@@ -73,5 +73,7 @@ spec:
...
@@ -73,5 +73,7 @@ spec:
value
:
http://partition/api/partition/v1
value
:
http://partition/api/partition/v1
-
name
:
cosmosdb_database
-
name
:
cosmosdb_database
value
:
osdu-db
value
:
osdu-db
-
name
:
service_domain_name
value
:
{{
.Values.config.domain
}}
-
name
:
azure_istioauth_enabled
-
name
:
azure_istioauth_enabled
value
:
"
true"
value
:
"
true"
\ No newline at end of file
devops/azure/chart/values.yaml
View file @
f61a49de
...
@@ -23,3 +23,6 @@ image:
...
@@ -23,3 +23,6 @@ image:
server
:
server
:
servlet
:
servlet
:
contextPath
:
/api/entitlements/v2
contextPath
:
/api/entitlements/v2
config
:
domain
:
contoso.com
provider/entitlements-v2-azure/README.md
View file @
f61a49de
...
@@ -44,6 +44,7 @@ with these settings service expects "x-payload" header which contains Base64 enc
...
@@ -44,6 +44,7 @@ with these settings service expects "x-payload" header which contains Base64 enc
name | value | description | sensitive? | source |
name | value | description | sensitive? | source |
| --- | --- | --- | --- | --- |
| --- | --- | --- | --- | --- |
|
`azure_istioauth_enabled`
|
`true`
| Flag to Disable AAD auth | no | -- |
|
`azure_istioauth_enabled`
|
`true`
| Flag to Disable AAD auth | no | -- |
|
`service_domain_name`
| ex
`contoso.com`
| The name of the domain for which the service will run | no | output of infrastructure deployment |
**Required to run integration tests**
**Required to run integration tests**
...
...
provider/entitlements-v2-azure/src/main/resources/application.properties
View file @
f61a49de
...
@@ -43,4 +43,4 @@ app.graph.db.sslEnabled=true
...
@@ -43,4 +43,4 @@ app.graph.db.sslEnabled=true
# App configuration
# App configuration
app.projectId
=
evd-ddl-us-services
app.projectId
=
evd-ddl-us-services
app.domain
=
contoso.com
app.domain
=
${service_domain_name}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment