Skip to content

Commit a6b170f

Browse files
committed
chore: move pricemap redirect to tilia cluster
1 parent e8635d0 commit a6b170f

6 files changed

Lines changed: 41 additions & 35 deletions

File tree

cloud-resources/cloudflare.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ variable "cloudflare_api_token" {}
22
variable "cloudflare_account_id" {}
33

44
locals {
5-
cluster_domain = "cluster.infra.public-transport.earth"
65
tilia_cluster_domain = "tilia.cluster.infra.public-transport.earth"
76
}
87

@@ -162,14 +161,14 @@ resource "cloudflare_record" "pricemap_eu_root" {
162161
zone_id = cloudflare_zone.pricemap_eu.id
163162
type = "CNAME"
164163
name = "@"
165-
value = local.cluster_domain
164+
value = local.tilia_cluster_domain
166165
proxied = true
167166
}
168167

169168
resource "cloudflare_record" "pricemap_eu_subdomains" {
170169
zone_id = cloudflare_zone.pricemap_eu.id
171170
type = "CNAME"
172171
name = "*"
173-
value = local.cluster_domain
172+
value = local.tilia_cluster_domain
174173
proxied = true
175174
}

kubernetes/apps/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ resources:
1515
# - v5-vbb-transport-rest
1616
- umami
1717
- chore-score-bot
18-
# - travel-price-map-redirects
18+
- travel-price-map-redirects

kubernetes/apps/travel-price-map-redirects/ingress.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
3-
namespace: travel-price-map-redirects
43
resources:
5-
- namespace.yaml
6-
- ingress.yaml
4+
- release.yaml

kubernetes/apps/travel-price-map-redirects/namespace.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
apiVersion: helm.toolkit.fluxcd.io/v2beta1
2+
kind: HelmRelease
3+
metadata:
4+
name: travel-price-map-redirects
5+
namespace: app-releases
6+
spec:
7+
chart:
8+
spec:
9+
chart: simple-app
10+
sourceRef:
11+
kind: HelmRepository
12+
name: charts
13+
namespace: flux-system
14+
version: '^3.0.0'
15+
interval: 5m
16+
values:
17+
image:
18+
repositoryWithRegistry: "ghcr.io/juliuste/docker-nginx-redirect" # {"$imagepolicy": "flux-system:docker-nginx-redirect-image-policy:name"}
19+
tag: "v1_147478a_2023-09-18T16.16.48Z" # {"$imagepolicy": "flux-system:docker-nginx-redirect-image-policy:tag"}
20+
exposedPort: 80
21+
environment:
22+
PORT: 80
23+
SERVER_REDIRECT: 'github.com'
24+
SERVER_REDIRECT_PATH: '/juliuste/travel-price-map'
25+
hosts:
26+
- 'pricemap.eu'
27+
- 'www.pricemap.eu'
28+
- 'api.pricemap.eu'
29+
# resources:
30+
# limits:
31+
# cpu: 200m
32+
# memory: 256Mi
33+
# requests:
34+
# cpu: 100m
35+
# memory: 128Mi
36+
livenessProbe: false
37+
startupProbe: false

0 commit comments

Comments
 (0)