From 086385b6d8f3428ec3dcb50b4d1c7129693c3608 Mon Sep 17 00:00:00 2001 From: gisele-igore Date: Tue, 4 Apr 2023 11:21:35 +0200 Subject: [PATCH] Fix Ing --- devops/Dockerfile => Dockerfile | 0 devops/{charts => }/.helmignore | 0 devops/{charts => }/Chart.yaml | 2 +- .../templates/docker-pull-secret.yaml | 0 .../{charts => }/templates/lecoffre-back.yaml | 2 -- .../templates/service-account.yaml | 0 devops/{charts => }/values.yaml | 19 +------------------ 7 files changed, 2 insertions(+), 21 deletions(-) rename devops/Dockerfile => Dockerfile (100%) rename devops/{charts => }/.helmignore (100%) rename devops/{charts => }/Chart.yaml (98%) rename devops/{charts => }/templates/docker-pull-secret.yaml (100%) rename devops/{charts => }/templates/lecoffre-back.yaml (93%) rename devops/{charts => }/templates/service-account.yaml (100%) rename devops/{charts => }/values.yaml (79%) diff --git a/devops/Dockerfile b/Dockerfile similarity index 100% rename from devops/Dockerfile rename to Dockerfile diff --git a/devops/charts/.helmignore b/devops/.helmignore similarity index 100% rename from devops/charts/.helmignore rename to devops/.helmignore diff --git a/devops/charts/Chart.yaml b/devops/Chart.yaml similarity index 98% rename from devops/charts/Chart.yaml rename to devops/Chart.yaml index 49ed0eb7..bea6f14e 100644 --- a/devops/charts/Chart.yaml +++ b/devops/Chart.yaml @@ -21,5 +21,5 @@ version: 0.0.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: 0.4.0 +appVersion: 0.4.1 diff --git a/devops/charts/templates/docker-pull-secret.yaml b/devops/templates/docker-pull-secret.yaml similarity index 100% rename from devops/charts/templates/docker-pull-secret.yaml rename to devops/templates/docker-pull-secret.yaml diff --git a/devops/charts/templates/lecoffre-back.yaml b/devops/templates/lecoffre-back.yaml similarity index 93% rename from devops/charts/templates/lecoffre-back.yaml rename to devops/templates/lecoffre-back.yaml index 51ee72d4..f6de560e 100644 --- a/devops/charts/templates/lecoffre-back.yaml +++ b/devops/templates/lecoffre-back.yaml @@ -9,11 +9,9 @@ metadata: {{toYaml .Values.lecoffreBack.ingress.annotations | indent 4 }} {{end}} spec: - {{if .Values.lecoffreBack.ingress.tls.enabled }} tls: - hosts: {{ .Values.lecoffreBack.ingress.tls.hosts }} secretName: {{ .Values.lecoffreBack.ingress.tls.secretName }} - {{end}} rules: - host: {{ .Values.lecoffreBack.ingress.host }} http: diff --git a/devops/charts/templates/service-account.yaml b/devops/templates/service-account.yaml similarity index 100% rename from devops/charts/templates/service-account.yaml rename to devops/templates/service-account.yaml diff --git a/devops/charts/values.yaml b/devops/values.yaml similarity index 79% rename from devops/charts/values.yaml rename to devops/values.yaml index b5c80d5b..a286f980 100644 --- a/devops/charts/values.yaml +++ b/devops/values.yaml @@ -41,21 +41,4 @@ lecoffreBack: cert-manager.io/cluster-issuer: letsencrypt-prod nginx.ingress.kubernetes.io/from-to-www-redirect: "true" nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - livenessProbe: - enabled: true - path: /health - port: 8001 - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - successThreshold: 1 - readinessProbe: - enabled: true - path: /health - port: 8001 - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 5 - failureThreshold: 6 - successThreshold: 1 +