diff --git a/app/README.md b/app/README.md
index 9c62883b7d7f3ac785818ee2435b1a499e1d436a..fe5d038a137daab1917a748d04b5ab5c039a31e4 100644
--- a/app/README.md
+++ b/app/README.md
@@ -36,7 +36,7 @@ Recently policy service was migrated from Flask to FastAPI, this was done in par
- A value of LOCAL will bypass using CSP and attempt to update OPA directly va `OPA_URL`. This is great for local development, testing, tiny environments (that don't have multiple OPA Pods), on-premise or for unsupported cloud environments.
Currently supported values of `CLOUD_PROVIDER`:
- * anthos
+ * baremetal
* aws
* azure
* gcp
diff --git a/app/bundles/providers/baremetal/README.md b/app/bundles/providers/baremetal/README.md
index b7ffb56984ba91f4808bc18ea36ed5965b293763..cfb490e6cb5938b6893695d81b6db96d69dc1246 100644
--- a/app/bundles/providers/baremetal/README.md
+++ b/app/bundles/providers/baremetal/README.md
@@ -1,6 +1,6 @@
## Baremetal Variables
-CLOUD_PROVIDER=anthos
+CLOUD_PROVIDER=baremetal
## MinIO Variables
diff --git a/app/requirements.txt b/app/requirements.txt
index bb2193c925adbe36d8d7f5fdd34cfe8403c7a405..27568a8f39c57e8b2adacd9a7cd909ac2e9099bc 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -40,4 +40,4 @@ google-cloud-storage
# osdu dependences
--extra-index-url https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
-osdu-api[all]~=0.21.0rc1, ==0.21.*
+osdu-api[all]~=0.22.0rc1, ==0.22.*
diff --git a/app/tests/baremetal/run-integration-tests.sh b/app/tests/baremetal/run-integration-tests.sh
index 39d09a81f1534b46dd30cf183b5babb5870a69c0..45bdedff2d40d362b009dc3ab59da60aa96da107 100644
--- a/app/tests/baremetal/run-integration-tests.sh
+++ b/app/tests/baremetal/run-integration-tests.sh
@@ -3,7 +3,6 @@ set -e
# move to the root of the repo
cd $CI_PROJECT_DIR
# prepare steps
-apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo pkgconfig py3-pip
pip install -r requirements.txt
pip install -r requirements_dev.txt
pip install wheel pytest pytest-cov
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index 33b3dce52147159e16c17d7c9831185076c0a712..54750573a0dd5ecf316e080567ea5a73eb7c1ea8 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -32,7 +32,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
**global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
-**global.onPremEnabled** | whether on-prem is enabled | boolean | false | yes
+**global.onPremEnabled** | whether baremetal is enabled | boolean | false | yes
### Common variables
@@ -53,7 +53,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
**data.useBundles** | use bundle or not | string | "yes" | yes
**data.legalHost** | Legal host | string | "http://legal" | yes
-### On-prem variables
+### Baremetal variables
| Name | Description | Type | Default |Required |
|------|-------------|------|---------|---------|
diff --git a/devops/gc/deploy/templates/policy-configmap.yaml b/devops/gc/deploy/templates/policy-configmap.yaml
index 3e1c0c829bd0e42a5aff4d36ebc664d3e9bc1e81..8e1d26f26bba60d63693abf6bf6d6c4f790221d8 100644
--- a/devops/gc/deploy/templates/policy-configmap.yaml
+++ b/devops/gc/deploy/templates/policy-configmap.yaml
@@ -16,6 +16,6 @@ data:
{{- if not .Values.global.onPremEnabled }}
CLOUD_PROVIDER: "gc"
{{- else }}
- CLOUD_PROVIDER: "anthos"
+ CLOUD_PROVIDER: "baremetal"
MINIO_ENDPOINT: "{{ .Values.data.minioHost }}"
{{- end }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 45800b396c78702e406ed019fb521e24e0e25241..5deaad866fc0cb2850e9fd230e73d15a332bf8c8 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -24,7 +24,7 @@ data:
dataPartitionId: ""
dataPartitionIdList: []
scopes: "https://www.googleapis.com/auth/devstorage.read_only"
- # on-prem only
+ # baremetal only
minioHost: "http://minio:9000"
conf:
diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index 118724247fdfd0c53ac789c0f1114c0102a3509a..72e942fa02bb2671be206fd8b480d0449b3f9975 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -33,10 +33,10 @@ gc-dev2-test-python:
PARTITION_BASE_URL: $HOST
gc-baremetal-test-python:
- image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
+ image: python:3.9
variables:
POLICY_BUCKET: $GC_POLICY_BUCKET
- CLOUD_PROVIDER: anthos
+ CLOUD_PROVIDER: baremetal
OPA_URL: $GC_OPA_URL
ENTITLEMENTS_BASE_URL: $HOST
LEGAL_BASE_URL: $HOST
diff --git a/docs/docs/install.md b/docs/docs/install.md
index 9e93f2c184157374673323a5f9473b46636b6533..92c68fbd5ccfc0dc16d306a11fc7bbf3fb62dae0 100644
--- a/docs/docs/install.md
+++ b/docs/docs/install.md
@@ -39,7 +39,7 @@ Legal service is needed to run some integration tests (directly to get legal tag
Currently supported values of `CLOUD_PROVIDER`:
-- anthos
+- baremetal
- aws
- azure
- gcp
diff --git a/requirements.txt b/requirements.txt
index dd9162e7e7bce6cd59739dfa48cfa5b42d63f639..8022796dc8ebbaa0ff88291d52cbf4922ad47508 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,4 +18,4 @@ google-cloud-storage
# osdu dependences
--extra-index-url https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
-osdu-api[all]~=0.21.0rc1, ==0.21.* # it will install a rc-version if there is no release one.
+osdu-api[all]~=0.22.0rc1, ==0.22.* # it will install a rc-version if there is no release one.
diff --git a/requirements_dev.txt b/requirements_dev.txt
index e0c246be3ab0a3c23189049cf54f349d465a35f6..548cdb22245592edff679ee79fe01eb51bd6a5c5 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -16,4 +16,4 @@ msal
# osdu dependences
--extra-index-url https://community.opengroup.org/api/v4/projects/148/packages/pypi/simple
-osdu-api[all]~=0.21.0rc1, ==0.21.*
+osdu-api[all]~=0.22.0rc1, ==0.22.*