Merge pull request #206 from Tauffer-Consulting/k8s-config

K8s config
Tauffer-Consulting · Dec 15, 2023 · bf35832 · bf35832
2 parents 8e37c73 + a0d2282
commit bf35832
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 29 deletions.
diff --git a/.github/workflows/release-frontend-dev.yaml b/.github/workflows/release-frontend-dev.yaml
@@ -31,8 +31,6 @@ jobs:
           tags: ghcr.io/tauffer-consulting/domino-frontend:k8s-dev
           context: frontend
           file: frontend/Dockerfile.prod # Path to the Dockerfile
-        env:
-          API_ENV: dev
 
   release-domino-frontend-compose:
     name: Domino Frontend Image

diff --git a/.github/workflows/release-frontend.yaml b/.github/workflows/release-frontend.yaml
@@ -31,8 +31,6 @@ jobs:
           tags: ghcr.io/tauffer-consulting/domino-frontend:k8s
           context: frontend
           file: frontend/Dockerfile.prod # Path to the Dockerfile
-        env:
-          VITE_API_ENV: prod
 
   release-domino-frontend-compose:
     name: Domino Frontend Image

diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml
@@ -364,6 +364,7 @@ services:
     environment:
       - API_ENV=local
       - DOMINO_DEPLOY_MODE=local-compose
+      - API_URL=http://localhost:8000
     ports:
       - 3000:3000
     volumes:

diff --git a/frontend/.env.production b/frontend/.env.production
@@ -1,3 +1,4 @@
 # These values are placeholders
 API_ENV="local"
 DOMINO_DEPLOY_MODE="local-compose"
+API_URL="http://localhost:8000"
diff --git a/frontend/entrypoint.sh b/frontend/entrypoint.sh
@@ -3,6 +3,7 @@ set -e
 
 echo "API_ENV=$API_ENV" >> .env.production
 echo "DOMINO_DEPLOY_MODE=$DOMINO_DEPLOY_MODE" >> .env.production
+echo "API_URL=$API_URL" >> .env.production
 
 /usr/share/nginx/html/import-meta-env -x .env.production -p /usr/share/nginx/html/index.html || exit 1
 

