diff --git a/NOTICE b/NOTICE
index 93d839660a92e3db695259123f9d2bda1df10571..fb9c10e0cc09e3c71607b48a2bcab4f76546121a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -21,7 +21,7 @@ The following software have components provided under the terms of this license:
- cryptography (from https://github.com/pyca/cryptography)
- elasticsearch (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch-py, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
- elasticsearch-dsl (from https://github.com/elasticsearch/elasticsearch-dsl-py)
-- fastapi (from https://pypi.org/project/fastapi/0.104.1/, https://pypi.org/project/fastapi/0.86.0/)
+- fastapi (from https://pypi.org/project/fastapi/0.109.0/, https://pypi.org/project/fastapi/0.86.0/)
- google-api-core (from https://github.com/googleapis/python-api-core)
- google-auth (from https://github.com/GoogleCloudPlatform/google-auth-library-python, https://github.com/googleapis/google-auth-library-python)
- google-cloud-core (from https://github.com/googleapis/python-cloud-core)
@@ -66,7 +66,7 @@ The following software have components provided under the terms of this license:
- click (from https://palletsprojects.com/p/click/)
- cryptography (from https://github.com/pyca/cryptography)
- httpcore (from https://github.com/encode/httpcore, https://pypi.org/project/httpcore/0.18.0/, https://pypi.org/project/httpcore/1.0.2/)
-- httpx (from https://pypi.org/project/httpx/0.23.1/, https://pypi.org/project/httpx/0.25.2/)
+- httpx (from https://pypi.org/project/httpx/0.23.1/, https://pypi.org/project/httpx/0.26.0/)
- idna (from https://pypi.org/project/idna/3.4/, https://pypi.org/project/idna/3.6/)
- isodate (from http://cheeseshop.python.org/pypi/isodate, https://github.com/gweis/isodate/)
- jinja2
@@ -79,8 +79,8 @@ The following software have components provided under the terms of this license:
- python-dateutil (from https://github.com/dateutil/dateutil)
- python-dotenv (from https://github.com/theskumar/python-dotenv)
- sniffio (from https://github.com/python-trio/sniffio)
-- starlette (from https://pypi.org/project/starlette/0.22.0/, https://pypi.org/project/starlette/0.33.0/)
-- uvicorn (from https://github.com/tomchristie/uvicorn, https://pypi.org/project/uvicorn/0.24.0.post1/, https://www.uvicorn.org/)
+- starlette (from https://pypi.org/project/starlette/0.22.0/, https://pypi.org/project/starlette/0.35.1/)
+- uvicorn (from https://github.com/tomchristie/uvicorn, https://pypi.org/project/uvicorn/0.26.0/, https://www.uvicorn.org/)
========================================================================
ISC
@@ -97,8 +97,8 @@ The following software have components provided under the terms of this license:
- PyJWT (from http://github.com/jpadilla/pyjwt, https://github.com/jpadilla/pyjwt)
- PyYAML (from http://pyyaml.org/wiki/PyYAML)
- annotated-types (from https://pypi.org/project/annotated-types/0.5.0/, https://pypi.org/project/annotated-types/0.6.0/)
-- anyio (from https://pypi.org/project/anyio/3.3.0/, https://pypi.org/project/anyio/4.1.0/)
-- attrs (from https://attrs.readthedocs.io/, https://pypi.org/project/attrs/23.1.0/, https://www.attrs.org/)
+- anyio (from https://pypi.org/project/anyio/3.3.0/, https://pypi.org/project/anyio/4.2.0/)
+- attrs (from https://attrs.readthedocs.io/, https://pypi.org/project/attrs/23.2.0/, https://www.attrs.org/)
- azure-common (from https://github.com/Azure/azure-sdk-for-python)
- azure-core (from https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core)
- azure-identity (from https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity)
@@ -110,7 +110,7 @@ The following software have components provided under the terms of this license:
- charset-normalizer (from https://github.com/Ousret/charset_normalizer)
- coverage (from https://github.com/nedbat/coveragepy)
- exceptiongroup (from https://pypi.org/project/exceptiongroup/1.0.1/, https://pypi.org/project/exceptiongroup/1.2.0/)
-- fastapi (from https://pypi.org/project/fastapi/0.104.1/, https://pypi.org/project/fastapi/0.86.0/)
+- fastapi (from https://pypi.org/project/fastapi/0.109.0/, https://pypi.org/project/fastapi/0.86.0/)
- h11
- iniconfig (from http://github.com/RonnyPfannschmidt/iniconfig, https://pypi.org/project/iniconfig/2.0.0/)
- jmespath (from https://github.com/jmespath/jmespath.py)
@@ -119,7 +119,7 @@ The following software have components provided under the terms of this license:
- msal-extensions (from https://pypi.org/project/msal-extensions/1.0.0/)
- munch (from http://github.com/Infinidat/munch, https://github.com/Infinidat/munch)
- pluggy
-- pydantic (from https://github.com/samuelcolvin/pydantic, https://pypi.org/project/pydantic/2.5.2/)
+- pydantic (from https://github.com/samuelcolvin/pydantic, https://pypi.org/project/pydantic/2.5.3/)
- pydantic-core (from https://github.com/pydantic/pydantic-core)
- pyrsistent (from https://github.com/tobgu/pyrsistent/)
- pytest (from http://pytest.org, https://docs.pytest.org/en/latest/)
diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md
index 5cef8f877358a827c14a0a238727e7b6452fee59..5438ddbecfa31ca6ae93dd44f3c89fae02bf92ca 100644
--- a/devops/gc/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -34,6 +34,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
**global.domain** | your domain for the external endpoint, ex `example.com` | string | - | yes
**global.onPremEnabled** | whether baremetal is enabled | boolean | false | yes
**global.limitsEnabled** | whether CPU and memory limits are enabled | boolean | true | yes
+**global.dataPartitionId** | data partition id | string | - | yes
### Common variables
@@ -69,7 +70,6 @@ First you need to set variables in **values.yaml** file using any code editor. S
**conf.appName** | name of the app | string | policy | yes
**conf.configmap** | configmap to be used | string | policy-config | yes
**conf.bootstrapSecretName** | secret name for the bootstrap | string | "minio-bootstrap-secret" | yes
-**data.dataPartitionId** | data partition id | string | - | yes
**data.dataPartitionIdList** | list of secondary data partition ids in case of multipartition | string | - | yes
**conf.minDelaySeconds** | min delay for bundle download | num | 6 | yes
**conf.maxDelaySeconds** | max delay for bundle download | num | 12 | yes
diff --git a/devops/gc/deploy/templates/policy-configmap-bootstrap.yaml b/devops/gc/deploy/templates/policy-configmap-bootstrap.yaml
index ff6419c10aa961b382af9e7e0b45244b83bdbd39..ff9724613a6e7b8b3b4bd027c937d80aef8d591e 100644
--- a/devops/gc/deploy/templates/policy-configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/policy-configmap-bootstrap.yaml
@@ -7,6 +7,10 @@ metadata:
namespace: "{{ .Release.Namespace }}"
data:
POLICY_BUCKET: "{{ .Values.data.bucketName }}"
- DATA_PARTITION: "{{ .Values.data.dataPartitionId }}"
+ DATA_PARTITION: {{- if not .Values.global.onPremEnabled }}
+ {{ "system" }}
+ {{- else }}
+ {{ .Values.global.dataPartitionId | quote }}
+ {{- end }}
PARTITION_BASE_URL: {{ .Values.data.partitionHost | quote }}
ONPREM_ENABLED: "{{ .Values.global.onPremEnabled }}"
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index f7e9eb395deddf780083376d4ca10a7546eff7b0..6a29278852e6c371c9f3d433b664ab9dd45ef42b 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -3,6 +3,8 @@ global:
domain: ''
onPremEnabled: false
limitsEnabled: true
+ dataPartitionId: ""
+
data:
# Deployment resources
requestsCpu: 5m
@@ -22,7 +24,6 @@ data:
partitionHost: http://partition
bucketName: ''
useBundles: 'yes'
- dataPartitionId: ''
# baremetal only
minioHost: http://minio:9000
conf: