From af93eb112116875173f7334f5b848a75818d91f6 Mon Sep 17 00:00:00 2001
From: Sander Nilsen Rysjedal <Sander.Rysjedal@vigoiks.no>
Date: Thu, 3 Oct 2024 12:52:53 +0200
Subject: [PATCH] change overlays

---
 kustomize/base/flais.yaml                     |  8 +----
 kustomize/base/kustomization.yaml             |  7 ++++
 kustomize/overlays/api/fintlabs-no/flais.yaml | 23 +++++++++++++
 .../api/fintlabs-no/kustomization.yaml        | 30 ++++++-----------
 kustomize/overlays/api/rogfk-no/flais.yaml    | 23 +++++++++++++
 .../overlays/api/rogfk-no/kustomization.yaml  | 32 +++++++------------
 .../overlays/api/trondelagfylke-no/flais.yaml | 23 +++++++++++++
 .../api/trondelagfylke-no/kustomization.yaml  | 32 +++++++------------
 .../overlays/api/visma-com/kustomization.yaml | 24 --------------
 .../overlays/beta/fintlabs-no/flais.yaml      | 23 +++++++++++++
 .../beta/fintlabs-no/kustomization.yaml       | 27 ++++++----------
 kustomize/overlays/beta/rogfk-no/flais.yaml   | 23 +++++++++++++
 .../overlays/beta/rogfk-no/kustomization.yaml | 14 ++++++++
 .../beta/trondelagfylke-no/flais.yaml         | 23 +++++++++++++
 .../beta/trondelagfylke-no/kustomization.yaml | 14 ++++++++
 15 files changed, 216 insertions(+), 110 deletions(-)
 create mode 100644 kustomize/overlays/api/fintlabs-no/flais.yaml
 create mode 100644 kustomize/overlays/api/rogfk-no/flais.yaml
 create mode 100644 kustomize/overlays/api/trondelagfylke-no/flais.yaml
 delete mode 100644 kustomize/overlays/api/visma-com/kustomization.yaml
 create mode 100644 kustomize/overlays/beta/fintlabs-no/flais.yaml
 create mode 100644 kustomize/overlays/beta/rogfk-no/flais.yaml
 create mode 100644 kustomize/overlays/beta/rogfk-no/kustomization.yaml
 create mode 100644 kustomize/overlays/beta/trondelagfylke-no/flais.yaml
 create mode 100644 kustomize/overlays/beta/trondelagfylke-no/kustomization.yaml

diff --git a/kustomize/base/flais.yaml b/kustomize/base/flais.yaml
index 8808dd6..b3829ff 100644
--- a/kustomize/base/flais.yaml
+++ b/kustomize/base/flais.yaml
@@ -4,13 +4,7 @@ metadata:
   name: fint-personvern-kodeverk-adapter
   namespace: fintlabs-no
   labels:
-    app.kubernetes.io/name: fint-personvern-kodeverk-adapter
-    app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_fintlabs_no
-    app.kubernetes.io/version: latest
-    app.kubernetes.io/component: adapter
-    app.kubernetes.io/part-of: fint-core
-    fintlabs.no/team: core
-    fintlabs.no/org-id: fintlabs.no
+
 spec:
   port: 8080
   orgId: fintlabs.no
diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml
index 7709057..014c84b 100644
--- a/kustomize/base/kustomization.yaml
+++ b/kustomize/base/kustomization.yaml
@@ -2,3 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - flais.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
\ No newline at end of file
diff --git a/kustomize/overlays/api/fintlabs-no/flais.yaml b/kustomize/overlays/api/fintlabs-no/flais.yaml
new file mode 100644
index 0000000..c30023d
--- /dev/null
+++ b/kustomize/overlays/api/fintlabs-no/flais.yaml
@@ -0,0 +1,23 @@
+apiVersion: fintlabs.no/v1alpha1
+kind: Application
+metadata:
+  name: fint-personvern-kodeverk-adapter
+  namespace: fintlabs-no
+spec:
+  orgId: fintlabs.no
+  port: 8080
+  env:
+    - name: fint.adapter.base-url
+      value: https://api.felleskomponent.no
+  image: ghcr.io/fintlabs/fint-personvern-kodeverk-adapter:latest
+  onePassword:
+    itemPath: vaults/aks-api-vault/items/fint-personvern-kodeverk-adapter
+  database:
+    database: fint-core
+  resources:
+    limits:
+      memory: 512Mi
+      cpu: 500m
+    requests:
+      memory: 256Mi
+      cpu: 250m
diff --git a/kustomize/overlays/api/fintlabs-no/kustomization.yaml b/kustomize/overlays/api/fintlabs-no/kustomization.yaml
index 7fb0dcc..6bfc630 100644
--- a/kustomize/overlays/api/fintlabs-no/kustomization.yaml
+++ b/kustomize/overlays/api/fintlabs-no/kustomization.yaml
@@ -2,23 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: fintlabs-no
 resources:
