diff --git a/01_onsite/01_dev/baseline/deployment.yaml b/01_onsite/01_dev/baseline/deployment.yaml index 40a29f5..8af0e76 100644 --- a/01_onsite/01_dev/baseline/deployment.yaml +++ b/01_onsite/01_dev/baseline/deployment.yaml @@ -41,22 +41,23 @@ spec: - name: PORT value: "8000" - name: REACT_APP_PROD_API_URL - value: "http://baseline-dev.k3s.semapp.lan/" + value: "http://baseline-dev.k3s.semapp.lan/api/" - name: REACT_APP_DEV_API_URL - value: "http://baseline-dev.k3s.semapp.lan/" + value: "http://baseline-dev.k3s.semapp.lan/api/" - name: REACT_APP_VERSION value: "v1" - name: REACT_APP_KEYCLOAK_URL - value: "http://keycloack.k3s.semapp.lan/" + value: "http://keycloak.semapp.lan/auth/" - name: REACT_APP_KEYCLOAK_REALM - value: "Baseline" + value: "baseline" - name: REACT_APP_KEYCLOAK_CLIENT_ID - value: "baseline-dev" + value: "baseline" - name: REACT_APP_TOKEN_MIN_VALIDITY value: "600" - name: baseline-backend image: packages.semapp.lan:5000/baseline_backend:develop + workingDir: /opt/www resources: requests: memory: "256Mi" @@ -71,7 +72,7 @@ spec: imagePullPolicy: Always envFrom: - configMapRef: - name: baseline-dev-config-dev + name: baseline-dev-config volumes: - name: baseline-nginx-conf configMap: @@ -84,7 +85,7 @@ apiVersion: v1 kind: ConfigMap metadata: namespace: dev-environment - name: baseline-dev-config-dev + name: baseline-dev-config labels: app: baseline-dev data: @@ -96,9 +97,9 @@ data: DB_PASSWORD: "password" APP_NAME: "Baseline" - APP_ENV: "production" + APP_ENV: "development" APP_KEY: "base64:14Vg4rilGKEk34XeqNR7ffg6GhFTzA7/z5T1aqy6JHw=" - APP_DEBUG: "false" + APP_DEBUG: "true" APP_URL: "http://baseline-dev.k3s.semapp.lan/" LOG_CHANNEL: "stack" @@ -114,27 +115,12 @@ data: THROTTLE_MAX_ATTEMPTS: "80" - KEYCLOAK_URL: "http://keycloack.k3s.semapp.lan/" - KEYCLOAK_PORT: "8080" - KEYCLOAK_REALM: "baseline" + KEYCLOAK_URL: "http://keycloak.semapp.lan" + KEYCLOAK_PORT: "80" + KEYCLOAK_REALM: "baseline" REDIRECT_URL: "http://baseline-dev.k3s.semapp.lan/" - -#DJANGO_DB_ENGINE: "django.db.backends.postgresql_psycopg2" -#DJANGO_DB_NAME: "efc-dev" -#DJANGO_DB_USER: "efc-dev" -#DJANGO_DB_PASSWORD: "O35iWjsO6RjvQulI2yti" -#DJANGO_DB_HOST: "postgres-lb" -#DJANGO_DB_PORT: "5432" -#ALLOWED_HOSTS: '["*"]' -#FRONTEND_URL: "http://efc-dev.k3s.semapp.lan" -#REACT_APP_PROD_API_URL: "http://efc-dev.k3s.semapp.lan/" -#REACT_APP_DEV_API_URL: http://efc-dev.k3s.semapp.lan/ -#PORT_FRONTEND: '8500' -#SHOP_FRONTEND_URL: "http://efc-shop-dev.k3s.semapp.lan" -#SHOP_PORT_FRONTEND: '8501' - --- apiVersion: v1 kind: ConfigMap @@ -162,7 +148,7 @@ data: } location ~ ^/api { - proxy_pass http://backend:5000; + proxy_pass http://backend; proxy_redirect off; proxy_set_header Host $host;