Skip to content

Commit

Permalink
chore: move pricemap redirect to tilia cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
juliuste committed Sep 18, 2023
1 parent e8635d0 commit c577845
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
5 changes: 2 additions & 3 deletions cloud-resources/cloudflare.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ variable "cloudflare_api_token" {}
variable "cloudflare_account_id" {}

locals {
cluster_domain = "cluster.infra.public-transport.earth"
tilia_cluster_domain = "tilia.cluster.infra.public-transport.earth"
}

Expand Down Expand Up @@ -162,14 +161,14 @@ resource "cloudflare_record" "pricemap_eu_root" {
zone_id = cloudflare_zone.pricemap_eu.id
type = "CNAME"
name = "@"
value = local.cluster_domain
value = local.tilia_cluster_domain
proxied = true
}

resource "cloudflare_record" "pricemap_eu_subdomains" {
zone_id = cloudflare_zone.pricemap_eu.id
type = "CNAME"
name = "*"
value = local.cluster_domain
value = local.tilia_cluster_domain
proxied = true
}
2 changes: 1 addition & 1 deletion kubernetes/apps/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ resources:
# - v5-vbb-transport-rest
- umami
- chore-score-bot
# - travel-price-map-redirects
- travel-price-map-redirects
7 changes: 3 additions & 4 deletions kubernetes/apps/travel-price-map-redirects/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ metadata:
name: travel-price-map-redirects-ingress
namespace: travel-price-map-redirects
annotations:
kubernetes.io/ingress.class: "nginx"
cert-manager.io/cluster-issuer: "certificate-issuer"
nginx.ingress.kubernetes.io/server-snippet: |
return 301 https://github.com/juliuste/travel-price-map;
kubernetes.io/ingress.class: "traefik"
cert-manager.io/cluster-issuer: "cert-issuer"
traefik.ingress.kubernetes.io/router.middlewares: "travel-price-map-redirects-travel-price-map-redirects-middleware@kubernetescrd"
labels:
app.kubernetes.io/name: travel-price-map-redirects-ingress
app.kubernetes.io/instance: travel-price-map-redirects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ kind: Kustomization
namespace: travel-price-map-redirects
resources:
- namespace.yaml
- middleware.yaml
- ingress.yaml
9 changes: 9 additions & 0 deletions kubernetes/apps/travel-price-map-redirects/middleware.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: traefik.io/v1alpha1
kind: Middleware
metadata:
name: travel-price-map-redirects-middleware
namespace: travel-price-map-redirects
spec:
redirectRegex:
regex: ^(.*)
replacement: https://github.com/juliuste/travel-price-map

0 comments on commit c577845

Please sign in to comment.