-  - ../../../base
-commonLabels:
-  app.kubernetes.io/name: fint-personvern-kodeverk-adapter
-  app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_fintlabs_no
-  app.kubernetes.io/version: latest
-  app.kubernetes.io/component: adapter
-  app.kubernetes.io/part-of: fint-core
-  fintlabs.no/team: core
-  fintlabs.no/org-id: fintlabs.no
-patches:
-  - patch: |-
-      - op: replace
-        path: "/metadata/labels/app.kubernetes.io~1instance"
-        value: "fint-personvern-kodeverk-adapter_fintlabs_no"
-      - op: replace
-        path: "/spec/orgId"
-        value: "fintlabs.no"
-    target:
-      kind: Application
-      name: fint-personvern-kodeverk-adapter
+  - flais.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_fintlabs_no
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
+      fintlabs.no/org-id: fintlabs.no
\ No newline at end of file
diff --git a/kustomize/overlays/api/rogfk-no/flais.yaml b/kustomize/overlays/api/rogfk-no/flais.yaml
new file mode 100644
index 0000000..c401aac
--- /dev/null
+++ b/kustomize/overlays/api/rogfk-no/flais.yaml
@@ -0,0 +1,23 @@
+apiVersion: fintlabs.no/v1alpha1
+kind: Application
+metadata:
+  name: fint-personvern-kodeverk-adapter
+  namespace: rogfk-no
+spec:
+  orgId: rogfk.no
+  port: 8080
+  env:
+    - name: fint.adapter.base-url
+      value: https://api.felleskomponent.no
+  image: ghcr.io/fintlabs/fint-personvern-kodeverk-adapter:latest
+  onePassword:
+    itemPath: vaults/aks-api-vault/items/fint-personvern-kodeverk-adapter
+  database:
+    database: fint-core
+  resources:
+    limits:
+      memory: 512Mi
+      cpu: 500m
+    requests:
+      memory: 256Mi
+      cpu: 250m
diff --git a/kustomize/overlays/api/rogfk-no/kustomization.yaml b/kustomize/overlays/api/rogfk-no/kustomization.yaml
index a4d0b12..888765a 100644
--- a/kustomize/overlays/api/rogfk-no/kustomization.yaml
+++ b/kustomize/overlays/api/rogfk-no/kustomization.yaml
@@ -1,24 +1,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: trondelagfylke-no
+namespace: rogfk-no
 resources:
-  - ../../../base
-commonLabels:
-  app.kubernetes.io/name: fint-personvern-kodeverk-adapter
-  app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_trondelagfylke_no
-  app.kubernetes.io/version: latest
-  app.kubernetes.io/component: adapter
-  app.kubernetes.io/part-of: fint-core
-  fintlabs.no/team: core
-  fintlabs.no/org-id: trondelagfylke.no
-patches:
-  - patch: |-
-      - op: replace
-        path: "/metadata/labels/app.kubernetes.io~1instance"
-        value: "fint-personvern-kodeverk-adapter_trondelagfylke_no"
-      - op: replace
-        path: "/spec/orgId"
-        value: "trondelagfylke.no"
-    target:
-      kind: Application
-      name: fint-personvern-kodeverk-adapter
+  - flais.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_rogfk_no
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
+      fintlabs.no/org-id: rogfk.no
\ No newline at end of file
diff --git a/kustomize/overlays/api/trondelagfylke-no/flais.yaml b/kustomize/overlays/api/trondelagfylke-no/flais.yaml
new file mode 100644
index 0000000..e6662e9
--- /dev/null
+++ b/kustomize/overlays/api/trondelagfylke-no/flais.yaml
@@ -0,0 +1,23 @@
+apiVersion: fintlabs.no/v1alpha1
+kind: Application
+metadata:
+  name: fint-personvern-kodeverk-adapter
+  namespace: trondelagfylke-no
+spec:
+  orgId: trondelagfylke.no
+  port: 8080
+  env:
+    - name: fint.adapter.base-url
+      value: https://api.felleskomponent.no
+  image: ghcr.io/fintlabs/fint-personvern-kodeverk-adapter:latest
+  onePassword:
+    itemPath: vaults/aks-api-vault/items/fint-personvern-kodeverk-adapter
+  database:
+    database: fint-core
+  resources:
+    limits:
+      memory: 512Mi
+      cpu: 500m
+    requests:
+      memory: 256Mi
+      cpu: 250m
diff --git a/kustomize/overlays/api/trondelagfylke-no/kustomization.yaml b/kustomize/overlays/api/trondelagfylke-no/kustomization.yaml
index c173b51..69b27ef 100644
--- a/kustomize/overlays/api/trondelagfylke-no/kustomization.yaml
+++ b/kustomize/overlays/api/trondelagfylke-no/kustomization.yaml
@@ -1,24 +1,14 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: rogfk-no
+namespace: trondelagfylke-no
 resources:
