From 7e55c8fb7c9f3ebff316f95fce97597414415ea5 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 22 Jan 2024 18:21:59 +0100
Subject: [PATCH 1/5] remove deactivated b.v5.vbb.transport.rest

---
 kubernetes/apps/kustomization.yaml            |  1 -
 .../v5-vbb-transport-rest/kustomization.yaml  |  4 --
 .../apps/v5-vbb-transport-rest/release.yaml   | 38 -------------------
 3 files changed, 43 deletions(-)
 delete mode 100644 kubernetes/apps/v5-vbb-transport-rest/kustomization.yaml
 delete mode 100644 kubernetes/apps/v5-vbb-transport-rest/release.yaml

diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index 14b3e26..1ae5f84 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -12,7 +12,6 @@ resources:
   - bahn-guru
   - link-bahn-guru
   - example-app
-  # - v5-vbb-transport-rest
   - umami
   - chore-score-bot
   - travel-price-map-redirects
diff --git a/kubernetes/apps/v5-vbb-transport-rest/kustomization.yaml b/kubernetes/apps/v5-vbb-transport-rest/kustomization.yaml
deleted file mode 100644
index ad4414d..0000000
--- a/kubernetes/apps/v5-vbb-transport-rest/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-  - release.yaml
diff --git a/kubernetes/apps/v5-vbb-transport-rest/release.yaml b/kubernetes/apps/v5-vbb-transport-rest/release.yaml
deleted file mode 100644
index 22db791..0000000
--- a/kubernetes/apps/v5-vbb-transport-rest/release.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
-kind: HelmRelease
-metadata:
-  name: v5-vbb-transport-rest
-  namespace: app-releases
-spec:
-  chart:
-    spec:
-      chart: simple-app
-      sourceRef:
-        kind: HelmRepository
-        name: charts
-        namespace: flux-system
-      version: '^2.0.0'
-  interval: 5m
-  values:
-    image:
-      repositoryWithRegistry: "ghcr.io/derhuerst/vbb-rest" # {"$imagepolicy": "flux-system:v5-vbb-transport-rest-image-policy:name"}
-      tag: 'v5_5d109e7_2023-05-08T13.42.48Z' # {"$imagepolicy": "flux-system:v5-vbb-transport-rest-image-policy:tag"}
-      tagUpdatePattern: '^v5_[a-fA-F0-9]{7}_(?P<datetime>.*)Z$'
-      tagUpdateExtract: '$datetime'
-    exposedPort: 3000
-    environment:
-      HOSTNAME: 'b.v5.vbb.transport.rest'
-      PORT: 3000
-      # todo: REDIS_URL
-      NODE_ENV: 'production'
-    hosts:
-    - 'b.v5.vbb.transport.rest'
-    resources:
-      limits:
-        cpu: 1
-        memory: 600Mi
-      requests:
-        cpu: .3
-        memory: 220Mi
-    livenessProbe: '/health'
-    startupProbe: '/health'

From 1cca47d6b8057c8e4e07dd1743183e585835cb60 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 22 Jan 2024 18:23:36 +0100
Subject: [PATCH 2/5] deploy derhuerst/vbb-rest:6 as b.v6.vbb.transport.rest

---
 kubernetes/apps/kustomization.yaml            |  1 +
 .../v6-vbb-transport-rest/kustomization.yaml  |  4 ++
 .../apps/v6-vbb-transport-rest/release.yaml   | 38 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 kubernetes/apps/v6-vbb-transport-rest/kustomization.yaml
 create mode 100644 kubernetes/apps/v6-vbb-transport-rest/release.yaml

diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index 1ae5f84..2152102 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -12,6 +12,7 @@ resources:
   - bahn-guru
   - link-bahn-guru
   - example-app
+  - v6-vbb-transport-rest
   - umami
   - chore-score-bot
   - travel-price-map-redirects
diff --git a/kubernetes/apps/v6-vbb-transport-rest/kustomization.yaml b/kubernetes/apps/v6-vbb-transport-rest/kustomization.yaml
new file mode 100644
index 0000000..ad4414d
--- /dev/null
+++ b/kubernetes/apps/v6-vbb-transport-rest/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - release.yaml
diff --git a/kubernetes/apps/v6-vbb-transport-rest/release.yaml b/kubernetes/apps/v6-vbb-transport-rest/release.yaml
new file mode 100644
index 0000000..94829ae
--- /dev/null
+++ b/kubernetes/apps/v6-vbb-transport-rest/release.yaml
@@ -0,0 +1,38 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: v6-vbb-transport-rest
+  namespace: app-releases
+spec:
+  chart:
+    spec:
+      chart: simple-app
+      sourceRef:
+        kind: HelmRepository
+        name: charts
+        namespace: flux-system
+      version: '^2.0.0'
+  interval: 5m
+  values:
+    image:
+      repositoryWithRegistry: "ghcr.io/derhuerst/vbb-rest" # {"$imagepolicy": "flux-system:v6-vbb-transport-rest-image-policy:name"}
+      tag: 'v6_e84abb3_2023-11-07T18.26.54Z' # {"$imagepolicy": "flux-system:v6-vbb-transport-rest-image-policy:tag"}
+      tagUpdatePattern: '^v6_[a-fA-F0-9]{7}_(?P<datetime>.*)Z$'
+      tagUpdateExtract: '$datetime'
+    exposedPort: 3000
+    environment:
+      HOSTNAME: 'b.v6.vbb.transport.rest'
+      PORT: 3000
+      # todo: REDIS_URL
+      NODE_ENV: 'production'
+    hosts:
+    - 'b.v6.vbb.transport.rest'
+    resources:
+      limits:
+        cpu: 1
+        memory: 600Mi
+      requests:
+        cpu: .3
+        memory: 220Mi
+    livenessProbe: '/health'
+    startupProbe: '/health'

