fix: use literal Kubernetes DNS instead of runtime templates

Container filesystem is read-only, so runtime template processing fails.
Solution: use literal values that work across all environments.

- default.conf: proxy to penguin-analytics-api:3000 (K8s DNS, same namespace)
- env.js: use /api/analytics (relative path via nginx reverse proxy)
- Dockerfile: copy default.conf directly to /etc/nginx/conf.d/
- run script: removed template processing code

This works because penguin-analytics is deployed to the same namespace
as eagle-admin (6cdc9e-dev, 6cdc9e-test, 6cdc9e-prod).

Author: danieltruong

Dockerfile.Github

@@ -1,7 +1,7 @@
 FROM image-registry.apps.silver.devops.gov.bc.ca/6cdc9e-tools/eagle-admin-nginx-runtime
 
-# Copy default.conf as a template for runtime processing
-COPY openshift/templates/nginx-runtime/default.conf /tmp/default.conf.template
+# Copy default.conf with analytics reverse proxy configuration
+COPY openshift/templates/nginx-runtime/default.conf /etc/nginx/conf.d/default.conf
 
 COPY dist /tmp/app/dist/admin
 

openshift/templates/nginx-runtime/default.conf

@@ -17,9 +17,9 @@ server {
 
     # Reverse proxy for Penguin Analytics
     # Forwards /api/analytics requests to the penguin-analytics API service
-    # Uses template placeholders: %PENGUIN_ANALYTICS_HOST%:%PENGUIN_ANALYTICS_PORT%
+    # Uses Kubernetes DNS: penguin-analytics-api resolves to the service in the same namespace
     location /api/analytics {
-        proxy_pass http://%PENGUIN_ANALYTICS_HOST%:%PENGUIN_ANALYTICS_PORT%/events;
+        proxy_pass http://penguin-analytics-api:3000/events;
         proxy_http_version 1.1;
         proxy_set_header Connection "";
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

openshift/templates/nginx-runtime/s2i/bin/run

@@ -1,36 +1,11 @@
 #!/bin/bash
 echo run script starting...
 
-# Configure Penguin Analytics host and port (for dynamic nginx reverse proxy)
-# PENGUIN_ANALYTICS_HOST should be set per environment:
-#   - Same namespace: penguin-analytics-api (service name only)
-#   - Cross-namespace: penguin-analytics-api.<namespace>.svc.cluster.local
-# If not set, defaults to same-namespace service name
-export PENGUIN_ANALYTICS_HOST=${PENGUIN_ANALYTICS_HOST:-penguin-analytics-api}
-export PENGUIN_ANALYTICS_PORT=${PENGUIN_ANALYTICS_PORT:-3000}
-export PENGUIN_ANALYTICS_URL=${PENGUIN_ANALYTICS_URL:-/api/analytics}
-
-echo "---> Configuring Penguin Analytics: ${PENGUIN_ANALYTICS_HOST}:${PENGUIN_ANALYTICS_PORT}"
-
 # Process nginx.conf template (if exists)
 if [ -f /tmp/nginx.conf.template ]; then
     sed "s~%RealIpFrom%~${RealIpFrom:-172.51.0.0/16}~g; s~%IpFilterRules%~${IpFilterRules}~g; s~%AdditionalRealIpFromRules%~${AdditionalRealIpFromRules}~g" /tmp/nginx.conf.template > /etc/nginx/nginx.conf
 fi
 
-# Process default.conf template for analytics reverse proxy
-if [ -f /tmp/default.conf.template ]; then
-    echo "---> Processing default.conf template"
-    sed "s~%PENGUIN_ANALYTICS_HOST%~${PENGUIN_ANALYTICS_HOST}~g; s~%PENGUIN_ANALYTICS_PORT%~${PENGUIN_ANALYTICS_PORT}~g" /tmp/default.conf.template > /tmp/default.conf.processed
-    cat /tmp/default.conf.processed > /etc/nginx/conf.d/default.conf
-fi
-
-# Substitute analytics URL in env.js for the Angular app
-if [ -f /tmp/app/dist/admin/env.js ]; then
-    echo "---> Configuring analytics URL: ${PENGUIN_ANALYTICS_URL}"
-    sed "s~%PENGUIN_ANALYTICS_URL%~${PENGUIN_ANALYTICS_URL}~g" /tmp/app/dist/admin/env.js > /tmp/env.js.processed
-    cat /tmp/env.js.processed > /tmp/app/dist/admin/env.js
-fi
-
 if [ -n "$HTTP_BASIC_USERNAME" ] && [ -n "$HTTP_BASIC_PASSWORD" ]; then
     echo "---> Generating .htpasswd file"
     `echo "$HTTP_BASIC_USERNAME:$(openssl passwd -crypt $HTTP_BASIC_PASSWORD)" > /tmp/.htpasswd`

src/env.js

@@ -17,10 +17,8 @@
   window.__env.KEYCLOAK_ENABLED = true;
 
   // Analytics configuration
-  // Dynamically set by run script at container startup via %PENGUIN_ANALYTICS_URL%
-  // Default: uses relative proxy path /api/analytics (nginx reverse proxy)
-  // Can be overridden via PENGUIN_ANALYTICS_URL env variable during deployment
-  window.__env.ANALYTICS_API_URL = '%PENGUIN_ANALYTICS_URL%';
+  // Uses relative path - nginx reverse proxies /api/analytics to penguin-analytics service
+  window.__env.ANALYTICS_API_URL = '/api/analytics';
   window.__env.ANALYTICS_DEBUG = window.__env.ENVIRONMENT === 'local';
 
   // Add any feature-toggles