deploy to more orgs in api & beta

.github/workflows/CD.yaml

@@ -55,27 +55,26 @@ jobs:
     strategy:
       matrix:
         org:
-#          - fintlabs-no
-#          - visma-com
-#          - ude-oslo-kommune-no
-#          - innlandetfylke-no
-#          - agderfk-no
-#          - vlfk-no
+          - afk-no
+          - agderfk-no
+          - bfk-no
+          - ffk-no
+          - innlandetfylke-no
           - mrfylke-no
-#          - vtfk-no
-          - trondelagfylke-no
           - nfk-no
-          - vestfoldfylke-no
-          - telemarkfylke-no
+          - ofk-no
           - rogfk-no
+          - telemarkfylke-no
+          - tffk-no
+          - trondelagfylke-no
+          - ude-oslo-kommune-no
+          - vestfoldfylke-no
+          - vlfk-no
         cluster:
 #          - aks-alpha-fint-2021-11-18
           - aks-beta-fint-2021-11-23
           - aks-api-fint-2022-02-08
 #          - aks-pwf-fint-2021-10-20
-        exclude:
-          - org: rogfk-no
-            cluster: aks-api-fint-2022-02-08
 
     steps:
       - name: Checkout repository

kustomize/overlays/api/vtfk-no/config-map.yaml → kustomize/overlays/api/afk-no/config-map.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: fint-core-consumer-utdanning-larling
 data:
-  fint.consumer.org-id: 'vtfk.no'
-  fint.kafka.topic.org-id: 'vtfk.no'
+  fint.consumer.org-id: 'afk.no'
+  fint.kafka.topic.org-id: 'afk.no'
   spring.kafka.consumer.group-id: 'consumer-utdanning-larling-api'
   fint.relations.default-base-url: 'https://api.felleskomponent.no'

kustomize/overlays/api/vtfk-no/ingress-route.yaml → kustomize/overlays/api/afk-no/ingress-route.yaml

@@ -6,7 +6,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `vtfk.no`)"
+    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `afk.no`)"
       kind: Rule
       services:
         - name: fint-core-consumer-utdanning-larling

kustomize/overlays/api/vtfk-no/kafka-user-and-acl.yaml → kustomize/overlays/api/afk-no/kafka-user-and-acl.yaml

@@ -5,4 +5,4 @@ metadata:
 spec:
   acls:
     - permission: admin
-      topic: "vtfk-no.fint-core.*"
+      topic: "afk-no.fint-core.*"

kustomize/overlays/api/vtfk-no/kustomization.yaml → kustomize/overlays/api/afk-no/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: vtfk-no
+namespace: afk-no
 resources:
   - ../../../base
 patchesStrategicMerge:
@@ -9,9 +9,9 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_vtfk-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_afk_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core
   fintlabs.no/team: core
-  fintlabs.no/org-id: vtfk.no
+  fintlabs.no/org-id: afk.no

kustomize/overlays/api/agderfk-no/kustomization.yaml

@@ -9,7 +9,7 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_agderfk-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_agderfk_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core

kustomize/overlays/api/visma-com/config-map.yaml → kustomize/overlays/api/bfk-no/config-map.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: fint-core-consumer-utdanning-larling
 data:
-  fint.consumer.org-id: 'visma.com'
-  fint.kafka.topic.org-id: 'visma.com'
+  fint.consumer.org-id: 'bfk.no'
+  fint.kafka.topic.org-id: 'bfk.no'
   spring.kafka.consumer.group-id: 'consumer-utdanning-larling-api'
   fint.relations.default-base-url: 'https://api.felleskomponent.no'

kustomize/overlays/api/visma-com/ingress-route.yaml → kustomize/overlays/api/bfk-no/ingress-route.yaml

@@ -6,7 +6,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `visma.com`)"
+    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `bfk.no`)"
       kind: Rule
       services:
         - name: fint-core-consumer-utdanning-larling

kustomize/overlays/beta/vtfk-no/kafka-user-and-acl.yaml → kustomize/overlays/api/bfk-no/kafka-user-and-acl.yaml

@@ -5,4 +5,4 @@ metadata:
 spec:
   acls:
     - permission: admin
-      topic: "vtfk-no.fint-core.*"
+      topic: "bfk-no.fint-core.*"

kustomize/overlays/beta/vtfk-no/kustomization.yaml → kustomize/overlays/api/bfk-no/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: vtfk-no
+namespace: bfk-no
 resources:
   - ../../../base
 patchesStrategicMerge:
@@ -9,9 +9,9 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_vtfk-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_bfk_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core
   fintlabs.no/team: core
-  fintlabs.no/org-id: vtfk.no
+  fintlabs.no/org-id: bfk.no

kustomize/overlays/api/fintlabs-no/config-map.yaml → kustomize/overlays/api/ffk-no/config-map.yaml

@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: fint-core-consumer-utdanning-larling
 data:
-  fint.consumer.org-id: 'fintlabs.no'
-  fint.kafka.topic.org-id: 'fintlabs.no'
+  fint.consumer.org-id: 'ffk.no'
+  fint.kafka.topic.org-id: 'ffk.no'
   spring.kafka.consumer.group-id: 'consumer-utdanning-larling-api'
   fint.relations.default-base-url: 'https://api.felleskomponent.no'

kustomize/overlays/api/fintlabs-no/ingress-route.yaml → kustomize/overlays/api/ffk-no/ingress-route.yaml

@@ -6,7 +6,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `fintlabs.no`)"
+    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `ffk.no`)"
       kind: Rule
       services:
         - name: fint-core-consumer-utdanning-larling

