diff --git a/manifest.yaml b/manifest.yaml index a129174..94d9ea7 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -10,7 +10,7 @@ data: APP_DEBUG: "${APP_APP_DEBUG}" APP_URL: "https://www.${APP_DOMAIN}" LOG_CHANNEL: "k8s" - DB_HOST: "mariadb-service.common-services" + DB_HOST: "mariadb.common-services" DB_DATABASE: "${APP_DB_DATABASE}" DB_USERNAME: "${APP_DB_USERNAME}" DB_PASSWORD: "${APP_DB_PASSWORD}" @@ -92,7 +92,7 @@ spec: targetPort: 443 --- -apiVersion: traefik.containo.us/v1alpha1 +apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: name: ${CI_PROJECT_PATH_SLUG}-ingress-route @@ -101,7 +101,7 @@ spec: - web - websecure routes: - - match: Host(`${APP_DOMAIN}`, `www.${APP_DOMAIN}`) + - match: Host(`${APP_DOMAIN}`) || Host(`www.${APP_DOMAIN}`) kind: Rule services: - name: ${CI_PROJECT_PATH_SLUG}-service @@ -110,21 +110,7 @@ spec: - name: redirect-no-www-to-www namespace: common-services tls: - secretName: $APP_DOMAIN - ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: $APP_DOMAIN -spec: - dnsNames: - - $APP_DOMAIN - - www.${APP_DOMAIN} - secretName: $APP_DOMAIN - issuerRef: - name: $APP_CERT_ISSUER - kind: ClusterIssuer + secretName: ${CRT_TLS_NAME} --- apiVersion: batch/v1 diff --git a/production-resources.yaml b/production-resources.yaml new file mode 100644 index 0000000..c297d72 --- /dev/null +++ b/production-resources.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: $APP_DOMAIN +spec: + dnsNames: + - $APP_DOMAIN + - www.${APP_DOMAIN} + secretName: $APP_DOMAIN + issuerRef: + name: $APP_CERT_ISSUER + kind: ClusterIssuer