From c0fd135a383a1c8e56be427ba0870b297d069694 Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 6 Jun 2022 14:30:02 +0200
Subject: [PATCH 3/5] deploy derhuerst/bvg-rest:6 as b.v6.bvg.transport.rest

---
 kubernetes/apps/kustomization.yaml            |  1 +
 .../v6-bvg-transport-rest/kustomization.yaml  |  4 ++
 .../apps/v6-bvg-transport-rest/release.yaml   | 38 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 kubernetes/apps/v6-bvg-transport-rest/kustomization.yaml
 create mode 100644 kubernetes/apps/v6-bvg-transport-rest/release.yaml

diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index 2152102..226d355 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -12,6 +12,7 @@ resources:
   - bahn-guru
   - link-bahn-guru
   - example-app
+  - v6-bvg-transport-rest
   - v6-vbb-transport-rest
   - umami
   - chore-score-bot
diff --git a/kubernetes/apps/v6-bvg-transport-rest/kustomization.yaml b/kubernetes/apps/v6-bvg-transport-rest/kustomization.yaml
new file mode 100644
index 0000000..ad4414d
--- /dev/null
+++ b/kubernetes/apps/v6-bvg-transport-rest/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - release.yaml
diff --git a/kubernetes/apps/v6-bvg-transport-rest/release.yaml b/kubernetes/apps/v6-bvg-transport-rest/release.yaml
new file mode 100644
index 0000000..ad3e173
--- /dev/null
+++ b/kubernetes/apps/v6-bvg-transport-rest/release.yaml
@@ -0,0 +1,38 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: v6-bvg-transport-rest
+  namespace: app-releases
+spec:
+  chart:
+    spec:
+      chart: simple-app
+      sourceRef:
+        kind: HelmRepository
+        name: charts
+        namespace: flux-system
+      version: '^2.0.0'
+  interval: 5m
+  values:
+    image:
+      repositoryWithRegistry: "ghcr.io/derhuerst/bvg-rest" # {"$imagepolicy": "flux-system:v6-bvg-transport-rest-image-policy:name"}
+      tag: 'v6_461782d_2023-12-20T12.27.32Z' # {"$imagepolicy": "flux-system:v6-bvg-transport-rest-image-policy:tag"}
+      tagUpdatePattern: '^v6_[a-fA-F0-9]{7}_(?P<datetime>.*)Z$'
+      tagUpdateExtract: '$datetime'
+    exposedPort: 3000
+    environment:
+      HOSTNAME: 'b.v6.bvg.transport.rest'
+      PORT: 3000
+      # todo: REDIS_URL
+      NODE_ENV: 'production'
+    hosts:
+    - 'b.v6.bvg.transport.rest'
+    resources:
+      limits:
+        cpu: 1
+        memory: 600Mi
+      requests:
+        cpu: .3
+        memory: 220Mi
+    livenessProbe: '/health'
+    startupProbe: '/health'

From 22229d49fcb4891df81f250d384283fd854a00eb Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 6 Jun 2022 14:30:33 +0200
Subject: [PATCH 4/5] deploy derhuerst/db-rest:6 as b.v6.db.transport.rest

---
 kubernetes/apps/kustomization.yaml            |  1 +
 .../v6-db-transport-rest/kustomization.yaml   |  4 ++
 .../apps/v6-db-transport-rest/release.yaml    | 38 +++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 kubernetes/apps/v6-db-transport-rest/kustomization.yaml
 create mode 100644 kubernetes/apps/v6-db-transport-rest/release.yaml

diff --git a/kubernetes/apps/kustomization.yaml b/kubernetes/apps/kustomization.yaml
index 226d355..be15611 100644
--- a/kubernetes/apps/kustomization.yaml
+++ b/kubernetes/apps/kustomization.yaml
@@ -13,6 +13,7 @@ resources:
   - link-bahn-guru
   - example-app
   - v6-bvg-transport-rest
