diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml index 0064826..41cff54 100644 --- a/.github/workflows/CD.yaml +++ b/.github/workflows/CD.yaml @@ -32,7 +32,7 @@ jobs: uses: docker/metadata-action@v5 id: meta with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" tags: type=sha,enable=true,priority=100,prefix=shaF-,suffix=,format=short - name: Build and push Docker image @@ -75,6 +75,28 @@ jobs: exclude: - org: fintlabs-no cluster: aks-api-fint-2022-02-08 + - org: afk-no + cluster: aks-beta-fint-2021-11-23 + - org: agderfk-no + cluster: aks-beta-fint-2021-11-23 + - org: bfk-no + cluster: aks-beta-fint-2021-11-23 + - org: ffk-no + cluster: aks-beta-fint-2021-11-23 + - org: innlandetfylke-no + cluster: aks-beta-fint-2021-11-23 + - org: mrfylke-no + cluster: aks-beta-fint-2021-11-23 + - org: nfk-no + cluster: aks-beta-fint-2021-11-23 + - org: rogfk-no + cluster: aks-beta-fint-2021-11-23 + - org: telemarkfylke-no + cluster: aks-beta-fint-2021-11-23 + - org: tromsfylke-no + cluster: aks-beta-fint-2021-11-23 + - org: vestfoldfylke-no + cluster: aks-beta-fint-2021-11-23 steps: - name: Checkout repository diff --git a/.github/workflows/MD.yaml b/.github/workflows/MD.yaml index f8cb584..7489813 100644 --- a/.github/workflows/MD.yaml +++ b/.github/workflows/MD.yaml @@ -93,7 +93,7 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + images: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}" tags: | type=sha,enable=true,priority=100,prefix=sha-,suffix=,format=short diff --git a/kustomize/overlays/afk-no/beta/acos-oauth2-client.yaml b/kustomize/overlays/afk-no/beta/acos-oauth2-client.yaml deleted file mode 100644 index 480a5c8..0000000 --- a/kustomize/overlays/afk-no/beta/acos-oauth2-client.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: "fintlabs.no/v1alpha1" -kind: NamOAuthClientApplicationResource -metadata: - name: fint-flyt-acos-oauth2-client -spec: - clientIdProperty: fint.flyt.acos.sso.client-id - clientSecretProperty: fint.flyt.acos.sso.client-secret - grantTypes: - - client_credentials \ No newline at end of file diff --git a/kustomize/overlays/afk-no/beta/kustomization.yaml b/kustomize/overlays/afk-no/beta/kustomization.yaml deleted file mode 100644 index aa6ba87..0000000 --- a/kustomize/overlays/afk-no/beta/kustomization.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: afk-no - -resources: - - ../../../base - - acos-oauth2-client.yaml - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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: "/beta/afk-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/afk-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "afk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], - "viken.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"] - } - - op: add - path: "/spec/envFrom/0" - value: - secretRef: - name: fint-flyt-acos-oauth2-client - target: - kind: Application - name: fint-flyt-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/agderfk-no/beta/kustomization.yaml b/kustomize/overlays/agderfk-no/beta/kustomization.yaml deleted file mode 100644 index c3c4e25..0000000 --- a/kustomize/overlays/agderfk-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: agderfk-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - 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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/bfk-no/beta/acos-oauth2-client.yaml b/kustomize/overlays/bfk-no/beta/acos-oauth2-client.yaml deleted file mode 100644 index 480a5c8..0000000 --- a/kustomize/overlays/bfk-no/beta/acos-oauth2-client.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: "fintlabs.no/v1alpha1" -kind: NamOAuthClientApplicationResource -metadata: - name: fint-flyt-acos-oauth2-client -spec: - clientIdProperty: fint.flyt.acos.sso.client-id - clientSecretProperty: fint.flyt.acos.sso.client-secret - grantTypes: - - client_credentials \ No newline at end of file diff --git a/kustomize/overlays/bfk-no/beta/kustomization.yaml b/kustomize/overlays/bfk-no/beta/kustomization.yaml deleted file mode 100644 index a94bc54..0000000 --- a/kustomize/overlays/bfk-no/beta/kustomization.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: bfk-no - -resources: - - ../../../base - - acos-oauth2-client.yaml - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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: "/beta/bfk-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/bfk-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "bfk.no":["https://role-catalog.vigoiks.no/vigo/flyt/user"], - "viken.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"] - } - - op: add - path: "/spec/envFrom/0" - value: - secretRef: - name: fint-flyt-acos-oauth2-client - target: - kind: Application - name: fint-flyt-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/ffk-no/beta/kustomization.yaml b/kustomize/overlays/ffk-no/beta/kustomization.yaml deleted file mode 100644 index ff4f156..0000000 --- a/kustomize/overlays/ffk-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: ffk-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-service_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/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - 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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/innlandetfylke-no/beta/kustomization.yaml b/kustomize/overlays/innlandetfylke-no/beta/kustomization.yaml deleted file mode 100644 index 9c1e0ad..0000000 --- a/kustomize/overlays/innlandetfylke-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: innlandetfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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: "/beta/innlandetfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/innlandetfylke-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "innlandetfylke.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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/mrfylke-no/beta/kustomization.yaml b/kustomize/overlays/mrfylke-no/beta/kustomization.yaml deleted file mode 100644 index 14c7663..0000000 --- a/kustomize/overlays/mrfylke-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: mrfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-service_mrfylke_no - fintlabs.no/org-id: mrfylke.no - -patches: - - patch: |- - - op: replace - path: "/spec/kafka/acls/0/topic" - value: "mrfylke-no.flyt.*" - - op: replace - path: "/spec/orgId" - value: "mrfylke.no" - - op: replace - path: "/spec/url/basePath" - value: "/beta/mrfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/mrfylke-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "mrfylke.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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/nfk-no/beta/kustomization.yaml b/kustomize/overlays/nfk-no/beta/kustomization.yaml deleted file mode 100644 index d9108f5..0000000 --- a/kustomize/overlays/nfk-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: nfk-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-service_nfk_no - fintlabs.no/org-id: nfk.no - -patches: - - patch: |- - - op: replace - path: "/spec/kafka/acls/0/topic" - value: "nfk-no.flyt.*" - - op: replace - path: "/spec/orgId" - value: "nfk.no" - - op: replace - path: "/spec/url/basePath" - value: "/beta/nfk-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/nfk-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "nfk.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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/rogfk-no/beta/kustomization.yaml b/kustomize/overlays/rogfk-no/beta/kustomization.yaml deleted file mode 100644 index a8d4cfb..0000000 --- a/kustomize/overlays/rogfk-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: rogfk-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-service_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/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - 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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml b/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml deleted file mode 100644 index 7f0f121..0000000 --- a/kustomize/overlays/telemarkfylke-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: telemarkfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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: "/beta/telemarkfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/telemarkfylke-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "telemarkfylke.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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/tromsfylke-no/beta/kustomization.yaml b/kustomize/overlays/tromsfylke-no/beta/kustomization.yaml deleted file mode 100644 index 3a0336f..0000000 --- a/kustomize/overlays/tromsfylke-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: tromsfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-service_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/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - 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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/trondelagfylke-no/beta/kustomization.yaml b/kustomize/overlays/trondelagfylke-no/beta/kustomization.yaml index 196f363..e69de29 100644 --- a/kustomize/overlays/trondelagfylke-no/beta/kustomization.yaml +++ b/kustomize/overlays/trondelagfylke-no/beta/kustomization.yaml @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: trondelagfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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: "/beta/trondelagfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/trondelagfylke-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "trondelagfylke.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-authorization-service \ No newline at end of file diff --git a/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml b/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml deleted file mode 100644 index 5865e70..0000000 --- a/kustomize/overlays/vestfoldfylke-no/beta/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: vestfoldfylke-no - -resources: - - ../../../base - -commonLabels: - app.kubernetes.io/instance: fint-flyt-authorization-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: "/beta/vestfoldfylke-no" - - op: replace - path: "/spec/ingress/basePath" - value: "/beta/vestfoldfylke-no/api/intern/authorization" - - op: replace - path: "/spec/onePassword/itemPath" - value: "vaults/aks-beta-vault/items/fint-flyt-egrunnerverv-oauth2-client" - - op: replace - path: "/spec/env/1/value" - value: | - { - "vestfoldfylke.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-authorization-service \ No newline at end of file