diff --git a/.vscode/settings.json b/.vscode/settings.json index b6f567b..6de7a59 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "https://json.schemastore.org/yamllint.json": [ "file:///home/cj/Documents/futureporn-monorepo/charts/fp/templates/next.yaml", "file:///home/cj/Documents/futureporn-monorepo/charts/fp/templates/strapi.yaml" - ] + ], + "https://json.schemastore.org/kustomization.json": "file:///home/cj/Documents/futureporn-monorepo/clusters/production/infrastructure.yaml" } } \ No newline at end of file diff --git a/apps/base/podinfo/release.yaml b/apps/base/podinfo/release.yaml index 083c92b..3a17227 100644 --- a/apps/base/podinfo/release.yaml +++ b/apps/base/podinfo/release.yaml @@ -29,14 +29,15 @@ spec: annotations: kubernetes.io/ingress.class: "traefik" traefik.ingress.kubernetes.io/router.priority: "4" - traefik.ingress.kubernetes.io/router.tls: "true" - traefik.ingress.kubernetes.io/router.tls.domains.0.main: podinfo.sbtp.xyz - traefik.ingress.kubernetes.io/router.entrypoints: http + traefik.ingress.kubernetes.io/router.tls: "false" + traefik.ingress.kubernetes.io/router.tls.domains.0.main: podinfo.fp.sbtp.xyz + traefik.ingress.kubernetes.io/router.entrypoints: web traefik.ingress.kubernetes.io/service.nativelb: podinfo - cert-manager.io/cluster-issuer: "letsencrypt-staging" + external-dns.alpha.kubernetes.io/hostname: podinfo.fp.sbtp.xyz + # cert-manager.io/cluster-issuer: "letsencrypt-staging" # ingress.kubernetes.io/ssl-redirect: "true" hosts: - - host: podinfo.sbtp.xyz + - host: podinfo.fp.sbtp.xyz paths: - path: / pathType: Prefix diff --git a/apps/staging/podinfo-values.yaml b/apps/staging/podinfo-values.yaml index 6e7eaa0..b0ee71a 100644 --- a/apps/staging/podinfo-values.yaml +++ b/apps/staging/podinfo-values.yaml @@ -12,7 +12,7 @@ spec: values: ingress: hosts: - - host: podinfo.sbtp.xyz + - host: podinfo.fp.sbtp.xyz paths: - path: / pathType: ImplementationSpecific diff --git a/clusters/production/infrastructure.yaml b/clusters/production/infrastructure.yaml index bf82eaf..1d29ba0 100644 --- a/clusters/production/infrastructure.yaml +++ b/clusters/production/infrastructure.yaml @@ -36,7 +36,7 @@ spec: - patch: | - op: replace path: /spec/acme/privateKeySecretRef/name - value: letsencrypt-staging + value: letsencrypt-production target: kind: ClusterIssuer name: letsencrypt @@ -50,7 +50,7 @@ spec: - patch: | - op: replace path: /metadata/name - value: letsencrypt-staging + value: letsencrypt-production target: kind: ClusterIssuer name: letsencrypt \ No newline at end of file diff --git a/clusters/staging/infrastructure.yaml b/clusters/staging/infrastructure.yaml index e2e688b..8a93f7a 100644 --- a/clusters/staging/infrastructure.yaml +++ b/clusters/staging/infrastructure.yaml @@ -40,3 +40,17 @@ spec: target: kind: ClusterIssuer name: letsencrypt + - patch: | + - op: replace + path: /metadata/name + value: letsencrypt-staging + target: + kind: ClusterIssuer + name: letsencrypt + - patch: | + - op: replace + path: /spec/acme/privateKeySecretRef/name + value: letsencrypt-staging + target: + kind: ClusterIssuer + name: letsencrypt \ No newline at end of file diff --git a/infrastructure/configs/cluster-issuers.yaml b/infrastructure/configs/cluster-issuers.yaml index 343c1cf..a0cc7bb 100644 --- a/infrastructure/configs/cluster-issuers.yaml +++ b/infrastructure/configs/cluster-issuers.yaml @@ -9,7 +9,6 @@ spec: acme: # Replace the email address with your own contact email email: cj@futureporn.net - # The server is replaced in /clusters/production/infrastructure.yaml server: https://example.com privateKeySecretRef: name: letsencrypt