Update anthos and on-prem to baremetal (GONRG-7192)

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

app/bundles/providers/baremetal/README.md

 ## Baremetal Variables
 
-CLOUD_PROVIDER=anthos
+CLOUD_PROVIDER=baremetal
 
 ## MinIO Variables
 

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.*

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

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 |
 |------|-------------|------|---------|---------|

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 }}

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:

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

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

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.

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.*