diff --git a/devops/gcp/deploy/README.md b/devops/gcp/deploy/README.md index 25867b55f1a6cef87a646acb36c25e39abc324fa..2ca3caf169a3544d280488f926f261b9f6462458 100644 --- a/devops/gcp/deploy/README.md +++ b/devops/gcp/deploy/README.md @@ -41,7 +41,6 @@ First you need to set variables in **values.yaml** file using any code editor. S **redisGroupHost** | Redis host for groups | string | `redis-group-master` | yes **redisStorageHost** | Redis host for storage | string | `redis-storage-master` | yes **googleAudiences** | Client ID of Google Cloud Credentials, ex `123-abc123.apps.googleusercontent.com` | string | - | yes -**opaEnabled** | whether OPA is enabled | boolean | true | yes **opaEndpoint** | OPA host address | string | `http://opa` | yes **storageHost** | Storage service host address | string | `http://storage` | only if `conf.bootstrapEnabled` is true **defaultLegalTag** | Name of the previously created legal tag (without partition part) | string | `default-data-tag` | only if `conf.bootstrapEnabled` is true diff --git a/devops/gcp/deploy/templates/configmap.yaml b/devops/gcp/deploy/templates/configmap.yaml index a317d9ccfa578aad9d76425a250019cd49115d21..6f2fdf6688f73ed2ff21fd51380dd128083f0b4b 100644 --- a/devops/gcp/deploy/templates/configmap.yaml +++ b/devops/gcp/deploy/templates/configmap.yaml @@ -16,7 +16,6 @@ data: REDIS_STORAGE_HOST: {{ .Values.data.redisStorageHost | quote }} STORAGE_SERVICE_ACCOUNT_EMAIL: {{ .Values.data.storageServiceAccountEmail | quote }} SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }} - OPA_ENABLED: {{ .Values.data.opaEnabled | quote }} OPA_ENDPOINT: {{ .Values.data.opaEndpoint | quote }} {{- if not .Values.conf.onPremEnabled }} GOOGLE_AUDIENCES: {{ .Values.data.googleAudiences | quote }} diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index a0a4fd947e83d683deb69e7f41653912f5fdd928..b93f4b05610fbc6cc61a17b335e820d9744a3a2f 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -15,7 +15,6 @@ data: redisGroupHost: "redis-group-master" redisStorageHost: "redis-storage-master" googleAudiences: "" - opaEnabled: true opaEndpoint: "http://opa" storageHost: "http://storage" defaultLegalTag: "default-data-tag" diff --git a/provider/storage-gcp/src/main/resources/application.properties b/provider/storage-gcp/src/main/resources/application.properties index 11093090a1d5eb614654d92b782bd506dacd3397..493082a7500373b0ca20e19250a305a9fd88e56f 100644 --- a/provider/storage-gcp/src/main/resources/application.properties +++ b/provider/storage-gcp/src/main/resources/application.properties @@ -15,7 +15,7 @@ osdu.spring.config.enableEncodedSpecialCharacters=true service.policy.enabled=true opa.opa-endpoint=${OPA_ENDPOINT:notused} -opa.enabled=${OPA_ENABLED:false} +opa.enabled=true legal-tags-changed-topic-name=legaltags_changed legal-tags-changed-subscription-name=storage-oqm-legaltags-changed pubsub-search-topic=records-changed