fix

pagopa · Jun 25, 2024 · 3cf1de6 · 3cf1de6
2 parents 978ac57 + 1360e3e
commit 3cf1de6
Show file tree

Hide file tree

Showing 10 changed files with 3,493 additions and 12,144 deletions.
diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml
@@ -31,6 +31,13 @@ parameters:
   - name: APP_SERVICE_RESOURCE_GROUP
     displayName: App Service Resource Group
     type: string
+  - name: DOMAIN
+    displayName: App Service Resource Group
+    type: string
+    default: weu-shared
+    values:
+      - weu-shared
+      - itn-printit
 
 
 
@@ -40,22 +47,34 @@ variables:
     #    RESOURCE_GROUP: $(DEV_WEB_APP_RESOURCE_GROUP_NAME)
     # APP_NAME: $(DEV_WEB_APP_NAME)
     STAGE: "d"
-    dockerRegistryServiceConnection: $(DEV_CONTAINER_REGISTRY_SERVICE_CONN)
-    dockerNamespace: $(DEV_CONTAINER_NAMESPACE)
+    ${{ if eq(parameters['DOMAIN'], 'weu-shared') }}:
+      dockerRegistryServiceConnection: $(DEV_CONTAINER_REGISTRY_SERVICE_CONN)
+      dockerNamespace: $(DEV_CONTAINER_NAMESPACE)
+    ${{ if eq(parameters['DOMAIN'], 'itn-printit') }}:
+      dockerRegistryServiceConnection: $(ITN_DEV_CONTAINER_REGISTRY_SERVICE_CONN)
+      dockerNamespace: $(ITN_DEV_CONTAINER_NAMESPACE)
   ${{ if eq(parameters['ENV'], 'uat') }}:
     AZURE_SUBSCRIPTION: $(UAT_AZURE_SUBSCRIPTION)
     #    RESOURCE_GROUP: $(UAT_WEB_APP_RESOURCE_GROUP_NAME)
     # APP_NAME: $(UAT_WEB_APP_NAME)
     STAGE: "u"
-    dockerRegistryServiceConnection: $(UAT_CONTAINER_REGISTRY_SERVICE_CONN)
-    dockerNamespace: $(UAT_CONTAINER_NAMESPACE)
+    ${{ if eq(parameters['DOMAIN'], 'weu-shared') }}:
+      dockerRegistryServiceConnection: $(UAT_CONTAINER_REGISTRY_SERVICE_CONN)
+      dockerNamespace: $(UAT_CONTAINER_NAMESPACE)
+    ${{ if eq(parameters['DOMAIN'], 'itn-printit') }}:
+      dockerRegistryServiceConnection: $(ITN_UAT_CONTAINER_REGISTRY_SERVICE_CONN)
+      dockerNamespace: $(ITN_UAT_CONTAINER_NAMESPACE)
   ${{ if eq(parameters['ENV'], 'prod') }}:
     AZURE_SUBSCRIPTION: $(PROD_AZURE_SUBSCRIPTION)
     #    RESOURCE_GROUP: $(PROD_WEB_APP_RESOURCE_GROUP_NAME)
     # APP_NAME: $(PROD_WEB_APP_NAME)
     STAGE: "p"
-    dockerRegistryServiceConnection: $(PROD_CONTAINER_REGISTRY_SERVICE_CONN)
-    dockerNamespace: $(PROD_CONTAINER_NAMESPACE)
+    ${{ if eq(parameters['DOMAIN'], 'weu-shared') }}:
+      dockerRegistryServiceConnection: $(PROD_CONTAINER_REGISTRY_SERVICE_CONN)
+      dockerNamespace: $(PROD_CONTAINER_NAMESPACE)
+    ${{ if eq(parameters['DOMAIN'], 'itn-printit') }}:
+      dockerRegistryServiceConnection: $(ITN_PROD_CONTAINER_REGISTRY_SERVICE_CONN)
+      dockerNamespace: $(ITN_PROD_CONTAINER_NAMESPACE)
   ${{ if eq(variables['Build.SourceBranchName'], 'merge') }}:
     SOURCE_BRANCH: "main" # force to main branch
   ${{ if ne(variables['Build.SourceBranchName'], 'merge') }}:

diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
@@ -137,6 +137,7 @@ jobs:
                 "TYPE": "node",
                 "APP_SERVICE_NAME": "pagopa-${{ env.SHORT_ENV }}-${{inputs.domain}}-app-pdf-engine${{ env.SHORT_ENV == 'prod' && '-ha' || '' }}",
                 "APP_SERVICE_RESOURCE_GROUP": "pagopa-${{ env.SHORT_ENV }}-${{inputs.domain}}-pdf-engine-rg",
+                "DOMAIN": "${{inputs.domain}}"
             }
           azure-pipeline-variables: '{"system.debug": "true"}'
 

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopapdfengine
 description: Microservice description
 type: application
-version: 0.119.0
-appVersion: 2.10.9
+version: 0.122.0
+appVersion: 2.10.13
 dependencies:
   - name: microservice-chart
     version: 2.4.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-pdf-engine
-    tag: "2.10.9"
+    tag: "2.10.13"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-pdf-engine
-    tag: "2.10.9"
+    tag: "2.10.13"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: ghcr.io/pagopa/pagopa-pdf-engine
-    tag: "2.10.9"
+    tag: "2.10.13"
     pullPolicy: Always
   # https://github.com/Azure/azure-functions-host/blob/dev/src/WebJobs.Script.WebHost/Controllers/HostController.cs
   livenessProbe: