diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 6d85b06..0064826 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -19,7 +19,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Login to Docker Hub uses: docker/login-action@v3 @@ -54,16 +54,21 @@ jobs: matrix: org: - afk-no + - agderfk-no - bfk-no + - ffk-no - fintlabs-no - innlandetfylke-no - mrfylke-no - nfk-no - ofk-no + - rogfk-no - telemarkfylke-no + - tromsfylke-no + - trondelagfylke-no - vestfoldfylke-no - vlfk-no - - trondelagfylke-no + cluster: - aks-beta-fint-2021-11-23 - aks-api-fint-2022-02-08 diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index aac574e..9ac0aa1 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -11,14 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@main + uses: actions/checkout@v4 - name: Get repo name id: get_repo run: echo "REPO=${GITHUB_REPOSITORY#*/}" >> $GITHUB_OUTPUT - name: Setup Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: '17' @@ -38,14 +38,14 @@ jobs: cp ./build/libs/${GITHUB_REPOSITORY#*/}-*.jar ./data/app.jar - name: Upload Build Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{steps.get_repo.outputs.REPO}} path: ./data/app.jar - name: Trigger CD if: github.ref == 'refs/heads/main' - uses: peter-evans/repository-dispatch@v2 + uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.GITHUBACTION_TOKEN }} repository: ${{ github.repository }} diff --git a/.github/workflows/MD.yaml b/.github/workflows/MD.yaml index 198ce22..f8cb584 100644 --- a/.github/workflows/MD.yaml +++ b/.github/workflows/MD.yaml @@ -19,16 +19,20 @@ on: type: choice options: - afk-no + - agderfk-no - bfk-no + - ffk-no - fintlabs-no - innlandetfylke-no - mrfylke-no - nfk-no - ofk-no + - rogfk-no - telemarkfylke-no + - tromsfylke-no + - trondelagfylke-no - vestfoldfylke-no - vlfk-no - - trondelagfylke-no env: REGISTRY: ghcr.io diff --git a/kustomize/overlays/agderfk-no/api/kustomization.yaml b/kustomize/overlays/agderfk-no/api/kustomization.yaml new file mode 100644 index 0000000..3256b5a --- /dev/null +++ b/kustomize/overlays/agderfk-no/api/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: agderfk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_agderfk_no + fintlabs.no/org-id: agderfk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "agderfk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "agderfk.no" + - op: replace + path: "/spec/url/basePath" + value: "/agderfk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/agderfk-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "agderfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/agderfk-no/beta/kustomization.yaml b/kustomize/overlays/agderfk-no/beta/kustomization.yaml new file mode 100644 index 0000000..967f26f --- /dev/null +++ b/kustomize/overlays/agderfk-no/beta/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: agderfk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_agderfk_no + fintlabs.no/org-id: agderfk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "agderfk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "agderfk.no" + - op: replace + path: "/spec/url/basePath" + value: "/beta/agderfk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/beta/agderfk-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "agderfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/ffk-no/api/kustomization.yaml b/kustomize/overlays/ffk-no/api/kustomization.yaml new file mode 100644 index 0000000..7b12ba3 --- /dev/null +++ b/kustomize/overlays/ffk-no/api/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: ffk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_ffk_no + fintlabs.no/org-id: ffk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "ffk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "ffk.no" + - op: replace + path: "/spec/url/basePath" + value: "/ffk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/ffk-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "ffk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/ffk-no/beta/kustomization.yaml b/kustomize/overlays/ffk-no/beta/kustomization.yaml new file mode 100644 index 0000000..6f2ead5 --- /dev/null +++ b/kustomize/overlays/ffk-no/beta/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: ffk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_ffk_no + fintlabs.no/org-id: ffk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "ffk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "ffk.no" + - op: replace + path: "/spec/url/basePath" + value: "/beta/ffk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/beta/ffk-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "ffk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/rogfk-no/api/kustomization.yaml b/kustomize/overlays/rogfk-no/api/kustomization.yaml new file mode 100644 index 0000000..8247280 --- /dev/null +++ b/kustomize/overlays/rogfk-no/api/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: rogfk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_rogfk_no + fintlabs.no/org-id: rogfk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "rogfk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "rogfk.no" + - op: replace + path: "/spec/url/basePath" + value: "/rogfk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/rogfk-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "rogfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/rogfk-no/beta/kustomization.yaml b/kustomize/overlays/rogfk-no/beta/kustomization.yaml new file mode 100644 index 0000000..d04c85f --- /dev/null +++ b/kustomize/overlays/rogfk-no/beta/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: rogfk-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_rogfk_no + fintlabs.no/org-id: rogfk.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "rogfk-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "rogfk.no" + - op: replace + path: "/spec/url/basePath" + value: "/beta/rogfk-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/beta/rogfk-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "rogfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/tromsfylke-no/api/kustomization.yaml b/kustomize/overlays/tromsfylke-no/api/kustomization.yaml new file mode 100644 index 0000000..622be0b --- /dev/null +++ b/kustomize/overlays/tromsfylke-no/api/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: tromsfylke-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_tromsfylke_no + fintlabs.no/org-id: tromsfylke.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "tromsfylke-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "tromsfylke.no" + - op: replace + path: "/spec/url/basePath" + value: "/tromsfylke-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/tromsfylke-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "tromsfylke.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service + diff --git a/kustomize/overlays/tromsfylke-no/beta/kustomization.yaml b/kustomize/overlays/tromsfylke-no/beta/kustomization.yaml new file mode 100644 index 0000000..0dbf968 --- /dev/null +++ b/kustomize/overlays/tromsfylke-no/beta/kustomization.yaml @@ -0,0 +1,38 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: tromsfylke-no + +resources: + - ../../../base + +commonLabels: + app.kubernetes.io/instance: fint-flyt-history-service_tromsfylke_no + fintlabs.no/org-id: tromsfylke.no + +patches: + - patch: |- + - op: replace + path: "/spec/kafka/acls/0/topic" + value: "tromsfylke-no.flyt.*" + - op: replace + path: "/spec/orgId" + value: "tromsfylke.no" + - op: replace + path: "/spec/url/basePath" + value: "/beta/tromsfylke-no" + - op: replace + path: "/spec/ingress/basePath" + value: "/beta/tromsfylke-no/api/intern/historikk" + - op: replace + path: "/spec/env/1/value" + value: | + { + "tromsfylke.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], + "vigo.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"], + "novari.no":["https://role-catalog.vigoiks.no/vigo/flyt/developer"] + } + + target: + kind: Application + name: fint-flyt-history-service +