From a471b971ef1b849cb26d0f8ee2cf20a625458882 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sat, 3 May 2025 12:34:25 +0200 Subject: [PATCH 01/18] feat: rls --- environments/dev.yaml | 2 +- helm/templates/security/prod-issuer.yaml | 2 -- helm/templates/webapp/ingress.yaml | 8 +------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/environments/dev.yaml b/environments/dev.yaml index 6a198f4..7b406bb 100644 --- a/environments/dev.yaml +++ b/environments/dev.yaml @@ -1,6 +1,6 @@ webapp: ingress: - host: localhost + host: remarket-dev.xyz containers: env: diff --git a/helm/templates/security/prod-issuer.yaml b/helm/templates/security/prod-issuer.yaml index 17799dc..c744201 100644 --- a/helm/templates/security/prod-issuer.yaml +++ b/helm/templates/security/prod-issuer.yaml @@ -1,4 +1,3 @@ -{{- if .Values.issuer.enabled }} apiVersion: cert-manager.io/v1 kind: Issuer metadata: @@ -17,4 +16,3 @@ spec: - http01: ingress: ingressClassName: nginx -{{- end }} diff --git a/helm/templates/webapp/ingress.yaml b/helm/templates/webapp/ingress.yaml index 4b01ad8..7ce7939 100644 --- a/helm/templates/webapp/ingress.yaml +++ b/helm/templates/webapp/ingress.yaml @@ -2,20 +2,14 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ .Values.webapp.name }} - {{- if .Values.issuer.enabled }} annotations: cert-manager.io/issuer: "letsencrypt-prod" - {{- end }} spec: ingressClassName: {{ .Values.webapp.ingress.className }} - - {{- if .Values.issuer.enabled }} tls: - hosts: - {{ .Values.webapp.ingress.host }} secretName: tls-secret - {{- end }} - rules: - host: {{ .Values.webapp.ingress.host }} http: @@ -34,6 +28,6 @@ spec: pathType: Prefix backend: service: - name: {{ .Release.Name }}-grafana + name: "{{ .Release.Name }}-grafana" port: number: {{ .Values.webapp.service.port }} From dda871ad5bf6c530294cbdc31e737eae786b1f63 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sat, 3 May 2025 12:50:56 +0200 Subject: [PATCH 02/18] debug --- .github/workflows/deploy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 63963e8..6c97fa9 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -55,7 +55,9 @@ jobs: --create-namespace \ --version v1.17.0 \ --set crds.enabled=true - + - name: Debug workflow file + run: | + cat ${GITHUB_WORKSPACE}/.github/workflows/deploy.yml - name: Deploy run: | helm dependency build ./helm && From 3a65ae94d523b0768191bf1e3ca260f06bfb5170 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sat, 3 May 2025 12:54:17 +0200 Subject: [PATCH 03/18] debug --- .github/workflows/deploy.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 6c97fa9..dbd523d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -55,9 +55,11 @@ jobs: --create-namespace \ --version v1.17.0 \ --set crds.enabled=true + - name: Debug workflow file run: | - cat ${GITHUB_WORKSPACE}/.github/workflows/deploy.yml + cat .github/workflows/deploy.yml + - name: Deploy run: | helm dependency build ./helm && From 61edf1f52343b42bd6d9424acb96b9f0e64288d1 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sat, 3 May 2025 12:56:28 +0200 Subject: [PATCH 04/18] debug --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index dbd523d..6cdbc27 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -58,7 +58,7 @@ jobs: - name: Debug workflow file run: | - cat .github/workflows/deploy.yml + cat .github/workflows/deploy.yaml - name: Deploy run: | From 29c5d16ec826efd708a361390ed2b3f4d06105e8 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sat, 3 May 2025 13:03:01 +0200 Subject: [PATCH 05/18] debug --- .github/workflows/deploy.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 6cdbc27..1c3942e 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -56,10 +56,6 @@ jobs: --version v1.17.0 \ --set crds.enabled=true - - name: Debug workflow file - run: | - cat .github/workflows/deploy.yaml - - name: Deploy run: | helm dependency build ./helm && @@ -78,5 +74,3 @@ jobs: --set database.container.env.POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} \ --set database.container.env.POSTGRES_DB=${{ secrets.POSTGRES_DB }} \ --set issuer.enabled=true - - echo Done From 8b83fcb7a23502dedeaec1a95b3ad98f3ad92214 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sat, 3 May 2025 22:30:29 +0200 Subject: [PATCH 06/18] feat: enable grafana --- .github/workflows/deploy.yaml | 5 +++++ environments/dev.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1c3942e..87b6e9d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -74,3 +74,8 @@ jobs: --set database.container.env.POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} \ --set database.container.env.POSTGRES_DB=${{ secrets.POSTGRES_DB }} \ --set issuer.enabled=true +<<<<<<< HEAD +======= + + echo Done +>>>>>>> 7022ae1 (feat: enable grafana) diff --git a/environments/dev.yaml b/environments/dev.yaml index 7b406bb..6a198f4 100644 --- a/environments/dev.yaml +++ b/environments/dev.yaml @@ -1,6 +1,6 @@ webapp: ingress: - host: remarket-dev.xyz + host: localhost containers: env: From e989869fea0935787fd1e687bc33010d85750e1b Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Mon, 12 May 2025 23:21:58 +0200 Subject: [PATCH 07/18] fix: if --- deploy.sh | 4 ++-- helm/values.yaml | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index d3cb017..78d3a6d 100755 --- a/deploy.sh +++ b/deploy.sh @@ -25,7 +25,7 @@ HELM_VALUES="./environments/${ENV}.yaml" echo "Builing dependencies" -cd helm && helm dependency build && cd .. +cd helm && helm dependency build && helm repo update && cd .. echo "Installing cert-manager CRDs..." helm upgrade \ @@ -36,8 +36,8 @@ helm upgrade \ --version v1.17.0 \ --set crds.enabled=true -echo "Deploying application..." +echo "Deploying application..." helm upgrade \ --install \ $APP_RELEASE \ diff --git a/helm/values.yaml b/helm/values.yaml index ffad909..3f5faec 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -55,3 +55,12 @@ issuer: kube-prometheus-stack: nodeExporter: enabled: false + grafana: + defaultDashboardsEnabled: true + # kubeScheduler: + # service: + # selector: + # component: kube-scheduler-docker-desktop + # serviceMonitor: + # selector: + # app: kube-prometheus-stack-kube-scheduler From 5190e5a8764a0d14644173fa48aa8a036afbc526 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Tue, 13 May 2025 00:41:46 +0200 Subject: [PATCH 08/18] feat: fix tls --- deploy.sh | 3 ++- helm/templates/webapp/ingress.yaml | 1 + helm/values.yaml | 7 ------- infrastructure/gke.tf | 3 +++ 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deploy.sh b/deploy.sh index 78d3a6d..2d877e3 100755 --- a/deploy.sh +++ b/deploy.sh @@ -46,7 +46,8 @@ helm upgrade \ --create-namespace \ -f "$HELM_VALUES" \ --set webapp.containers.env.google_client_id="$GOOGLE_CLIENT_ID" \ - --set webapp.containers.env.google_client_secret="$GOOGLE_CLIENT_SECRET" + --set webapp.containers.env.google_client_secret="$GOOGLE_CLIENT_SECRET" \ + --set issuer.enabled=false # Step 2: Get Ingress details diff --git a/helm/templates/webapp/ingress.yaml b/helm/templates/webapp/ingress.yaml index 7ce7939..842fef2 100644 --- a/helm/templates/webapp/ingress.yaml +++ b/helm/templates/webapp/ingress.yaml @@ -9,6 +9,7 @@ spec: tls: - hosts: - {{ .Values.webapp.ingress.host }} + - "grafana.{{ .Values.webapp.ingress.host }}" secretName: tls-secret rules: - host: {{ .Values.webapp.ingress.host }} diff --git a/helm/values.yaml b/helm/values.yaml index 3f5faec..3ab2e7b 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -57,10 +57,3 @@ kube-prometheus-stack: enabled: false grafana: defaultDashboardsEnabled: true - # kubeScheduler: - # service: - # selector: - # component: kube-scheduler-docker-desktop - # serviceMonitor: - # selector: - # app: kube-prometheus-stack-kube-scheduler diff --git a/infrastructure/gke.tf b/infrastructure/gke.tf index 7e3a671..6c52613 100644 --- a/infrastructure/gke.tf +++ b/infrastructure/gke.tf @@ -17,6 +17,9 @@ resource "google_container_cluster" "primary" { machine_type = var.machine_type disk_size_gb = 20 } + monitoring_config { + enable_components = SCHEDULER + } } resource "google_container_node_pool" "primary_preemptible_nodes" { From 6d5b3eb441eb3c86736bd59ecb6cee7b41358f1f Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Tue, 13 May 2025 00:48:33 +0200 Subject: [PATCH 09/18] feat: stripe --- .github/workflows/deploy.yaml | 7 ++----- helm/templates/webapp/deployment.yaml | 4 ++++ helm/values.yaml | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 87b6e9d..2d099b2 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -70,12 +70,9 @@ jobs: --set webapp.containers.env.next_public_app_url=${{ secrets.NEXT_PUBLIC_APP_URL }} \ --set webapp.containers.env.nextauth_url=${{ secrets.NEXT_PUBLIC_APP_URL }} \ --set webapp.containers.env.nextauth_secret=${{ secrets.NEXTAUTH_SECRET }} \ + --set webapp.containers.env.stripe_secret_key=${{ secrets.STRIPE_SECRET_KEY }} \ + --set webapp.containers.env.stripe_webhook_secret=${{ secrets.STRIPE_WEBHOOK_SECRET }} \ --set database.container.env.POSTGRES_USER=${{ secrets.POSTGRES_USER }} \ --set database.container.env.POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} \ --set database.container.env.POSTGRES_DB=${{ secrets.POSTGRES_DB }} \ --set issuer.enabled=true -<<<<<<< HEAD -======= - - echo Done ->>>>>>> 7022ae1 (feat: enable grafana) diff --git a/helm/templates/webapp/deployment.yaml b/helm/templates/webapp/deployment.yaml index bebc5a7..c56c015 100644 --- a/helm/templates/webapp/deployment.yaml +++ b/helm/templates/webapp/deployment.yaml @@ -41,3 +41,7 @@ spec: value: {{ .Values.webapp.containers.env.nextauth_url }} - name: NEXT_PUBLIC_APP_URL value: {{ .Values.webapp.containers.env.next_public_app_url }} + - name: STRIPE_SECRET_KEY + value: {{ .Values.webapp.containers.env.stripe_secret_key }} + - name: STRIPE_WEBHOOK_SESCRET + value: {{ .Values.webapp.containers.env.stripe_webhook_secret }} diff --git a/helm/values.yaml b/helm/values.yaml index 3ab2e7b..5e87e78 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -16,6 +16,8 @@ webapp: nextauth_secret: "secret" next_public_app_url: "http://localhost:3000" nextauth_url: "http://localhost:3000" + stripe_secret_key: "secret" + stripe_webhook_secret: "secret" service: type: ClusterIP port: 80 From b66dc21dfa5d6df1f548467be87de7e682022fa1 Mon Sep 17 00:00:00 2001 From: Filip <78978614+HermanPlay@users.noreply.github.com> Date: Sun, 18 May 2025 10:39:13 +0000 Subject: [PATCH 10/18] Update helm/templates/webapp/deployment.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- helm/templates/webapp/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/templates/webapp/deployment.yaml b/helm/templates/webapp/deployment.yaml index c56c015..fe62a41 100644 --- a/helm/templates/webapp/deployment.yaml +++ b/helm/templates/webapp/deployment.yaml @@ -43,5 +43,5 @@ spec: value: {{ .Values.webapp.containers.env.next_public_app_url }} - name: STRIPE_SECRET_KEY value: {{ .Values.webapp.containers.env.stripe_secret_key }} - - name: STRIPE_WEBHOOK_SESCRET + - name: STRIPE_WEBHOOK_SECRET value: {{ .Values.webapp.containers.env.stripe_webhook_secret }} From a3ec2dcb2b3d1f4f6e3fbe70817ed07e3de852ea Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 14:24:42 +0200 Subject: [PATCH 11/18] fix --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 2d099b2..b8e41e8 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -58,7 +58,7 @@ jobs: - name: Deploy run: | - helm dependency build ./helm && + helm dependency build ./helm helm upgrade remarket ./helm \ --install \ --namespace remarket \ From 11c2211581d50b57cc24f8922c695340c5e37966 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 14:44:41 +0200 Subject: [PATCH 12/18] fix --- infrastructure/gke.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/gke.tf b/infrastructure/gke.tf index 6c52613..8466bf8 100644 --- a/infrastructure/gke.tf +++ b/infrastructure/gke.tf @@ -18,7 +18,7 @@ resource "google_container_cluster" "primary" { disk_size_gb = 20 } monitoring_config { - enable_components = SCHEDULER + enable_components = ["SCHEDULER"] } } From fc342d47c052b68e638906afce6972f7f59cb8e1 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 14:49:35 +0200 Subject: [PATCH 13/18] fix --- infrastructure/gke.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/gke.tf b/infrastructure/gke.tf index 8466bf8..1c2b477 100644 --- a/infrastructure/gke.tf +++ b/infrastructure/gke.tf @@ -18,7 +18,7 @@ resource "google_container_cluster" "primary" { disk_size_gb = 20 } monitoring_config { - enable_components = ["SCHEDULER"] + enable_components = ["SYSTEM_COMPONENTS", "SCHEDULER"] } } From 7ea2ccaf479fcb6e8496eab8375d6ffb7d1de893 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 15:13:33 +0200 Subject: [PATCH 14/18] fix --- .github/workflows/deploy.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b8e41e8..53743d1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -56,9 +56,12 @@ jobs: --version v1.17.0 \ --set crds.enabled=true - - name: Deploy + - name: Build dependency run: | helm dependency build ./helm + + - name: Deploy + run: | helm upgrade remarket ./helm \ --install \ --namespace remarket \ From 415032bdba92b4a3e508c4cdbeb4208c8ea59680 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 15:19:32 +0200 Subject: [PATCH 15/18] fix --- .github/workflows/deploy.yaml | 40 +++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 53743d1..0dae814 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -58,7 +58,28 @@ jobs: - name: Build dependency run: | - helm dependency build ./helm + cat < values.yaml + webapp: + containers: + env: + google_client_id: "${{ secrets.GOOGLE_CLIENT_ID }}" + google_client_secret: "${{ secrets.GOOGLE_CLIENT_SECRET }}" + jwt_secret: "${{ secrets.JWT_SECRET }}" + secret: "${{ secrets.SECRET }}" + next_public_app_url: "${{ secrets.NEXT_PUBLIC_APP_URL }}" + nextauth_url: "${{ secrets.NEXT_PUBLIC_APP_URL }}" + nextauth_secret: "${{ secrets.NEXTAUTH_SECRET }}" + stripe_secret_key: "${{ secrets.STRIPE_SECRET_KEY }}" + stripe_webhook_secret: "${{ secrets.STRIPE_WEBHOOK_SECRET }}" + database: + container: + env: + POSTGRES_USER: "${{ secrets.POSTGRES_USER }}" + POSTGRES_PASSWORD: "${{ secrets.POSTGRES_PASSWORD }}" + POSTGRES_DB: "${{ secrets.POSTGRES_DB }}" + issuer: + enabled: true + EOF - name: Deploy run: | @@ -66,16 +87,7 @@ jobs: --install \ --namespace remarket \ --create-namespace \ - --set webapp.containers.env.google_client_id=${{ secrets.GOOGLE_CLIENT_ID }} \ - --set webapp.containers.env.google_client_secret=${{ secrets.GOOGLE_CLIENT_SECRET }} \ - --set webapp.containers.env.jwt_secret=${{ secrets.JWT_SECRET }} \ - --set webapp.containers.env.secret=${{ secrets.SECRET }} \ - --set webapp.containers.env.next_public_app_url=${{ secrets.NEXT_PUBLIC_APP_URL }} \ - --set webapp.containers.env.nextauth_url=${{ secrets.NEXT_PUBLIC_APP_URL }} \ - --set webapp.containers.env.nextauth_secret=${{ secrets.NEXTAUTH_SECRET }} \ - --set webapp.containers.env.stripe_secret_key=${{ secrets.STRIPE_SECRET_KEY }} \ - --set webapp.containers.env.stripe_webhook_secret=${{ secrets.STRIPE_WEBHOOK_SECRET }} \ - --set database.container.env.POSTGRES_USER=${{ secrets.POSTGRES_USER }} \ - --set database.container.env.POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }} \ - --set database.container.env.POSTGRES_DB=${{ secrets.POSTGRES_DB }} \ - --set issuer.enabled=true + --values values.yaml + + - name: Cleanup values file + run: rm values.yaml From aed07efea746a13c72a3e847bb5cfd247eb083ad Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 15:22:13 +0200 Subject: [PATCH 16/18] fix --- .github/workflows/deploy.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 0dae814..d9e0a28 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -56,7 +56,7 @@ jobs: --version v1.17.0 \ --set crds.enabled=true - - name: Build dependency + - name: Create values.yaml run: | cat < values.yaml webapp: @@ -81,6 +81,10 @@ jobs: enabled: true EOF + - name: Build dependency + run: | + helm dependency build ./helm + - name: Deploy run: | helm upgrade remarket ./helm \ From b026647af48f80f054a2e64cc1d615794d1e209a Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 18:49:40 +0200 Subject: [PATCH 17/18] fix --- .github/workflows/deploy.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index d9e0a28..71497a4 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -77,8 +77,6 @@ jobs: POSTGRES_USER: "${{ secrets.POSTGRES_USER }}" POSTGRES_PASSWORD: "${{ secrets.POSTGRES_PASSWORD }}" POSTGRES_DB: "${{ secrets.POSTGRES_DB }}" - issuer: - enabled: true EOF - name: Build dependency From 14f67e974257e9545de906b082422fc898ad5af2 Mon Sep 17 00:00:00 2001 From: HermanPlay Date: Sun, 18 May 2025 19:05:04 +0200 Subject: [PATCH 18/18] fix --- helm/templates/security/prod-issuer.yaml | 36 ++++++++++++------------ helm/templates/webapp/ingress.yaml | 10 +++---- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/helm/templates/security/prod-issuer.yaml b/helm/templates/security/prod-issuer.yaml index c744201..dee0896 100644 --- a/helm/templates/security/prod-issuer.yaml +++ b/helm/templates/security/prod-issuer.yaml @@ -1,18 +1,18 @@ -apiVersion: cert-manager.io/v1 -kind: Issuer -metadata: - name: letsencrypt-prod -spec: - acme: - # The ACME server URL - server: https://acme-v02.api.letsencrypt.org/directory - # Email address used for ACME registration - email: filip.shramko.stud@gmail.com - # Name of a secret used to store the ACME account private key - privateKeySecretRef: - name: letsencrypt-prod - # Enable the HTTP-01 challenge provider - solvers: - - http01: - ingress: - ingressClassName: nginx +# apiVersion: cert-manager.io/v1 +# kind: Issuer +# metadata: +# name: letsencrypt-prod +# spec: +# acme: +# # The ACME server URL +# server: https://acme-v02.api.letsencrypt.org/directory +# # Email address used for ACME registration +# email: filip.shramko.stud@gmail.com +# # Name of a secret used to store the ACME account private key +# privateKeySecretRef: +# name: letsencrypt-prod +# # Enable the HTTP-01 challenge provider +# solvers: +# - http01: +# ingress: +# ingressClassName: nginx diff --git a/helm/templates/webapp/ingress.yaml b/helm/templates/webapp/ingress.yaml index 842fef2..d8b6056 100644 --- a/helm/templates/webapp/ingress.yaml +++ b/helm/templates/webapp/ingress.yaml @@ -6,11 +6,11 @@ metadata: cert-manager.io/issuer: "letsencrypt-prod" spec: ingressClassName: {{ .Values.webapp.ingress.className }} - tls: - - hosts: - - {{ .Values.webapp.ingress.host }} - - "grafana.{{ .Values.webapp.ingress.host }}" - secretName: tls-secret + # tls: + # - hosts: + # - {{ .Values.webapp.ingress.host }} + # - "grafana.{{ .Values.webapp.ingress.host }}" + # secretName: tls-secret rules: - host: {{ .Values.webapp.ingress.host }} http: