From cac9d58c0bb153a1aaa458427ba1f9d775fc7e20 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 30 Nov 2023 16:03:58 +0100
Subject: [PATCH] add ingress
---
.gitlab-ci.yml | 4 +++-
.gitlab/master.yaml | 10 ++++++++++
maps/values.yaml | 16 +++++-----------
3 files changed, 18 insertions(+), 12 deletions(-)
create mode 100644 .gitlab/master.yaml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dd7425..d4a88b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,8 @@ workflow:
- if: $CI_COMMIT_BRANCH == "master"
variables:
APP_URL: https://maps.metager.de
+ APP_HOST: maps.metager.de
+ HELM_VALUES_FILE: .gitlab/master.yaml
ENVIRONMENT: production
IMAGE_NAME: $CI_REGISTRY_IMAGE
IMAGE_TAG: $IMAGE_TAG_PREFIX-$CI_COMMIT_SHA
@@ -98,4 +100,4 @@ deploy:
- kubectl config use-context $CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME:maps-deployment
script:
- kubectl -n $KUBE_NAMESPACE create secret generic $DEPLOYMENT_CHART_NAME --from-file=.env=$ENV_PRODUCTION --dry-run=client --save-config -o yaml | kubectl apply -f -
- - helm -n $KUBE_NAMESPACE upgrade --install $DEPLOYMENT_CHART_NAME maps/ --set nginx.image.repository=$CI_REGISTRY_IMAGE/nginx --set secretName=$DEPLOYMENT_CHART_NAME --set nginx.image.tag=$IMAGE_TAG --set fpm.image.repository=$CI_REGISTRY_IMAGE/fpm --set fpm.image.tag=$IMAGE_TAG
+ - helm -n $KUBE_NAMESPACE upgrade --install $DEPLOYMENT_CHART_NAME maps/ -f $HELM_VALUES_FILE --set nginx.image.repository=$CI_REGISTRY_IMAGE/nginx --set secretName=$DEPLOYMENT_CHART_NAME --set nginx.image.tag=$IMAGE_TAG --set fpm.image.repository=$CI_REGISTRY_IMAGE/fpm --set fpm.image.tag=$IMAGE_TAG
diff --git a/.gitlab/master.yaml b/.gitlab/master.yaml
new file mode 100644
index 0000000..bbb7bc0
--- /dev/null
+++ b/.gitlab/master.yaml
@@ -0,0 +1,10 @@
+ingress:
+ hosts:
+ - host: maps.metager.de
+ paths:
+ - path: /
+ pathType: ImplementationSpecific
+ tls:
+ - hosts:
+ - maps.metager.de
+ secretName: maps-tls
\ No newline at end of file
diff --git a/maps/values.yaml b/maps/values.yaml
index 62f4f24..43805d1 100644
--- a/maps/values.yaml
+++ b/maps/values.yaml
@@ -38,20 +38,14 @@ service:
port: 80
ingress:
- enabled: false
- className: ""
- annotations: {}
+ enabled: true
+ className: nginx
+ annotations:
+ cert-manager.io/cluster-issuer: letsencrypt-dns
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
- hosts:
- - host: chart-example.local
- paths:
- - path: /
- pathType: ImplementationSpecific
+ hosts: []
tls: []
- # - secretName: chart-example-tls
- # hosts:
- # - chart-example.local
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
--
GitLab