kustomize/overlays/beta/visma-com/kafka-user-and-acl.yaml → kustomize/overlays/api/ffk-no/kafka-user-and-acl.yaml

@@ -5,4 +5,4 @@ metadata:
 spec:
   acls:
     - permission: admin
-      topic: "visma-com.fint-core.*"
+      topic: "ffk-no.fint-core.*"

kustomize/overlays/api/visma-com/kustomization.yaml → kustomize/overlays/api/ffk-no/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: visma-com
+namespace: ffk-no
 resources:
   - ../../../base
 patchesStrategicMerge:
@@ -9,9 +9,9 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_visma-com
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_ffk_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core
   fintlabs.no/team: core
-  fintlabs.no/org-id: visma.com
+  fintlabs.no/org-id: ffk.no

kustomize/overlays/api/innlandetfylke-no/kustomization.yaml

@@ -9,7 +9,7 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_innlandetfylke-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_innlandetfylke_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core

kustomize/overlays/api/mrfylke-no/kustomization.yaml

@@ -9,7 +9,7 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_mrfylke-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_mrfylke_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core

kustomize/overlays/api/nfk-no/kustomization.yaml

@@ -9,7 +9,7 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_nfk-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_nfk_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core

kustomize/overlays/api/ofk-no/config-map.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fint-core-consumer-utdanning-larling
+data:
+  fint.consumer.org-id: 'ofk.no'
+  fint.kafka.topic.org-id: 'ofk.no'
+  spring.kafka.consumer.group-id: 'consumer-utdanning-larling-api'
+  fint.relations.default-base-url: 'https://api.felleskomponent.no'

kustomize/overlays/api/ofk-no/ingress-route.yaml

@@ -0,0 +1,13 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: fint-core-consumer-utdanning-larling
+spec:
+  entryPoints:
+    - web
+  routes:
+    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `ofk.no`)"
+      kind: Rule
+      services:
+        - name: fint-core-consumer-utdanning-larling
+          port: 8080

kustomize/overlays/api/visma-com/kafka-user-and-acl.yaml → kustomize/overlays/api/ofk-no/kafka-user-and-acl.yaml

@@ -5,4 +5,4 @@ metadata:
 spec:
   acls:
     - permission: admin
-      topic: "visma-com.fint-core.*"
+      topic: "ofk-no.fint-core.*"

kustomize/overlays/beta/visma-com/kustomization.yaml → kustomize/overlays/api/ofk-no/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: visma-com
+namespace: ofk-no
 resources:
   - ../../../base
 patchesStrategicMerge:
@@ -9,9 +9,9 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_visma-com
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_ofk_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core
   fintlabs.no/team: core
-  fintlabs.no/org-id: visma.com
+  fintlabs.no/org-id: ofk.no

kustomize/overlays/api/rogfk-no/config-map.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fint-core-consumer-utdanning-larling
+data:
+  fint.consumer.org-id: 'rogfk.no'
+  fint.kafka.topic.org-id: 'rogfk.no'
+  spring.kafka.consumer.group-id: 'consumer-utdanning-larling-api'
+  fint.relations.default-base-url: 'https://api.felleskomponent.no'

kustomize/overlays/api/rogfk-no/ingress-route.yaml

@@ -0,0 +1,13 @@
+apiVersion: traefik.containo.us/v1alpha1
+kind: IngressRoute
+metadata:
+  name: fint-core-consumer-utdanning-larling
+spec:
+  entryPoints:
+    - web
+  routes:
+    - match: "Host(`api.felleskomponent.no`) && PathPrefix(`/utdanning/larling`) && Headers(`x-org-id`, `rogfk.no`)"
+      kind: Rule
+      services:
+        - name: fint-core-consumer-utdanning-larling
+          port: 8080

kustomize/overlays/api/rogfk-no/kafka-user-and-acl.yaml

@@ -0,0 +1,8 @@
+apiVersion: "fintlabs.no/v1alpha1"
+kind: KafkaUserAndAcl
+metadata:
+  name: fint-core-consumer-utdanning-larling
+spec:
+  acls:
+    - permission: admin
+      topic: "rogfk-no.fint-core.*"

kustomize/overlays/api/rogfk-no/kustomization.yaml

@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: rogfk-no
+resources:
+  - ../../../base
+patchesStrategicMerge:
+  - config-map.yaml
+  - kafka-user-and-acl.yaml
+  - ingress-route.yaml
+commonLabels:
+  app.kubernetes.io/name: fint-core-consumer-utdanning-larling
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_rogfk_no
+  app.kubernetes.io/version: latest
+  app.kubernetes.io/component: backend
+  app.kubernetes.io/part-of: fint-core
+  fintlabs.no/team: core
+  fintlabs.no/org-id: rogfk.no

kustomize/overlays/api/telemarkfylke-no/kustomization.yaml

@@ -9,7 +9,7 @@ patchesStrategicMerge:
   - ingress-route.yaml
 commonLabels:
   app.kubernetes.io/name: fint-core-consumer-utdanning-larling
-  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_telemarkfylke-no
+  app.kubernetes.io/instance: fint-core-consumer-utdanning-larling_telemarkfylke_no
   app.kubernetes.io/version: latest
   app.kubernetes.io/component: backend
   app.kubernetes.io/part-of: fint-core

kustomize/overlays/api/tffk-no/config-map.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fint-core-consumer-utdanning-larling
+data:
+  fint.consumer.org-id: 'tffk.no'
+  fint.kafka.topic.org-id: 'tffk.no'
+  spring.kafka.consumer.group-id: 'consumer-utdanning-larling-api'
+  fint.relations.default-base-url: 'https://api.felleskomponent.no'