Skip to content
Snippets Groups Projects
Commit 2da5a7fb authored by Oleksandr Kosse (EPAM)'s avatar Oleksandr Kosse (EPAM)
Browse files

Merge branch 'GONRG-5890-Change-to-GC' into 'master'

GONRG-5890-Change-to-GC

See merge request !289
parents 28599339 df613f16
No related branches found
No related tags found
1 merge request!289GONRG-5890-Change-to-GC
Pipeline #145074 failed
......@@ -6,8 +6,8 @@ The Partition service is responsible for creating and retrieving partition speci
Instructions for running the AWS implementation locally can be found [here](./provider/partition-aws/README.md)
## Running Locally - Azure
Instructions for running the Azure implementation locally can be found [here](./provider/partition-azure/README.md)
## Running Locally - GCP
Instructions for running the GCP implementation locally can be found [here](./provider/partition-gcp/README.md)
## Running Locally - Google Cloud
Instructions for running the Google Cloud implementation locally can be found [here](./provider/partition-gcp/README.md)
## Running Locally - IBM
## Running Integration Tests
......
......@@ -99,16 +99,16 @@ First you need to set variables in **values.yaml** file using any code editor. S
**logLevel** | logging level | string | INFO | yes
**springProfilesActive** | active spring profile | string | gcp | yes
### GCP variables
### Google Cloud variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**projectId** | your GCP project ID | string | -| yes
**projectId** | your Google Cloud project ID | string | -| yes
**partitionAdminAccounts** | admin account of partition | string | - | yes
**googleAudiences** | your GCP client ID | string | - | yes
**googleAudiences** | your Google Cloud client ID | string | - | yes
**serviceAccountTail** | ending of your service account | string | .iam.gserviceaccount.com | yes
> googleAudiences: If you are connected to GCP console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command:
> googleAudiences: If you are connected to Google Cloud console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command:
```console
cat ~/.config/gcloud/application_default_credentials.json | grep client_id
......
......@@ -98,17 +98,17 @@ First you need to set variables in **values.yaml** file using any code editor. S
|------|-------------|------|---------|---------|
**logLevel** | logging level | string | INFO | yes
**springProfilesActive** | active spring profile | string | gcp | yes
**projectId** | your GCP project id | string | - | yes
**dataProjectId** | data GCP project id (for pipelines) | string | - | no
**projectId** | your Google Cloud project id | string | - | yes
**dataProjectId** | data Google Cloud project id (for pipelines) | string | - | no
**partitionAdminAccounts** | admin accounts validated by partition service | string | - | yes
**googleAudiences** | your GCP client id | string | - | yes
**serviceAccountTail** | ending of GCP service account | string | .iam.gserviceaccount.com | yes
**googleAudiences** | your Google Cloud client id | string | - | yes
**serviceAccountTail** | ending of Google Cloud service account | string | .iam.gserviceaccount.com | yes
**partitionName** | partition host | string | partition | yes
**dataPartitionId** | data partition id | string | - | yes
**datafierSa** | datafier service account | string | datafier | yes
**minioExternalEndpoint** | api url for external minio, if external minio is configured - this value will be set for MINIO_ENDPOINT and FILE_MINIO_ENDPOINT in bootstrap configmap | string | - | no
> googleAudiences: If you are logged in to GCP console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command:
> googleAudiences: If you are logged in to Google Cloud console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command:
```console
cat ~/.config/gcloud/application_default_credentials.json | grep client_id
......
......@@ -35,8 +35,8 @@ Pre-requisites
### Anthos Service Configuration:
[Anthos service configuration ](docs/anthos/README.md)
### GCP Service Configuration:
[Gcp service configuration ](docs/gcp/README.md)
### Google Cloud Service Configuration:
[Google Cloud service configuration ](docs/gcp/README.md)
### Run Locally
......@@ -125,8 +125,8 @@ This section describes how to run cloud OSDU E2E tests.
### Anthos test configuration:
[Anthos service configuration ](docs/anthos/README.md)
### GCP test configuration:
[Gcp service configuration ](docs/gcp/README.md)
### Google Cloud test configuration:
[Google Cloud service configuration ](docs/gcp/README.md)
## Deployment
Partition Service is compatible with App Engine Flexible Environment and Cloud Run.
......
## Service Configuration for GCP
## Service Configuration for Google Cloud
## Environment variables:
......@@ -8,7 +8,7 @@ Must have:
| name | value | description | sensitive? | source |
| --- | --- | --- | --- | --- |
| `SPRING_PROFILES_ACTIVE` | ex `gcp` | Spring profile that activate default configuration for GCP environment | false | - |
| `SPRING_PROFILES_ACTIVE` | ex `gcp` | Spring profile that activate default configuration for Google Cloud environment | false | - |
| `PARTITION_ADMIN_ACCOUNTS` | ex `user` | Elasticsearch user, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service | yes | - |
| `GOOGLE_CLOUD_PROJECT` | ex `password` | Elasticsearch password, name of that variable not defined at the service level, the name will be received through partition service. Each tenant can have it's own ENV name value, and it must be present in ENV of Indexer service | false | - |
......@@ -29,7 +29,7 @@ Usage of spring profiles is preferred.
| `OSMDRIVER` | ex `postgres` or `datastore` | Osm driver mode that defines which storage will be used | no | - |
| `ENVIRONMENT` | `gcp` or `anthos` | If `anthos` then authorization is disabled | no | - |
## Google cloud service account configuration :
## Google Cloud service account configuration :
TBD
| Required roles |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment