From ba104537f153be3d6b473ea31497c43c5d1354a6 Mon Sep 17 00:00:00 2001 From: Justin Kreller Date: Wed, 9 Apr 2025 20:10:21 +0200 Subject: [PATCH] WIP: made first steps to hide specific hosts --- charts/ci-build-deploy.yml | 3 + charts/values.yaml | 154 +++++++++++++++++++------------------ 2 files changed, 82 insertions(+), 75 deletions(-) diff --git a/charts/ci-build-deploy.yml b/charts/ci-build-deploy.yml index 3ed965d..c31f965 100644 --- a/charts/ci-build-deploy.yml +++ b/charts/ci-build-deploy.yml @@ -131,6 +131,7 @@ build-frontend-image-prod: - yq e -i '(.ical.image.name) = env(ICAL_IMAGE)' $VALUES_FILE - yq e -i '(.frontend.image.name) = env(FRONTEND_IMAGE)' $VALUES_FILE - yq e -i '(.frontend.host) = env(PROJECT_URL)' $VALUES_FILE + - yq e -i '(.hidden_host) = env(HIDDEN_HOST)' $VALUES_FILE after_script: - yq e -i 'explode(.)' "$VALUES_FILE" - helm dependency update $CHARTS_DIR @@ -145,6 +146,7 @@ package-helm-chart-dev: extends: .package-helm-chart variables: PROJECT_URL: $PROJECT_URL_DEV + HIDDEN_HOST: $HIDDEN_HOST_DEV PROJECT_NAME: $CI_PROJECT_NAME-dev FALLBACK_TAG: dev script: @@ -161,6 +163,7 @@ package-helm-chart-prod: extends: .package-helm-chart variables: PROJECT_URL: $PROJECT_URL_PROD + HIDDEN_HOST: $HIDDEN_HOST_PROD PROJECT_NAME: $CI_PROJECT_NAME FALLBACK_TAG: latest script: diff --git a/charts/values.yaml b/charts/values.yaml index e9d4e43..86069a4 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -32,6 +32,7 @@ frontend: name: &service_frontend htwkalender-frontend port: &service_frontend_port 8000 targetPort: 8000 +hidden_host: &hidden_host "HIDDEN_HOST" persistence: enabled: true @@ -50,78 +51,81 @@ readinessProbe: path: / port: http -ingress: - hosts: - - host: *frontend_host - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: *service_frontend - port: - number: *service_frontend_port - - path: /api/feed/room - pathType: ImplementationSpecific - backend: - service: - name: *service_ical - port: - number: *service_ical_port - - path: /api/feed - pathType: ImplementationSpecific - backend: - service: - name: *service_ical - port: - number: *service_ical_port - - path: /api - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port - - path: /api/modules - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port - - path: /api/events/types - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port - - path: /api/rooms - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port - - path: /api/schedule - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port - - path: /api/courses - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port - - path: /_ - pathType: ImplementationSpecific - backend: - service: - name: *service_data_manager - port: - number: *service_data_manager_port + ingress: + hosts: + - host: *frontend_host + http: + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + name: *service_frontend + port: + number: *service_frontend_port + - path: /api/feed/room + pathType: ImplementationSpecific + backend: + service: + name: *service_ical + port: + number: *service_ical_port + - path: /api/feed + pathType: ImplementationSpecific + backend: + service: + name: *service_ical + port: + number: *service_ical_port + - path: /api + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port + - path: /api/modules + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port + - path: /api/events/types + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port + - path: /api/rooms + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port + - path: /api/schedule + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port + - path: /api/courses + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port + - host: *hidden_host + http: + paths: + - path: /_ + pathType: ImplementationSpecific + backend: + service: + name: *service_data_manager + port: + number: *service_data_manager_port