-  - ../../../base
-commonLabels:
-  app.kubernetes.io/name: fint-personvern-kodeverk-adapter
-  app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_rogfk_no
-  app.kubernetes.io/version: latest
-  app.kubernetes.io/component: adapter
-  app.kubernetes.io/part-of: fint-core
-  fintlabs.no/team: core
-  fintlabs.no/org-id: rogfk.no
-patches:
-  - patch: |-
-      - op: replace
-        path: "/metadata/labels/app.kubernetes.io~1instance"
-        value: "fint-personvern-kodeverk-adapter_rogfk_no"
-      - op: replace
-        path: "/spec/orgId"
-        value: "rogfk.no"
-    target:
-      kind: Application
-      name: fint-personvern-kodeverk-adapter
+  - flais.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_trondelagfylke_no
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
+      fintlabs.no/org-id: trondelagfylke.no
\ No newline at end of file
diff --git a/kustomize/overlays/api/visma-com/kustomization.yaml b/kustomize/overlays/api/visma-com/kustomization.yaml
deleted file mode 100644
index 87a9b6e..0000000
--- a/kustomize/overlays/api/visma-com/kustomization.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: visma-no
-resources:
-  - ../../../base
-commonLabels:
-  app.kubernetes.io/name: fint-personvern-kodeverk-adapter
-  app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_visma_no
-  app.kubernetes.io/version: latest
-  app.kubernetes.io/component: adapter
-  app.kubernetes.io/part-of: fint-core
-  fintlabs.no/team: core
-  fintlabs.no/org-id: visma.no
-patches:
-  - patch: |-
-      - op: replace
-        path: "/metadata/labels/app.kubernetes.io~1instance"
-        value: "fint-personvern-kodeverk-adapter_visma_no"
-      - op: replace
-        path: "/spec/orgId"
-        value: "visma.no"
-    target:
-      kind: Application
-      name: fint-personvern-kodeverk-adapter
diff --git a/kustomize/overlays/beta/fintlabs-no/flais.yaml b/kustomize/overlays/beta/fintlabs-no/flais.yaml
new file mode 100644
index 0000000..e814b8d
--- /dev/null
+++ b/kustomize/overlays/beta/fintlabs-no/flais.yaml
@@ -0,0 +1,23 @@
+apiVersion: fintlabs.no/v1alpha1
+kind: Application
+metadata:
+  name: fint-personvern-kodeverk-adapter
+  namespace: fintlabs-no
+spec:
+  orgId: fintlabs.no
+  port: 8080
+  env:
+    - name: fint.adapter.base-url
+      value: https://beta.felleskomponent.no
+  image: ghcr.io/fintlabs/fint-personvern-kodeverk-adapter:latest
+  onePassword:
+    itemPath: vaults/aks-beta-vault/items/fint-personvern-kodeverk-adapter
+  database:
+    database: fint-core
+  resources:
+    limits:
+      memory: 512Mi
+      cpu: 500m
+    requests:
+      memory: 256Mi
+      cpu: 250m
diff --git a/kustomize/overlays/beta/fintlabs-no/kustomization.yaml b/kustomize/overlays/beta/fintlabs-no/kustomization.yaml
index a41ef1c..d8294f8 100644
--- a/kustomize/overlays/beta/fintlabs-no/kustomization.yaml
+++ b/kustomize/overlays/beta/fintlabs-no/kustomization.yaml
@@ -2,20 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: fintlabs-no
 resources:
-  - ../../../base
-commonLabels:
-  app.kubernetes.io/name: fint-personvern-kodeverk-adapter
-  app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_fintlabs_no
-  app.kubernetes.io/version: latest
-  app.kubernetes.io/component: adapter
-  app.kubernetes.io/part-of: fint-core
-  fintlabs.no/team: core
-  fintlabs.no/org-id: fintlabs.no
-patches:
-  - patch: |-
-      - op: replace
-        path: "/spec/onePassword/itemPath"
-        value: "vaults/aks-beta-vault/items/fint-personvern-kodeverk-adapter"
-    target:
-      kind: Application
-      name: fint-personvern-kodeverk-adapter
+  - flais
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_fintlabs_no
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
+      fintlabs.no/org-id: fintlabs.no
\ No newline at end of file
diff --git a/kustomize/overlays/beta/rogfk-no/flais.yaml b/kustomize/overlays/beta/rogfk-no/flais.yaml
new file mode 100644
index 0000000..6ea0776
--- /dev/null
+++ b/kustomize/overlays/beta/rogfk-no/flais.yaml
@@ -0,0 +1,23 @@
+apiVersion: fintlabs.no/v1alpha1
+kind: Application
+metadata:
+  name: fint-personvern-kodeverk-adapter
+  namespace: rogfk-no
+spec:
+  orgId: rogfk.no
+  port: 8080
+  env:
+    - name: fint.adapter.base-url
+      value: https://beta.felleskomponent.no
+  image: ghcr.io/fintlabs/fint-personvern-kodeverk-adapter:latest
+  onePassword:
+    itemPath: vaults/aks-beta-vault/items/fint-personvern-kodeverk-adapter
+  database:
+    database: fint-core
+  resources:
+    limits:
+      memory: 512Mi
+      cpu: 500m
+    requests:
+      memory: 256Mi
+      cpu: 250m
diff --git a/kustomize/overlays/beta/rogfk-no/kustomization.yaml b/kustomize/overlays/beta/rogfk-no/kustomization.yaml
new file mode 100644
index 0000000..888765a
--- /dev/null
+++ b/kustomize/overlays/beta/rogfk-no/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: rogfk-no
+resources:
+  - flais.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_rogfk_no
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
+      fintlabs.no/org-id: rogfk.no
\ No newline at end of file
diff --git a/kustomize/overlays/beta/trondelagfylke-no/flais.yaml b/kustomize/overlays/beta/trondelagfylke-no/flais.yaml
new file mode 100644
index 0000000..d81b01d
--- /dev/null
+++ b/kustomize/overlays/beta/trondelagfylke-no/flais.yaml
@@ -0,0 +1,23 @@
+apiVersion: fintlabs.no/v1alpha1
+kind: Application
+metadata:
+  name: fint-personvern-kodeverk-adapter
+  namespace: trondelagfylke-no
+spec:
+  orgId: trondelagfylke.no
+  port: 8080
+  env:
+    - name: fint.adapter.base-url
+      value: https://beta.felleskomponent.no
+  image: ghcr.io/fintlabs/fint-personvern-kodeverk-adapter:latest
+  onePassword:
+    itemPath: vaults/aks-beta-vault/items/fint-personvern-kodeverk-adapter
+  database:
+    database: fint-core
+  resources:
+    limits:
+      memory: 512Mi
+      cpu: 500m
+    requests:
+      memory: 256Mi
+      cpu: 250m
diff --git a/kustomize/overlays/beta/trondelagfylke-no/kustomization.yaml b/kustomize/overlays/beta/trondelagfylke-no/kustomization.yaml
new file mode 100644
index 0000000..69b27ef
--- /dev/null
+++ b/kustomize/overlays/beta/trondelagfylke-no/kustomization.yaml
@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: trondelagfylke-no
+resources:
+  - flais.yaml
+labels:
+  - pairs:
+      app.kubernetes.io/name: fint-personvern-kodeverk-adapter
+      app.kubernetes.io/instance: fint-personvern-kodeverk-adapter_trondelagfylke_no
+      app.kubernetes.io/version: latest
+      app.kubernetes.io/component: adapter
+      app.kubernetes.io/part-of: fint-core
+      fintlabs.no/team: core
+      fintlabs.no/org-id: trondelagfylke.no
\ No newline at end of file