Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
Legal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSDU
OSDU Data Platform
Security and Compliance
Legal
Commits
724b362f
Commit
724b362f
authored
3 years ago
by
Mikhail Piatliou (EPAM)
Committed by
Oleksandr Kosse (EPAM)
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Migrate legal to gke [GONRG-2786]
parent
a8a3a850
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!138
Lock down maven
,
!134
Migrate legal to gke [GONRG-2786]
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+12
-20
12 additions, 20 deletions
.gitlab-ci.yml
devops/gcp/configmap/values.yaml
+3
-3
3 additions, 3 deletions
devops/gcp/configmap/values.yaml
with
15 additions
and
23 deletions
.gitlab-ci.yml
+
12
−
20
View file @
724b362f
...
...
@@ -13,11 +13,11 @@ variables:
OSDU_GCP_SERVICE
:
legal
OSDU_GCP_VENDOR
:
gcp
OSDU_GCP_
APPLICATION_NAME
:
os-legal
OSDU_GCP_
ENV_VARS
:
ENABLE_FULL_BUCKET_NAME=$ENABLE_FULL_BUCKET_NAME,PROJECT_ID=$OSDU_GCP_PROJECT,AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_V2_URL,AUDIENCES=$GOOGLE_AUDIENCE,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,
RE
D
IS
_GROUP_HOST=$REDIS_GROUP_HOST,REDIS_STORAGE_HOST=$REDIS_STORAGE_HOST,LEGAL_HOSTNAME=$OSDU_GCP_LEGAL_HOSTNAME --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
OSDU_GCP_
TEST_SUBDIR
:
testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
OSDU_GCP_HELM_
PACKAGE_CHARTS
:
"
devops/gcp/deploy
devops/gcp/configmap"
OSDU_GCP_
HELM_CONFIG_SERVICE_VARS
:
"
--set
data.project_id=$OSDU_GCP_PROJECT
--set
data.authorize_api=$OSDU_GCP_AUTHORIZE_API
--set
data.google_audiences=$GOOGLE_AUDIENCE
--set
data.redis_group_host=$REDIS_GROUP_HOST
--set
data.redis_storage_host=$REDIS_STORAGE_HOST
--set
data.partition_api=$OSDU_GCP_PARTITION_API
--set
data.log_level=INFO
--set
enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME"
OSDU_GCP_
HELM_DEPLOYMENT_SERVICE_VARS
:
"
--set
data.image=$CI_
RE
G
IS
TRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA
--set
data.serviceAccountName=workload-identity-legal
--set
data.limits_cpu=1.5
--set
data.limits_memory=512M"
OSDU_GCP_
HELM_CONFIG_SERVICE
:
legal-config
OSDU_GCP_HELM_
DEPLOYMENT_SERVICE
:
legal-deploy
IBM_BUILD_SUBDIR
:
provider/legal-ibm
IBM_INT_TEST_SUBDIR
:
testing/legal-test-ibm
...
...
@@ -30,7 +30,7 @@ include:
file
:
"
standard-setup.yml"
-
project
:
"
osdu/platform/ci-cd-pipelines"
file
:
"
build/maven.yml"
file
:
"
build/maven.yml"
-
project
:
"
osdu/platform/ci-cd-pipelines"
file
:
"
scanners/fossa.yml"
...
...
@@ -47,19 +47,11 @@ include:
-
project
:
"
osdu/platform/ci-cd-pipelines"
file
:
"
cloud-providers/azure.yml"
-
project
:
'
osdu/platform/ci-cd-pipelines'
ref
:
"
master"
file
:
'
cloud-providers/osdu-gcp-cloudrun.yml'
-
project
:
'
osdu/platform/ci-cd-pipelines'
ref
:
"
master"
file
:
'
cloud-providers/gcp.yml'
-
project
:
"
osdu/platform/ci-cd-pipelines"
file
:
"
cloud-providers/osdu-gcp-gke.yml"
-
project
:
'
osdu/platform/ci-cd-pipelines'
ref
:
"
master"
file
:
'
publishing/pages.yml'
compile-and-unit-test
:
variables
:
GOOGLE_CLOUD_PROJECT
:
opendes-evt
-
project
:
"
osdu/platform/ci-cd-pipelines"
file
:
"
cloud-providers/gcp.yml"
-
project
:
"
osdu/platform/ci-cd-pipelines"
file
:
"
publishing/pages.yml"
This diff is collapsed.
Click to expand it.
devops/gcp/configmap/values.yaml
+
3
−
3
View file @
724b362f
...
...
@@ -3,9 +3,9 @@
# Declare variables to be passed into your templates.
data
:
authorize_api
:
"
http://entitlements.default.svc.cluster.local/api/entitlements/v2
"
partition_api
:
"
http://partition.default.svc.cluster.local/api/partition/v1
"
log_level
:
"
INFO
"
authorize_api
:
"
"
partition_api
:
"
"
log_level
:
"
"
enable_full_bucket_name
:
"
true"
project_id
:
"
"
google_audiences
:
"
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment