diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 453e606..f00e889 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -52,53 +52,39 @@ jobs: packages: write strategy: matrix: - include: + org: + - afk-no + - bfk-no + - fintlabs-no + - innlandetfylke-no + - mrfylke-no + - nfk-no + - ofk-no + - telemarkfylke-no + - vestfoldfylke-no + - viken-no + - vlfk-no + - trondelagfylke-no + cluster: + - aks-beta-fint-2021-11-23 + - aks-api-fint-2022-02-08 + exclude: - org: fintlabs-no - cluster: aks-beta-fint-2021-11-23 - - - org: innlandetfylke-no - cluster: aks-api-fint-2022-02-08 - - org: innlandetfylke-no - cluster: aks-beta-fint-2021-11-23 - - - org: mrfylke-no - cluster: aks-api-fint-2022-02-08 - - org: mrfylke-no - cluster: aks-beta-fint-2021-11-23 - - - org: nfk-no - cluster: aks-api-fint-2022-02-08 - - org: nfk-no - cluster: aks-beta-fint-2021-11-23 - - - org: viken-no - cluster: aks-api-fint-2022-02-08 - - org: viken-no - cluster: aks-beta-fint-2021-11-23 - - - org: vlfk-no - cluster: aks-api-fint-2022-02-08 - - org: vlfk-no - cluster: aks-beta-fint-2021-11-23 - - - org: trondelagfylke-no cluster: aks-api-fint-2022-02-08 - - org: trondelagfylke-no - cluster: aks-beta-fint-2021-11-23 steps: - name: Checkout repository uses: actions/checkout@v4 - name: Get environment - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: environment with: script: return '${{ matrix.cluster }}'.split('-')[1] result-encoding: string - name: Get resource group name - uses: actions/github-script@v6 + uses: actions/github-script@v7 id: resource-group with: script: return 'rg-aks-${{ steps.environment.outputs.result }}' diff --git a/.github/workflows/MD.yaml b/.github/workflows/MD.yaml index 45d88c0..17fad9d 100644 --- a/.github/workflows/MD.yaml +++ b/.github/workflows/MD.yaml @@ -18,10 +18,15 @@ on: default: 'warning' type: choice options: + - afk-no + - bfk-no - fintlabs-no - innlandetfylke-no - mrfylke-no - nfk-no + - ofk-no + - telemarkfylke-no + - vestfoldfylke-no - viken-no - vlfk-no - trondelagfylke-no @@ -40,7 +45,7 @@ jobs: packages: write steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 name: Get resource group name id: rg with: @@ -49,7 +54,7 @@ jobs: return `rg-${a[0]}-${a[1]}` result-encoding: string - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 name: Get environment id: environment with: @@ -57,7 +62,7 @@ jobs: const a = '${{ inputs.cluster }}'.split('-') return `${a[1]}` result-encoding: string - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 name: Get auth id: auth with: diff --git a/kustomize/overlays/afk-no/api/kustomization.yaml b/kustomize/overlays/afk-no/api/kustomization.yaml new file mode 100644 index 0000000..9912a99 --- /dev/null +++ b/kustomize/overlays/afk-no/api/kustomization.yaml @@ -0,0 +1,31 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: afk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-data-service_afk_no + fintlabs.no/org-id: afk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "afk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "afk.no" + - op: replace + path: "/spec/url/basePath" + value: "/afk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/afk-no/api/intern/arkiv" + - op: replace + path: "/spec/env/1/value" + value: "afk.no, vigo.no" + target: + kind: Application + name: fint-flyt-data-service \ No newline at end of file diff --git a/kustomize/overlays/nfk-no/alpha/kustomization.yaml b/kustomize/overlays/afk-no/beta/kustomization.yaml similarity index 63% rename from kustomize/overlays/nfk-no/alpha/kustomization.yaml rename to kustomize/overlays/afk-no/beta/kustomization.yaml index 86610cd..7d6af6e 100644 --- a/kustomize/overlays/nfk-no/alpha/kustomization.yaml +++ b/kustomize/overlays/afk-no/beta/kustomization.yaml @@ -1,31 +1,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: nfk-no +namespace: afk-no resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_vlfk_no - fintlabs.no/org-id: vlfk.no + app.kubernetes.io/instance: fint-flyt-data-service_afk_no + fintlabs.no/org-id: afk.no patches: - patch: |- - op: replace path: "/spec/kafka/acls/0/topic" - value: "nfk-no.flyt.*" + value: "afk-no.flyt.*" - op: replace path: "/spec/orgId" - value: "vlfk.no" + value: "afk.no" - op: replace path: "/spec/url/basePath" - value: "/alpha/nfk-no" + value: "/beta/afk-no" - op: replace path: "/spec/ingress/basePath" - value: "/alpha/nfk-no/api/intern/arkiv" + value: "/beta/afk-no/api/intern/arkiv" - op: replace path: "/spec/env/1/value" - value: "vlfk.no, vigo.no" + value: "afk.no, vigo.no" target: kind: Application name: fint-flyt-data-service + diff --git a/kustomize/overlays/bfk-no/api/kustomization.yaml b/kustomize/overlays/bfk-no/api/kustomization.yaml new file mode 100644 index 0000000..222e099 --- /dev/null +++ b/kustomize/overlays/bfk-no/api/kustomization.yaml @@ -0,0 +1,31 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: bfk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-data-service_bfk_no + fintlabs.no/org-id: bfk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "bfk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "bfk.no" + - op: replace + path: "/spec/url/basePath" + value: "/bfk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/bfk-no/api/intern/arkiv" + - op: replace + path: "/spec/env/1/value" + value: "bfk.no, vigo.no" + target: + kind: Application + name: fint-flyt-data-service \ No newline at end of file diff --git a/kustomize/overlays/vlfk-no/alpha/kustomization.yaml b/kustomize/overlays/bfk-no/beta/kustomization.yaml similarity index 63% rename from kustomize/overlays/vlfk-no/alpha/kustomization.yaml rename to kustomize/overlays/bfk-no/beta/kustomization.yaml index b6ed2c3..e52192b 100644 --- a/kustomize/overlays/vlfk-no/alpha/kustomization.yaml +++ b/kustomize/overlays/bfk-no/beta/kustomization.yaml @@ -1,31 +1,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: vlfk-no +namespace: bfk-no resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_vlfk_no - fintlabs.no/org-id: vlfk.no + app.kubernetes.io/instance: fint-flyt-data-service_bfk_no + fintlabs.no/org-id: bfk.no patches: - patch: |- - op: replace path: "/spec/kafka/acls/0/topic" - value: "vlfk-no.flyt.*" + value: "bfk-no.flyt.*" - op: replace path: "/spec/orgId" - value: "vlfk.no" + value: "bfk.no" - op: replace path: "/spec/url/basePath" - value: "/alpha/vlfk-no" + value: "/beta/bfk-no" - op: replace path: "/spec/ingress/basePath" - value: "/alpha/vlfk-no/api/intern/arkiv" + value: "/beta/bfk-no/api/intern/arkiv" - op: replace path: "/spec/env/1/value" - value: "vlfk.no, vigo.no" + value: "bfk.no, vigo.no" target: kind: Application name: fint-flyt-data-service + diff --git a/kustomize/overlays/innlandetfylke-no/alpha/kustomization.yaml b/kustomize/overlays/innlandetfylke-no/alpha/kustomization.yaml deleted file mode 100644 index c5d1a67..0000000 --- a/kustomize/overlays/innlandetfylke-no/alpha/kustomization.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: innlandetfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_innlandetfylke_no - fintlabs.no/org-id: innlandetfylke.no - -patches: - - patch: |- - - op: replace - path: "/spec/kafka/acls/0/topic" - value: "innlandetfylke-no.flyt.*" - - op: replace - path: "/spec/orgId" - value: "innlandetfylke.no" - - op: replace - path: "/spec/url/basePath" - value: "/alpha/innlandetfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/alpha/innlandetfylke-no/api/intern/arkiv" - - op: replace - path: "/spec/env/1/value" - value: "innlandetfylke.no, vigo.no" - target: - kind: Application - name: fint-flyt-data-service diff --git a/kustomize/overlays/ofk-no/api/kustomization.yaml b/kustomize/overlays/ofk-no/api/kustomization.yaml new file mode 100644 index 0000000..fa3d030 --- /dev/null +++ b/kustomize/overlays/ofk-no/api/kustomization.yaml @@ -0,0 +1,31 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: ofk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-data-service_ofk_no + fintlabs.no/org-id: ofk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "ofk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "ofk.no" + - op: replace + path: "/spec/url/basePath" + value: "/ofk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/ofk-no/api/intern/arkiv" + - op: replace + path: "/spec/env/1/value" + value: "ofk.no, vigo.no" + target: + kind: Application + name: fint-flyt-data-service \ No newline at end of file diff --git a/kustomize/overlays/viken-no/alpha/kustomization.yaml b/kustomize/overlays/ofk-no/beta/kustomization.yaml similarity index 62% rename from kustomize/overlays/viken-no/alpha/kustomization.yaml rename to kustomize/overlays/ofk-no/beta/kustomization.yaml index 8fd7487..b50cf35 100644 --- a/kustomize/overlays/viken-no/alpha/kustomization.yaml +++ b/kustomize/overlays/ofk-no/beta/kustomization.yaml @@ -1,31 +1,31 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: viken-no +namespace: ofk-no resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_viken_no - fintlabs.no/org-id: viken.no + app.kubernetes.io/instance: fint-flyt-data-service_ofk_no + fintlabs.no/org-id: ofk.no patches: - patch: |- - op: replace path: "/spec/kafka/acls/0/topic" - value: "viken-no.flyt.*" + value: "ofk-no.flyt.*" - op: replace path: "/spec/orgId" - value: "viken.no" + value: "ofk.no" - op: replace path: "/spec/url/basePath" - value: "/alpha/viken-no" + value: "/beta/ofk-no" - op: replace path: "/spec/ingress/basePath" - value: "/alpha/viken-no/api/intern/arkiv" + value: "/beta/ofk-no/api/intern/arkiv" - op: replace path: "/spec/env/1/value" - value: "viken.no, vigo.no" + value: "ofk.no, vigo.no" target: kind: Application name: fint-flyt-data-service diff --git a/kustomize/overlays/telemarkfylke-no/api/kustomization.yaml b/kustomize/overlays/telemarkfylke-no/api/kustomization.yaml new file mode 100644 index 0000000..119d4f3 --- /dev/null +++ b/kustomize/overlays/telemarkfylke-no/api/kustomization.yaml @@ -0,0 +1,31 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: telemarkfylke-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-data-service_telemarkfylke_no + fintlabs.no/org-id: telemarkfylke.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "telemarkfylke-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "telemarkfylke.no" + - op: replace + path: "/spec/url/basePath" + value: "/telemarkfylke-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/telemarkfylke-no/api/intern/arkiv" + - op: replace + path: "/spec/env/1/value" + value: "telemarkfylke.no, vigo.no" + target: + kind: Application + name: fint-flyt-data-service \ No newline at end of file diff --git a/kustomize/overlays/fintlabs-no/alpha/kustomization.yaml b/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml similarity index 57% rename from kustomize/overlays/fintlabs-no/alpha/kustomization.yaml rename to kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml index 3c2c5e3..d07d4ab 100644 --- a/kustomize/overlays/fintlabs-no/alpha/kustomization.yaml +++ b/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml @@ -1,31 +1,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: fintlabs-no +namespace: telemarkfylke-no resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_fintlabs_no - fintlabs.no/org-id: fintlabs.no + app.kubernetes.io/instance: fint-flyt-data-service_telemarkfylke_no + fintlabs.no/org-id: telemarkfylke.no patches: - patch: |- - op: replace path: "/spec/kafka/acls/0/topic" - value: "fintlabs-no.flyt.*" + value: "telemarkfylke-no.flyt.*" - op: replace path: "/spec/orgId" - value: "fintlabs.no" + value: "telemarkfylke.no" - op: replace path: "/spec/url/basePath" - value: "/alpha/fintlabs-no" + value: "/beta/telemarkfylke-no" - op: replace path: "/spec/ingress/basePath" - value: "/alpha/fintlabs-no/api/intern/arkiv" + value: "/beta/telemarkfylke-no/api/intern/arkiv" - op: replace path: "/spec/env/1/value" - value: "fintlabs.no, vigo.no" + value: "telemarkfylke.no, vigo.no" target: kind: Application name: fint-flyt-data-service + diff --git a/kustomize/overlays/trondelagfylke-no/alpha/kustomization.yaml b/kustomize/overlays/trondelagfylke-no/alpha/kustomization.yaml deleted file mode 100644 index 1d4005f..0000000 --- a/kustomize/overlays/trondelagfylke-no/alpha/kustomization.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: trondelagfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_trondelagfylke_no - fintlabs.no/org-id: trondelagfylke.no - -patches: - - patch: |- - - op: replace - path: "/spec/kafka/acls/0/topic" - value: "trondelagfylke-no.flyt.*" - - op: replace - path: "/spec/orgId" - value: "trondelagfylke.no" - - op: replace - path: "/spec/url/basePath" - value: "/alpha/trondelagfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/alpha/trondelagfylke-no/api/intern/arkiv" - - op: replace - path: "/spec/env/1/value" - value: "trondelagfylke.no, vigo.no" - target: - kind: Application - name: fint-flyt-data-service diff --git a/kustomize/overlays/vestfoldfylke-no/api/kustomization.yaml b/kustomize/overlays/vestfoldfylke-no/api/kustomization.yaml new file mode 100644 index 0000000..4d1f282 --- /dev/null +++ b/kustomize/overlays/vestfoldfylke-no/api/kustomization.yaml @@ -0,0 +1,31 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: vestfoldfylke-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-data-service_vestfoldfylke_no + fintlabs.no/org-id: vestfoldfylke.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "vestfoldfylke-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "vestfoldfylke.no" + - op: replace + path: "/spec/url/basePath" + value: "/vestfoldfylke-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/vestfoldfylke-no/api/intern/arkiv" + - op: replace + path: "/spec/env/1/value" + value: "vestfoldfylke.no, vigo.no" + target: + kind: Application + name: fint-flyt-data-service \ No newline at end of file diff --git a/kustomize/overlays/mrfylke-no/alpha/kustomization.yaml b/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml similarity index 57% rename from kustomize/overlays/mrfylke-no/alpha/kustomization.yaml rename to kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml index 928b447..4f05d58 100644 --- a/kustomize/overlays/mrfylke-no/alpha/kustomization.yaml +++ b/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml @@ -1,31 +1,32 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: mrfylke-no +namespace: vestfoldfylke-no resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-data-service_vlfk_no - fintlabs.no/org-id: vlfk.no + app.kubernetes.io/instance: fint-flyt-data-service_vestfoldfylke_no + fintlabs.no/org-id: vestfoldfylke.no patches: - patch: |- - op: replace path: "/spec/kafka/acls/0/topic" - value: "mrfylke-no.flyt.*" + value: "vestfoldfylke-no.flyt.*" - op: replace path: "/spec/orgId" - value: "vlfk.no" + value: "vestfoldfylke.no" - op: replace path: "/spec/url/basePath" - value: "/alpha/mrfylke-no" + value: "/beta/vestfoldfylke-no" - op: replace path: "/spec/ingress/basePath" - value: "/alpha/mrfylke-no/api/intern/arkiv" + value: "/beta/vestfoldfylke-no/api/intern/arkiv" - op: replace path: "/spec/env/1/value" - value: "vlfk.no, vigo.no" + value: "vestfoldfylke.no, vigo.no" target: kind: Application name: fint-flyt-data-service +