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 a6b170f
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 35 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
24 changes: 0 additions & 24 deletions kubernetes/apps/travel-price-map-redirects/ingress.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: travel-price-map-redirects
resources:
- namespace.yaml
- ingress.yaml
- release.yaml
4 changes: 0 additions & 4 deletions kubernetes/apps/travel-price-map-redirects/namespace.yaml

This file was deleted.

37 changes: 37 additions & 0 deletions kubernetes/apps/travel-price-map-redirects/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apiVersion: helm.toolkit.fluxcd.io/v2beta1
kind: HelmRelease
metadata:
name: travel-price-map-redirects
namespace: app-releases
spec:
chart:
spec:
chart: simple-app
sourceRef:
kind: HelmRepository
name: charts
namespace: flux-system
version: '^3.0.0'
interval: 5m
values:
image:
repositoryWithRegistry: "ghcr.io/juliuste/docker-nginx-redirect" # {"$imagepolicy": "flux-system:docker-nginx-redirect-image-policy:name"}
tag: "v1_147478a_2023-09-18T16.16.48Z" # {"$imagepolicy": "flux-system:docker-nginx-redirect-image-policy:tag"}
exposedPort: 80
environment:
PORT: 80
SERVER_REDIRECT: 'github.com'
SERVER_REDIRECT_PATH: '/juliuste/travel-price-map'
hosts:
- 'pricemap.eu'
- 'www.pricemap.eu'
- 'api.pricemap.eu'
# resources:
# limits:
# cpu: 200m
# memory: 256Mi
# requests:
# cpu: 100m
# memory: 128Mi
livenessProbe: false
startupProbe: false

0 comments on commit a6b170f

Please sign in to comment.