fix: argo deps (#18822)

* chore: test fd 4

* remove check for pre release in deploy feature

* use single dir for namespaces and have it as a list

* add bff to deployed apps

* removed api deploy

* removed commented code and added set to remove dupes from list

* added a concurrency group to close and deploy feature

* chore: charts update dirty files

* concurrency tweeking for feature deployments

* reverted concurrency config

* removed concurrency

---------

Co-authored-by: andes-it <[email protected]>

Author: brynjarorng

.github/workflows/push.yml

@@ -463,7 +463,6 @@ jobs:
     if: ${{ !cancelled()
       && needs.pre-checks.result == 'success'
       && needs.pre-checks.outputs.PRE_CHECK == 'feature-deploy'
-      && !(needs.pre-checks.outputs.PRE_RELEASE == 'true')
       && needs.helm-docker-build.result != 'failure'
       && needs.prepare.outputs.IMAGES != ''
       && needs.docker-build.result == 'success' }}

charts/islandis-services/services-payments/values.prod.yaml

@@ -29,6 +29,7 @@ env:
   IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/payments'
   IDENTITY_SERVER_ISSUER_URL: 'https://innskra.island.is'
   LOG_LEVEL: 'info'
+  NATIONAL_REGISTRY_B2C_APPLICATION_PATH: 'IS/GOV/6503760649/SKRA-Cloud-Protected/MidlunUmsoknir-v1'
   NATIONAL_REGISTRY_B2C_APPLICATION_SCOPE: 'https://skraidentity.onmicrosoft.com/midlunumsoknir/.default'
   NATIONAL_REGISTRY_B2C_CLIENT_ID: '2304d7ca-7ed3-4188-8b6d-e1b7e0e3df7f'
   NATIONAL_REGISTRY_B2C_ENDPOINT: 'https://skraidentity.b2clogin.com/skraidentity.onmicrosoft.com/b2c_1_midlun_flow/oauth2/v2.0/token'

charts/islandis-services/services-payments/values.staging.yaml

@@ -29,6 +29,7 @@ env:
   IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/payments'
   IDENTITY_SERVER_ISSUER_URL: 'https://identity-server.staging01.devland.is'
   LOG_LEVEL: 'info'
+  NATIONAL_REGISTRY_B2C_APPLICATION_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/MidlunUmsoknir-v1'
   NATIONAL_REGISTRY_B2C_APPLICATION_SCOPE: 'https://skraidentitystaging.onmicrosoft.com/midlunumsoknir/.default'
   NATIONAL_REGISTRY_B2C_CLIENT_ID: 'ca128c23-b43c-443d-bade-ec5a146a933f'
   NATIONAL_REGISTRY_B2C_ENDPOINT: 'https://skraidentitystaging.b2clogin.com/skraidentitystaging.onmicrosoft.com/b2c_1_midlun_flow/oauth2/v2.0/token'

charts/islandis/values.prod.yaml

@@ -2590,6 +2590,7 @@ services-payments:
     IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/payments'
     IDENTITY_SERVER_ISSUER_URL: 'https://innskra.island.is'
     LOG_LEVEL: 'info'
+    NATIONAL_REGISTRY_B2C_APPLICATION_PATH: 'IS/GOV/6503760649/SKRA-Cloud-Protected/MidlunUmsoknir-v1'
     NATIONAL_REGISTRY_B2C_APPLICATION_SCOPE: 'https://skraidentity.onmicrosoft.com/midlunumsoknir/.default'
     NATIONAL_REGISTRY_B2C_CLIENT_ID: '2304d7ca-7ed3-4188-8b6d-e1b7e0e3df7f'
     NATIONAL_REGISTRY_B2C_ENDPOINT: 'https://skraidentity.b2clogin.com/skraidentity.onmicrosoft.com/b2c_1_midlun_flow/oauth2/v2.0/token'

charts/islandis/values.staging.yaml

@@ -2453,6 +2453,7 @@ services-payments:
     IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/payments'
     IDENTITY_SERVER_ISSUER_URL: 'https://identity-server.staging01.devland.is'
     LOG_LEVEL: 'info'
+    NATIONAL_REGISTRY_B2C_APPLICATION_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/MidlunUmsoknir-v1'
     NATIONAL_REGISTRY_B2C_APPLICATION_SCOPE: 'https://skraidentitystaging.onmicrosoft.com/midlunumsoknir/.default'
     NATIONAL_REGISTRY_B2C_CLIENT_ID: 'ca128c23-b43c-443d-bade-ec5a146a933f'
     NATIONAL_REGISTRY_B2C_ENDPOINT: 'https://skraidentitystaging.b2clogin.com/skraidentitystaging.onmicrosoft.com/b2c_1_midlun_flow/oauth2/v2.0/token'

infra/src/feature-env.ts

@@ -216,10 +216,19 @@ yargs(process.argv.slice(2))
 
       const affectedServiceNames = affectedServices.map((svc) => svc.name())
 
-      const formattedStringList = featureYaml.map((svc) => svc.name()).filter((name) => !affectedServiceNames.includes(name)).toString()
+      const formattedList = featureYaml.map((svc) => svc.name()).filter((name) => !affectedServiceNames.includes(name))
+
+      // BFF hack since the service name is not equal to the nx app name
+      const correctedFormattedList = Array.from(new Set(formattedList.map((name) => {
+        if (name.includes("services-bff-portals")) {
+          return "services-bff"
+        } else {
+          return name
+        }
+      }))).toString()
 
       writeToOutput(
-        formattedStringList,
+        correctedFormattedList,
         typedArgv.output,
       )
     },

scripts/ci/docker/feature-deploy-bootstrap.mjs

@@ -22,15 +22,12 @@ async function main() {
     )
   }
 
-  const namespacesToAdd = {}
+  const namespacesToAdd = new Set()
   const directory = `charts/features/deployments/${featureName}`
 
   const files = await glob(`${directory}/**/values.yaml`)
 
   for (const file of files) {
-    const applicationDirname = path.dirname(file)
-    let applicationName = applicationDirname.split('/').slice(-1)[0]
-
     const textContent = readFileSync(file, 'utf8')
     const yamlContent = await jsyaml.load(textContent)
     const namespaceToAdd =
@@ -41,25 +38,21 @@ async function main() {
         : null
 
     if (namespaceToAdd) {
-      namespacesToAdd[applicationName] ??= []
-      namespacesToAdd[applicationName] = Array.from(
-        new Set([...namespacesToAdd[applicationName], namespaceToAdd]),
-      )
+      namespacesToAdd.add(namespaceToAdd)
     }
   }
 
   console.log('Namespaces to add:', namespacesToAdd)
 
-  for (const key of Object.keys(namespacesToAdd)) {
-    const directoryPath = path.join(directory, key)
-    mkdirSync(directory, { recursive: true })
-    const content = {
-      namespaces: namespacesToAdd[key],
-    }
-    writeFileSync(
-      `${directoryPath}/values.bootstrap.yaml`,
-      jsyaml.dump(content),
-      { encoding: 'utf-8' },
-    )
+  const directoryPath =  path.join(directory, "bootstrap")
+  mkdirSync(directoryPath, { recursive: true })
+
+  const content = {
+    namespaces: Array.from(namespacesToAdd),
   }
+  writeFileSync(
+    `${directoryPath}/values.bootstrap.yaml`,
+    jsyaml.dump(content),
+    { encoding: 'utf-8' },
+  )
 }