Skip to content

Commit

Permalink
change overlays
Browse files Browse the repository at this point in the history
  • Loading branch information
Sander14121 committed Oct 3, 2024
1 parent 173c75d commit af93eb1
Show file tree
Hide file tree
Showing 15 changed files with 216 additions and 110 deletions.
8 changes: 1 addition & 7 deletions kustomize/base/flais.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions kustomize/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions kustomize/overlays/api/fintlabs-no/flais.yaml
Original file line number Diff line number Diff line change
@@ -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
30 changes: 10 additions & 20 deletions kustomize/overlays/api/fintlabs-no/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions kustomize/overlays/api/rogfk-no/flais.yaml
Original file line number Diff line number Diff line change
@@ -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
32 changes: 11 additions & 21 deletions kustomize/overlays/api/rogfk-no/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions kustomize/overlays/api/trondelagfylke-no/flais.yaml
Original file line number Diff line number Diff line change
@@ -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
32 changes: 11 additions & 21 deletions kustomize/overlays/api/trondelagfylke-no/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
24 changes: 0 additions & 24 deletions kustomize/overlays/api/visma-com/kustomization.yaml

This file was deleted.

23 changes: 23 additions & 0 deletions kustomize/overlays/beta/fintlabs-no/flais.yaml
Original file line number Diff line number Diff line change
@@ -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
27 changes: 10 additions & 17 deletions kustomize/overlays/beta/fintlabs-no/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
23 changes: 23 additions & 0 deletions kustomize/overlays/beta/rogfk-no/flais.yaml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions kustomize/overlays/beta/rogfk-no/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
23 changes: 23 additions & 0 deletions kustomize/overlays/beta/trondelagfylke-no/flais.yaml
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions kustomize/overlays/beta/trondelagfylke-no/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit af93eb1

Please sign in to comment.