diff --git a/devops/gc/bootstrap_legalstatus_update/update_legal_status.sh b/devops/gc/bootstrap_legalstatus_update/update_legal_status.sh index 54827b990e41ecc1430fe3fef313fa55e331eb89..f75979cbbb93511e3d9c0f8277c8373ab24ee035 100644 --- a/devops/gc/bootstrap_legalstatus_update/update_legal_status.sh +++ b/devops/gc/bootstrap_legalstatus_update/update_legal_status.sh @@ -20,28 +20,13 @@ ## Common: # - LEGAL_HOST # - DATA_PARTITION_ID -## Baremetal: -# - OPENID_PROVIDER_URL -# - OPENID_PROVIDER_CLIENT_ID -# - OPENID_PROVIDER_CLIENT_SECRET set -ex get_token() { - if [ "${ONPREM_ENABLED}" == "true" ]; then - # id token - TOKEN="$(curl --location --silent --globoff --request POST "${OPENID_PROVIDER_URL}/protocol/openid-connect/token" \ - --header "Content-Type: application/x-www-form-urlencoded" \ - --data-urlencode "grant_type=client_credentials" \ - --data-urlencode "scope=openid" \ - --data-urlencode "client_id=${OPENID_PROVIDER_CLIENT_ID}" \ - --data-urlencode "client_secret=${OPENID_PROVIDER_CLIENT_SECRET}" | jq -r ".id_token")" - export TOKEN - else # access token TOKEN="$(gcloud auth print-access-token)" export TOKEN - fi } update_legal_status() { @@ -66,11 +51,6 @@ update_legal_status() { # Check variables source ./validate-env.sh "PARTITION_HOST" source ./validate-env.sh "LEGAL_HOST" -if [[ "${ONPREM_ENABLED}" == "true" ]]; then - source ./validate-env.sh "OPENID_PROVIDER_URL" - source ./validate-env.sh "OPENID_PROVIDER_CLIENT_ID" - source ./validate-env.sh "OPENID_PROVIDER_CLIENT_SECRET" -fi # Get list of partitions status_code=$(curl --location --request GET \ diff --git a/devops/gc/deploy/README.md b/devops/gc/deploy/README.md index 2b2edca5a89f12763d4572bd28065ba1b0c9cc0b..7a48242509e2b580f514b332fb3a2a06258a9e7c 100644 --- a/devops/gc/deploy/README.md +++ b/devops/gc/deploy/README.md @@ -97,7 +97,6 @@ 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.limitsEnabled** | whether CPU and memory limits are enabled | boolean | `true` | yes **global.logLevel** | severity of logging level | string | `ERROR` | yes **global.tier** | Only PROD must be used to enable autoscaling | string | "" | no diff --git a/devops/gc/deploy/templates/legal-status-update-configmap.yaml b/devops/gc/deploy/templates/legal-status-update-configmap.yaml index 45c783e6e83c0652a13294372c9d7f8ae4ccf725..cbbab92737ccae739f5445cdca5dd78dc22ac4f4 100644 --- a/devops/gc/deploy/templates/legal-status-update-configmap.yaml +++ b/devops/gc/deploy/templates/legal-status-update-configmap.yaml @@ -6,4 +6,3 @@ metadata: data: LEGAL_HOST: {{ .Values.data.legalHost | quote }} PARTITION_HOST: {{ .Values.data.partitionHost | quote }} - ONPREM_ENABLED: {{ .Values.global.onPremEnabled | quote }} diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml index d69c5964d097ea7a414031f765d1128d7b2c8af8..28309cb99754975a0a6f4064d92f8451a69f4222 100644 --- a/devops/gc/deploy/values.yaml +++ b/devops/gc/deploy/values.yaml @@ -4,7 +4,6 @@ global: domain: "" - onPremEnabled: false limitsEnabled: true logLevel: "ERROR" tier: ""