+  - v6-db-transport-rest
   - v6-vbb-transport-rest
   - umami
   - chore-score-bot
diff --git a/kubernetes/apps/v6-db-transport-rest/kustomization.yaml b/kubernetes/apps/v6-db-transport-rest/kustomization.yaml
new file mode 100644
index 0000000..ad4414d
--- /dev/null
+++ b/kubernetes/apps/v6-db-transport-rest/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - release.yaml
diff --git a/kubernetes/apps/v6-db-transport-rest/release.yaml b/kubernetes/apps/v6-db-transport-rest/release.yaml
new file mode 100644
index 0000000..0959309
--- /dev/null
+++ b/kubernetes/apps/v6-db-transport-rest/release.yaml
@@ -0,0 +1,38 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: v6-db-transport-rest
+  namespace: app-releases
+spec:
+  chart:
+    spec:
+      chart: simple-app
+      sourceRef:
+        kind: HelmRepository
+        name: charts
+        namespace: flux-system
+      version: '^2.0.0'
+  interval: 5m
+  values:
+    image:
+      repositoryWithRegistry: "ghcr.io/derhuerst/db-rest" # {"$imagepolicy": "flux-system:v6-db-transport-rest-image-policy:name"}
+      tag: 'v6_a294db5_2023-11-24T15.27.12Z' # {"$imagepolicy": "flux-system:v6-db-transport-rest-image-policy:tag"}
+      tagUpdatePattern: '^v6_[a-fA-F0-9]{7}_(?P<datetime>.*)Z$'
+      tagUpdateExtract: '$datetime'
+    exposedPort: 3000
+    environment:
+      HOSTNAME: 'b.v6.db.transport.rest'
+      PORT: 3000
+      # todo: REDIS_URL
+      NODE_ENV: 'production'
+    hosts:
+    - 'b.v6.db.transport.rest'
+    resources:
+      limits:
+        cpu: 1
+        memory: 600Mi
+      requests:
+        cpu: .3
+        memory: 220Mi
+    livenessProbe: '/health'
+    startupProbe: '/health'

From 7c75cc1ce5d3c3281250898cdaba5e1ec6f18eab Mon Sep 17 00:00:00 2001
From: Jannis R <mail@jannisr.de>
Date: Mon, 6 Jun 2022 14:35:47 +0200
Subject: [PATCH 5/5] derhuerst/{bvg,db,vbb}-rest: configure access to Redis

---
 kubernetes/apps/v6-bvg-transport-rest/release.yaml | 2 +-
 kubernetes/apps/v6-db-transport-rest/release.yaml  | 2 +-
 kubernetes/apps/v6-vbb-transport-rest/release.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kubernetes/apps/v6-bvg-transport-rest/release.yaml b/kubernetes/apps/v6-bvg-transport-rest/release.yaml
index ad3e173..1b03478 100644
--- a/kubernetes/apps/v6-bvg-transport-rest/release.yaml
+++ b/kubernetes/apps/v6-bvg-transport-rest/release.yaml
@@ -23,7 +23,7 @@ spec:
     environment:
       HOSTNAME: 'b.v6.bvg.transport.rest'
       PORT: 3000
-      # todo: REDIS_URL
+      REDIS_URL: 'redis://:some-password-123@redis.redis.svc.cluster.local:6379/1'
       NODE_ENV: 'production'
     hosts:
     - 'b.v6.bvg.transport.rest'
diff --git a/kubernetes/apps/v6-db-transport-rest/release.yaml b/kubernetes/apps/v6-db-transport-rest/release.yaml
index 0959309..3d8d459 100644
--- a/kubernetes/apps/v6-db-transport-rest/release.yaml
+++ b/kubernetes/apps/v6-db-transport-rest/release.yaml
@@ -23,7 +23,7 @@ spec:
     environment:
       HOSTNAME: 'b.v6.db.transport.rest'
       PORT: 3000
-      # todo: REDIS_URL
+      REDIS_URL: 'redis://:some-password-123@redis.redis.svc.cluster.local:6379/2'
       NODE_ENV: 'production'
     hosts:
     - 'b.v6.db.transport.rest'
diff --git a/kubernetes/apps/v6-vbb-transport-rest/release.yaml b/kubernetes/apps/v6-vbb-transport-rest/release.yaml
index 94829ae..25522df 100644
--- a/kubernetes/apps/v6-vbb-transport-rest/release.yaml
+++ b/kubernetes/apps/v6-vbb-transport-rest/release.yaml
@@ -23,7 +23,7 @@ spec:
     environment:
       HOSTNAME: 'b.v6.vbb.transport.rest'
       PORT: 3000
-      # todo: REDIS_URL
+      REDIS_URL: 'redis://:some-password-123@redis.redis.svc.cluster.local:6379/4'
       NODE_ENV: 'production'
     hosts:
     - 'b.v6.vbb.transport.rest'