diff --git a/.env.c2 b/.env.c2 index cf0cbd74f..146ec660a 100644 --- a/.env.c2 +++ b/.env.c2 @@ -1,3 +1,4 @@ export AZURE_CLIENT_ID=8186a108-135d-478e-af97-e200cb238757 export OAUTH2_REDIS_QA_HOSTNAME=radix-c2-qa.redis.cache.windows.net export OAUTH2_REDIS_PROD_HOSTNAME=radix-c2-prod.redis.cache.windows.net +export ACTIVE_ENVIRONMENT=prod diff --git a/.env.dev b/.env.dev index 3f2ac4373..c290a393d 100644 --- a/.env.dev +++ b/.env.dev @@ -1,3 +1,4 @@ export AZURE_CLIENT_ID=5687b237-eda3-4ec3-a2a1-023e85a2bd84 export OAUTH2_REDIS_QA_HOSTNAME=radix-dev-qa.redis.cache.windows.net export OAUTH2_REDIS_PROD_HOSTNAME=radix-dev-prod.redis.cache.windows.net +export ACTIVE_ENVIRONMENT=qa diff --git a/.env.platform b/.env.platform index 449f27353..2d75196af 100644 --- a/.env.platform +++ b/.env.platform @@ -1,3 +1,5 @@ export AZURE_CLIENT_ID=a593a59c-8f76-490e-937b-a90779039a90 export OAUTH2_REDIS_QA_HOSTNAME=radix-platform-qa.redis.cache.windows.net export OAUTH2_REDIS_PROD_HOSTNAME=radix-platform-prod.redis.cache.windows.net +export DNS_NAME=radix.equinor.com +export ACTIVE_ENVIRONMENT=prod diff --git a/.env.playground b/.env.playground index 517f3f811..3f28fa480 100644 --- a/.env.playground +++ b/.env.playground @@ -1,3 +1,4 @@ export AZURE_CLIENT_ID=a593a59c-8f76-490e-937b-a90779039a90 export OAUTH2_REDIS_QA_HOSTNAME=radix-playground-qa.redis.cache.windows.net export OAUTH2_REDIS_PROD_HOSTNAME=radix-playground-prod.redis.cache.windows.net +export ACTIVE_ENVIRONMENT=prod diff --git a/proxy/server.conf b/proxy/server.conf index 1b0adde41..6927f9f55 100644 --- a/proxy/server.conf +++ b/proxy/server.conf @@ -11,13 +11,13 @@ server { location /api/ { proxy_pass https://server-radix-api-${RADIX_ENVIRONMENT}.${RADIX_CLUSTERNAME}.${RADIX_DNS_ZONE}; - proxy_set_header Authorization "Bearer $http_x_forwarded_access_token"; + proxy_set_header Authorization "Bearer $http_x_auth_request_access_token"; proxy_set_header x-forwarded-access-token ""; } location /cost-api/ { proxy_pass https://server-radix-cost-allocation-api-${RADIX_ENVIRONMENT}.${RADIX_CLUSTERNAME}.${RADIX_DNS_ZONE}/api/v1/; - proxy_set_header Authorization "Bearer $http_x_forwarded_access_token"; + proxy_set_header Authorization "Bearer $http_x_auth_request_access_token"; proxy_set_header x-forwarded-access-token ""; } @@ -27,13 +27,13 @@ server { location /log-api/ { proxy_pass https://server-radix-log-api-${RADIX_ENVIRONMENT}.${RADIX_CLUSTERNAME}.${RADIX_DNS_ZONE}/api/v1/; - proxy_set_header Authorization "Bearer $http_x_forwarded_access_token"; + proxy_set_header Authorization "Bearer $http_x_auth_request_access_token"; proxy_set_header x-forwarded-access-token ""; } location /scan-api/ { proxy_pass https://server-radix-vulnerability-scanner-api-${RADIX_ENVIRONMENT}.${RADIX_CLUSTERNAME}.${RADIX_DNS_ZONE}/api/v1/; - proxy_set_header Authorization "Bearer $http_x_forwarded_access_token"; + proxy_set_header Authorization "Bearer $http_x_auth_request_access_token"; proxy_set_header x-forwarded-access-token ""; } diff --git a/radixconfig.c2.yaml b/radixconfig.c2.yaml index c88fbfc40..66e5c65c0 100644 --- a/radixconfig.c2.yaml +++ b/radixconfig.c2.yaml @@ -5,6 +5,10 @@ metadata: spec: build: useBuildKit: true + dnsAlias: + - alias: "console" + component: web + environment: "prod" environments: - name: qa build: @@ -58,9 +62,20 @@ spec: setAuthorizationHeader: true sessionStoreType: redis redisStore: - connectionUrl: rediss://radix-c2-qa.redis.cache.windows.net:6380 + connectionUrl: rediss://radix-c2-prod.redis.cache.windows.net:6380 environmentConfig: - environment: qa + authentication: + oauth2: + redisStore: + connectionUrl: rediss://radix-c2-qa.redis.cache.windows.net:6380 + resources: + requests: + cpu: "20m" + memory: "50Mi" + limits: + cpu: "50m" + memory: "50Mi" horizontalScaling: maxReplicas: 1 minReplicas: 0 diff --git a/radixconfig.dev.yaml b/radixconfig.dev.yaml index cd1ac25f4..6aa73e569 100644 --- a/radixconfig.dev.yaml +++ b/radixconfig.dev.yaml @@ -5,6 +5,10 @@ metadata: spec: build: useBuildKit: true + dnsAlias: + - alias: "console" + component: web + environment: "qa" environments: - name: qa build: @@ -58,9 +62,20 @@ spec: setAuthorizationHeader: true sessionStoreType: redis redisStore: - connectionUrl: rediss://radix-dev-qa.redis.cache.windows.net:6380 + connectionUrl: rediss://radix-dev-prod.redis.cache.windows.net:6380 environmentConfig: - environment: qa + authentication: + oauth2: + redisStore: + connectionUrl: rediss://radix-dev-qa.redis.cache.windows.net:6380 + resources: + requests: + cpu: "20m" + memory: "50Mi" + limits: + cpu: "50m" + memory: "50Mi" horizontalScaling: maxReplicas: 1 minReplicas: 0 diff --git a/radixconfig.platform.yaml b/radixconfig.platform.yaml index a05222ad6..70880b46d 100644 --- a/radixconfig.platform.yaml +++ b/radixconfig.platform.yaml @@ -5,6 +5,10 @@ metadata: spec: build: useBuildKit: true + dnsAlias: + - alias: "console" + component: web + environment: "prod" environments: - name: qa build: @@ -58,9 +62,20 @@ spec: setAuthorizationHeader: true sessionStoreType: redis redisStore: - connectionUrl: rediss://radix-platform-qa.redis.cache.windows.net:6380 + connectionUrl: rediss://radix-platform-prod.redis.cache.windows.net:6380 environmentConfig: - environment: qa + authentication: + oauth2: + redisStore: + connectionUrl: rediss://radix-platform-qa.redis.cache.windows.net:6380 + resources: + requests: + cpu: "20m" + memory: "50Mi" + limits: + cpu: "50m" + memory: "50Mi" horizontalScaling: maxReplicas: 1 minReplicas: 0 diff --git a/radixconfig.playground.yaml b/radixconfig.playground.yaml index 94cd9901f..7faa648a0 100644 --- a/radixconfig.playground.yaml +++ b/radixconfig.playground.yaml @@ -5,6 +5,10 @@ metadata: spec: build: useBuildKit: true + dnsAlias: + - alias: "console" + component: web + environment: "prod" environments: - name: qa build: @@ -58,9 +62,20 @@ spec: setAuthorizationHeader: true sessionStoreType: redis redisStore: - connectionUrl: rediss://radix-playground-qa.redis.cache.windows.net:6380 + connectionUrl: rediss://radix-playground-prod.redis.cache.windows.net:6380 environmentConfig: - environment: qa + authentication: + oauth2: + redisStore: + connectionUrl: rediss://radix-playground-qa.redis.cache.windows.net:6380 + resources: + requests: + cpu: "20m" + memory: "50Mi" + limits: + cpu: "50m" + memory: "50Mi" horizontalScaling: maxReplicas: 1 minReplicas: 0 diff --git a/radixconfig.tpl.yaml b/radixconfig.tpl.yaml index 4563849fa..ac939213e 100644 --- a/radixconfig.tpl.yaml +++ b/radixconfig.tpl.yaml @@ -5,6 +5,10 @@ metadata: spec: build: useBuildKit: true + dnsAlias: + - alias: "console" + component: web + environment: "${ACTIVE_ENVIRONMENT}" environments: - name: qa build: @@ -58,9 +62,20 @@ spec: setAuthorizationHeader: true sessionStoreType: redis redisStore: - connectionUrl: rediss://${OAUTH2_REDIS_QA_HOSTNAME}:6380 + connectionUrl: rediss://${OAUTH2_REDIS_PROD_HOSTNAME}:6380 environmentConfig: - environment: qa + authentication: + oauth2: + redisStore: + connectionUrl: rediss://${OAUTH2_REDIS_QA_HOSTNAME}:6380 + resources: + requests: + cpu: "20m" + memory: "50Mi" + limits: + cpu: "50m" + memory: "50Mi" horizontalScaling: maxReplicas: 1 minReplicas: 0