diff --git a/frontend/src/config/environment.config.ts b/frontend/src/config/environment.config.ts
@@ -8,6 +8,7 @@ export interface IEnvironment {
   NODE_ENV: INodeEnv;
   API_ENV: IApiEnv;
   USE_MOCK: boolean;
+  API_URL: string;
 }
 
 /**
@@ -16,5 +17,6 @@ export interface IEnvironment {
 export const environment: IEnvironment = {
   NODE_ENV: import.meta.env.NODE_ENV as INodeEnv,
   API_ENV: import.meta.env.API_ENV as IApiEnv,
+  API_URL: import.meta.env.API_URL as string,
   USE_MOCK: !!import.meta.env.VITE_USE_MOCK,
 };
diff --git a/frontend/src/services/config/endpoints.config.ts b/frontend/src/services/config/endpoints.config.ts
@@ -15,7 +15,7 @@ const configEndpoints: Record<IApiEnv, IEndpoints> = {
     api: "http://localhost/api",
   },
   prod: {
-    api: "http://localhost/api",
+    api: environment.API_URL,
   },
 };
 

diff --git a/helm/domino/Chart.yaml b/helm/domino/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: domino
 description: A Helm chart for Domino
 type: application
-version: 0.1.8
-appVersion: 0.1.8
+version: 0.1.9
+appVersion: 0.1.9
 home: https://github.com/Tauffer-Consulting/domino
 sources:
   - https://github.com/Tauffer-Consulting/domino
diff --git a/helm/domino/templates/domino-frontend-deployment.yml b/helm/domino/templates/domino-frontend-deployment.yml
@@ -1,7 +1,7 @@
 {{- if .Values.frontend.enabled }}
 apiVersion: apps/v1
 kind: Deployment
-metadata: 
+metadata:
   name: {{ .Release.Name }}-frontend
   labels:
     app: {{ .Release.Name }}-frontend
@@ -32,14 +32,8 @@ spec:
               value: {{ .Values.frontend.apiEnv }}
             - name: DOMINO_DEPLOY_MODE
               value: {{ .Values.frontend.deployMode }}
-
-          # resources:
-          #   limits:
-          #     memory: {{ .Values.frontend.memoryLimit }}
-          #     cpu: {{ .Values.frontend.cpuLimit }}
-          #   requests:
-          #     memory: {{ .Values.frontend.memoryRequest }}
-          #     cpu: {{ .Values.frontend.cpuRequest }}
+            - name: API_URL
+              value: {{ .Values.frontend.apiUrl }}
 
 ---
 # Frontend Service
@@ -52,7 +46,4 @@ spec:
     app: {{ .Release.Name }}-frontend
   ports:
   - port: 80
-    #targetPort: 3000
-    #nodePort: 30030
-  #type: NodePort
 {{- end}}
diff --git a/helm/domino/templates/domino-rest-deployment.yml b/helm/domino/templates/domino-rest-deployment.yml
@@ -28,7 +28,7 @@ spec:
           ports:
             - containerPort: 8000
           imagePullPolicy: IfNotPresent
-          env: 
+          env:
             # TODO use load balancer instead of service ip for airflow webserver ?
             - name: AIRFLOW_WEBSERVER_HOST
               value: http://airflow-webserver:8080
@@ -59,7 +59,7 @@ spec:
             - name: DOMINO_GITHUB_WORKFLOWS_REPOSITORY
               value: {{ .Values.rest.workflowsRepository }}
           {{- if .Values.rest.extraVolumeMounts }}
-          volumeMounts:             
+          volumeMounts:
 {{ toYaml .Values.rest.extraVolumeMounts | indent 12 }}
           {{- end }}
           resources:
@@ -86,6 +86,4 @@ spec:
     app: {{ .Release.Name }}-rest
   ports:
   - port: 8000
-      #- protocol: "TCP"
-      #targetPort: 8000
 
diff --git a/helm/domino/templates/ingress-api.yaml b/helm/domino/templates/ingress-api.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /$2
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths:

diff --git a/helm/domino/templates/ingress-frontend.yaml b/helm/domino/templates/ingress-frontend.yaml
@@ -6,6 +6,7 @@ metadata:
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /$1
 spec:
+  ingressClassName: nginx
   rules:
   - http:
       paths:

diff --git a/helm/domino/values.yaml b/helm/domino/values.yaml
@@ -8,6 +8,7 @@ frontend:
   enabled: true
   image: ghcr.io/tauffer-consulting/domino-frontend
   tag: latest
+  apiUrl: http://localhost/api
 
 # REST service
 rest:

diff --git a/src/domino/cli/utils/docker-compose-without-database.yaml b/src/domino/cli/utils/docker-compose-without-database.yaml
@@ -31,7 +31,7 @@ x-airflow-common:
     postgres:
       condition: service_healthy
 
-services: 
+services:
   postgres:
     image: postgres:13
     container_name: airflow-postgres
@@ -319,7 +319,8 @@ services:
     environment:
       - API_ENV=local
       - DOMINO_DEPLOY_MODE=local-compose
-
+      - API_URL=http://localhost:8000
+
   # Domino Docker proxy
   docker-proxy:
     image: bobrik/socat

diff --git a/src/domino/cli/utils/docker-compose.yaml b/src/domino/cli/utils/docker-compose.yaml
@@ -31,7 +31,7 @@ x-airflow-common:
     postgres:
       condition: service_healthy
 
-services: 
+services:
   postgres:
     image: postgres:13
     container_name: airflow-postgres
@@ -350,7 +350,8 @@ services:
     environment:
       - API_ENV=local
       - DOMINO_DEPLOY_MODE=local-compose
-
+      - API_URL=http://localhost:8000
+
   # Domino Docker proxy
   docker-proxy:
     image: bobrik/socat

diff --git a/src/domino/cli/utils/platform.py b/src/domino/cli/utils/platform.py
@@ -294,7 +294,7 @@ def create_platform(install_airflow: bool = True, use_gpu: bool = False) -> None
             "enabled": True,
             "image": domino_frontend_image,
             "apiEnv": "dev" if platform_config['kind']["DOMINO_DEPLOY_MODE"] in ['local-k8s-dev', 'local-k8s'] else 'prod',
-            "deployMode": platform_config['kind']["DOMINO_DEPLOY_MODE"]
+            "deployMode": platform_config['kind']["DOMINO_DEPLOY_MODE"],
         },
         "rest": {
             "enabled": True,
@@ -384,7 +384,7 @@ def create_platform(install_airflow: bool = True, use_gpu: bool = False) -> None
         },
         "config": {
             "api": {
-                "auth_backend": "airflow.api.auth.backend.basic_auth"
+                "auth_backends": "airflow.api.auth.backend.basic_auth"
             },
         },
         "dags": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ const configEndpoints: Record<IApiEnv, IEndpoints> = { @@
         api: "http://localhost/api",
       },
       prod: {
-        api: "http://localhost/api",
+        api: environment.API_URL,
       },
     };
@@ Expand Down @@