diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml index 9718b0f..14fe994 100644 --- a/.github/workflows/deploy_with_github_runner.yml +++ b/.github/workflows/deploy_with_github_runner.yml @@ -82,34 +82,34 @@ jobs: runner_name: ${{ needs.create_runner.outputs.runner_name }} pat_token: ${{ secrets.BOT_TOKEN_GITHUB }} - update_openapi: - needs: [ deploy ] - runs-on: ubuntu-latest - name: Update OpenAPI - if: ${{ inputs.target == inputs.environment || inputs.target == 'all' }} - environment: ${{ inputs.environment }} - steps: - - name: Checkout - id: checkout - # from https://github.com/actions/checkout/commits/main - uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 - with: - persist-credentials: false - - - name: Setup Terraform - # from https://github.com/hashicorp/setup-terraform/commits/main - uses: hashicorp/setup-terraform@8feba2b913ea459066180f9cb177f58a881cf146 - with: - terraform_version: "1.3.6" - - - name: Login - id: login - # from https://github.com/Azure/login/commits/master - uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 - with: - client-id: ${{ secrets.CLIENT_ID }} - tenant-id: ${{ secrets.TENANT_ID }} - subscription-id: ${{ secrets.SUBSCRIPTION_ID }} +# update_openapi: +# needs: [ deploy ] +# runs-on: ubuntu-latest +# name: Update OpenAPI +# if: ${{ inputs.target == inputs.environment || inputs.target == 'all' }} +# environment: ${{ inputs.environment }} +# steps: +# - name: Checkout +# id: checkout +# # from https://github.com/actions/checkout/commits/main +# uses: actions/checkout@1f9a0c22da41e6ebfa534300ef656657ea2c6707 +# with: +# persist-credentials: false +# +# - name: Setup Terraform +# # from https://github.com/hashicorp/setup-terraform/commits/main +# uses: hashicorp/setup-terraform@8feba2b913ea459066180f9cb177f58a881cf146 +# with: +# terraform_version: "1.3.6" +# +# - name: Login +# id: login +# # from https://github.com/Azure/login/commits/master +# uses: azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 +# with: +# client-id: ${{ secrets.CLIENT_ID }} +# tenant-id: ${{ secrets.TENANT_ID }} +# subscription-id: ${{ secrets.SUBSCRIPTION_ID }} - name: Terraform Apply diff --git a/helm/Chart.lock b/helm/Chart.lock index 45b4a6f..3d669a6 100644 --- a/helm/Chart.lock +++ b/helm/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: microservice-chart repository: https://pagopa.github.io/aks-microservice-chart-blueprint - version: 1.21.0 -digest: sha256:e3deccb7ac0b5d85af0c726f28316ebe7a3795cbf54522330c33474b0bae309a -generated: "2022-09-08T16:47:27.366487+02:00" + version: 2.4.0 +digest: sha256:db3f9abdcf9a458c7dc3ae6f5ace7292293cbf05a4ca398c4173807f9d14c561 +generated: "2024-04-09T12:12:19.912758+02:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index e59fe36..b02322d 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 name: pagopa-reporting-orgs-enrollment -description: Microservice that handles the reporting organizations enrollment +description: Microservice that handles the GPD reporting organizations enrollment type: application -version: 0.7.0 -appVersion: 0.1.6 +version: 0.11.0 +appVersion: 0.1.6-4-PAGOPA-1668-update-gpd-reporting-chart dependencies: - name: microservice-chart - version: 1.21.0 + version: 2.4.0 repository: "https://pagopa.github.io/aks-microservice-chart-blueprint" diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 330d85f..404f141 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-reporting-orgs-enrollment - tag: "0.1.6" + tag: "0.1.6-4-PAGOPA-1668-update-gpd-reporting-chart" pullPolicy: Always livenessProbe: httpGet: @@ -25,11 +25,13 @@ microservice-chart: service: create: true type: ClusterIP - port: 8080 + ports: + - 8080 ingress: create: true host: "weudev.gps.internal.dev.platform.pagopa.it" path: /pagopa-gpd-reporting-orgs-enrollment/(.*) + servicePort: 8080 serviceAccount: create: false annotations: {} @@ -72,8 +74,17 @@ microservice-chart: tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" nodeSelector: {} tolerations: [] - affinity: {} + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node_type + operator: In + values: + - "user" canaryDelivery: deployment: image: tag: 0.1.6 + create: false diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index b304091..7ea1206 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-reporting-orgs-enrollment - tag: "0.1.6" + tag: "0.1.6-4-PAGOPA-1668-update-gpd-reporting-chart" pullPolicy: Always livenessProbe: httpGet: @@ -25,11 +25,13 @@ microservice-chart: service: create: true type: ClusterIP - port: 8080 + ports: + - 8080 ingress: create: true host: "weuprod.gps.internal.platform.pagopa.it" path: /pagopa-gpd-reporting-orgs-enrollment/(.*) + servicePort: 8080 serviceAccount: create: false annotations: {} @@ -49,8 +51,8 @@ microservice-chart: cpu: "0.25" autoscaling: enable: true - minReplica: 3 - maxReplica: 10 + minReplica: 1 + maxReplica: 5 pollingInterval: 10 # seconds cooldownPeriod: 50 # seconds triggers: @@ -72,8 +74,17 @@ microservice-chart: tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" nodeSelector: {} tolerations: [] - affinity: {} + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node_type + operator: In + values: + - "user" canaryDelivery: deployment: image: tag: 0.1.6 + create: false diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 0e309ac..bbfa228 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-reporting-orgs-enrollment - tag: "0.1.6" + tag: "0.1.6-4-PAGOPA-1668-update-gpd-reporting-chart" pullPolicy: Always livenessProbe: httpGet: @@ -25,11 +25,13 @@ microservice-chart: service: create: true type: ClusterIP - port: 8080 + ports: + - 8080 ingress: create: true host: "weuuat.gps.internal.uat.platform.pagopa.it" path: /pagopa-gpd-reporting-orgs-enrollment/(.*) + servicePort: 8080 serviceAccount: create: false annotations: {} @@ -49,8 +51,8 @@ microservice-chart: cpu: "0.25" autoscaling: enable: true - minReplica: 3 - maxReplica: 10 + minReplica: 1 + maxReplica: 3 pollingInterval: 10 # seconds cooldownPeriod: 50 # seconds triggers: @@ -72,8 +74,17 @@ microservice-chart: tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" nodeSelector: {} tolerations: [] - affinity: {} + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node_type + operator: In + values: + - "user" canaryDelivery: deployment: image: tag: 0.1.6 + create: false diff --git a/openapi/openapi.json b/openapi/openapi.json index 79afe97..e189c92 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "title": "PagoPA API - Reporting Organizations Enrollments", "description": "Reporting orgs enrollment project", "termsOfService": "https://www.pagopa.gov.it/", - "version": "0.1.6" + "version": "0.1.6-4-PAGOPA-1668-update-gpd-reporting-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index c4dbb6a..8e07934 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa ReportingOrgsEnrollment - 0.1.6 + 0.1.6-4-PAGOPA-1668-update-gpd-reporting-chart PagoPA API - Reporting Organizations Enrollments Reporting orgs enrollment project