diff --git a/templates/api-ingress.yaml b/templates/api-ingress.yaml index e675cf618fddc6cb65e4bfeef7a66527d93457f3..a38220f932f54c3e86ce893c92f26b196c2aea42 100644 --- a/templates/api-ingress.yaml +++ b/templates/api-ingress.yaml @@ -4,7 +4,6 @@ metadata: annotations: kubernetes.io/ingress.class: nginx {{- if .Values.api.ingress.tlsEnabled }} - kubernetes.io/tls-acme: 'true' nginx.ingress.kubernetes.io/cors-allow-headers: Content-Type nginx.ingress.kubernetes.io/cors-allow-methods: '*' nginx.ingress.kubernetes.io/cors-allow-origin: {{ .Values.front.ingress.host }} diff --git a/values.yaml b/values.1.yaml similarity index 96% rename from values.yaml rename to values.1.yaml index d529bec57add899d3bbbf12c9859cd6b148831a9..a3f188ed51c252f7e6a23c7105fc9bc16365ed52 100644 --- a/values.yaml +++ b/values.1.yaml @@ -10,7 +10,7 @@ api: tag: latest replicaCount: 1 ingress: - tlsEnabled: true + tlsEnabled: false host: api.czheng.takima.school db: endpoint: cdb-postgresql:5432 diff --git a/values.2.yaml b/values.2.yaml new file mode 100644 index 0000000000000000000000000000000000000000..5defebff9847ecc3728b3fdea46f38ac7ad8823d --- /dev/null +++ b/values.2.yaml @@ -0,0 +1,30 @@ +# Default values for CDB app. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. +# We have only done front for now +name: cdb + +api: + image: + repository: registry.gitlab.com/takima-school/images/cdb/api + tag: latest + replicaCount: 3 + ingress: + tlsEnabled: true + host: api.czheng.takima.school + db: + endpoint: cdb-postgresql:5432 + +front: + enabled: true + image: + repository: registry.gitlab.com/takima-school/images/cdb/www + tag: latest + replicaCount: 5 + ingress: + tlsEnabled: true + host: www.czheng.takima.school + +db: + dbName: hydra + prefix: cdb