From 2140b8be4a7c187ea5332fc023d3fd60094317de Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 11 Sep 2023 15:27:36 +0200 Subject: [PATCH 01/29] new chart --- .../workflows/deploy_with_github_runner.yml | 11 +-- .github/workflows/release_deploy.yml | 74 ++++++++++++------- helm/Chart.yaml | 2 +- 3 files changed, 50 insertions(+), 37 deletions(-) diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml index f7f7df5b..2b9a8ef0 100644 --- a/.github/workflows/deploy_with_github_runner.yml +++ b/.github/workflows/deploy_with_github_runner.yml @@ -7,14 +7,10 @@ on: required: true description: The name of the environment where to deploy type: string - target: - required: true - description: The environment target of the job - type: string env: NAMESPACE: apiconfig - APP_NAME: apiconfig-selfcare-integration + APP_NAME: pagopaapiconfig permissions: @@ -27,7 +23,6 @@ jobs: runs-on: ubuntu-22.04 environment: name: ${{ inputs.environment }} - if: ${{ inputs.target == inputs.environment || inputs.target == 'all' }} outputs: runner_name: ${{ steps.create_github_runner.outputs.runner_name }} steps: @@ -42,12 +37,10 @@ jobs: container_app_environment_name: ${{ vars.CONTAINER_APP_ENVIRONMENT_NAME }} resource_group_name: ${{ vars.CONTAINER_APP_ENVIRONMENT_RESOURCE_GROUP_NAME }} # RG of the runner pat_token: ${{ secrets.BOT_TOKEN_GITHUB }} - self_hosted_runner_image_tag: "v1.4.1" deploy: needs: [ create_runner ] runs-on: [ self-hosted, "${{ needs.create_runner.outputs.runner_name }}" ] - if: ${{ inputs.target == inputs.environment || inputs.target == 'all' }} name: Deploy on AKS environment: ${{ inputs.environment }} steps: @@ -68,7 +61,7 @@ jobs: cleanup_runner: name: Cleanup Runner needs: [ create_runner, deploy ] - if: ${{ success() || failure() && inputs.target == inputs.environment || inputs.target == 'all' }} + if: ${{ success() || failure() }} runs-on: ubuntu-22.04 environment: ${{ inputs.environment }} steps: diff --git a/.github/workflows/release_deploy.yml b/.github/workflows/release_deploy.yml index bc2f5e88..0729d444 100644 --- a/.github/workflows/release_deploy.yml +++ b/.github/workflows/release_deploy.yml @@ -16,17 +16,22 @@ on: - dev - uat - prod - - all + version: + required: false + type: choice + description: Select the version + options: + - '' + - skip + - promote + - new_release + - breaking_change + beta: required: false type: boolean description: deploy beta version on AKS default: false - skip_release: - required: false - type: boolean - description: skip the release. Only deploy - default: false permissions: @@ -55,19 +60,20 @@ jobs: # Set Semvar - run: echo "SEMVER=patch" >> $GITHUB_ENV - - if: ${{ (github.event.pull_request.merged && contains(github.event.pull_request.labels.*.name, 'breaking-change ')) }} + - if: ${{ (github.event.pull_request.merged && contains(github.event.pull_request.labels.*.name, 'breaking-change')) }} run: echo "SEMVER=major" >> $GITHUB_ENV - - if: ${{ inputs.environment == 'uat' }} + # force semver if dev, !=main or skip release + - if: ${{ inputs.version == 'new_release' }} run: echo "SEMVER=minor" >> $GITHUB_ENV - - if: ${{ inputs.environment == 'prod' }} - run: echo "SEMVER=skip" >> $GITHUB_ENV + - if: ${{ inputs.version == 'breaking_change' }} + run: echo "SEMVER=major" >> $GITHUB_ENV - if: ${{ github.ref_name != 'main' }} run: echo "SEMVER=buildNumber" >> $GITHUB_ENV - - if: ${{ inputs.skip_release }} + - if: ${{ inputs.version == 'skip' || inputs.version == 'promote' }} run: echo "SEMVER=skip" >> $GITHUB_ENV - id: get_semver @@ -107,13 +113,13 @@ jobs: runs-on: ubuntu-latest if: ${{ inputs.semver != 'skip' }} steps: -# - name: Build and Push -# id: semver -# uses: pagopa/github-actions-template/ghcr-build-push@v1.5.4 -# with: -# branch: ${{ github.ref_name}} -# github_token: ${{ secrets.GITHUB_TOKEN }} -# tag: ${{ needs.release.outputs.version }} + # - name: Build and Push + # id: semver + # uses: pagopa/github-actions-template/ghcr-build-push@v1.5.4 + # with: + # branch: ${{ github.ref_name}} + # github_token: ${{ secrets.GITHUB_TOKEN }} + # tag: ${{ needs.release.outputs.version }} - uses: actions/checkout@v3 with: ref: ${{ github.ref_name }} @@ -146,27 +152,41 @@ jobs: secrets: | GH_TOKEN=${{ secrets.READ_PACKAGES_TOKEN }} - deploy_aks: - name: Deploy on AKS + deploy_aks_dev: + name: Deploy on AKS DEV needs: [ setup, release, image ] if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }} - strategy: - matrix: - environment: [ dev, uat, prod ] uses: ./.github/workflows/deploy_with_github_runner.yml with: - environment: ${{ matrix.environment }} - target: ${{ needs.setup.outputs.environment }} + environment: ${{ needs.setup.outputs.environment }} + secrets: inherit + + deploy_aks_uat: + name: Deploy on AKS UAT + needs: [ setup, release, image ] + if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && needs.setup.outputs.environment != 'dev' }} + uses: ./.github/workflows/deploy_with_github_runner.yml + with: + environment: ${{ needs.setup.outputs.environment }} + secrets: inherit + + deploy_aks_prod: + name: Deploy on AKS PROD + needs: [ setup, release, image ] + if: ${{ always() && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') && needs.setup.outputs.environment == 'prod' }} + uses: ./.github/workflows/deploy_with_github_runner.yml + with: + environment: ${{ needs.setup.outputs.environment }} secrets: inherit notify: - needs: [ setup, release, deploy_aks ] + needs: [ setup, release, deploy_aks_prod ] runs-on: ubuntu-latest name: Notify if: always() steps: - name: Report Status - if: ${{ needs.setup.outputs.environment == 'prod' || needs.setup.outputs.environment == 'all' }} + if: ${{ needs.setup.outputs.environment == 'prod' }} uses: ravsamhq/notify-slack-action@v2 with: status: ${{ needs.deploy_aks.result }} diff --git a/helm/Chart.yaml b/helm/Chart.yaml index aed7325e..1b74b66c 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -6,5 +6,5 @@ version: 1.16.0 appVersion: 1.3.6 dependencies: - name: microservice-chart - version: 1.21.0 + version: 2.8.0 repository: "https://pagopa.github.io/aks-microservice-chart-blueprint" From af4f4088acf84bd8e8589e3740f41ca6c1797427 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 11 Sep 2023 15:31:54 +0200 Subject: [PATCH 02/29] values --- helm/values-dev.yaml | 52 ++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index d5e0b354..79ddd014 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -2,9 +2,32 @@ microservice-chart: namespace: "apiconfig" nameOverride: "" fullnameOverride: "" + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 0 + maxSurge: 1 + canaryDelivery: + create: true + ingress: + canary: + type: header + headerName: X-Canary + headerValue: canary + weightPercent: 0 + service: + create: true + deployment: + create: true + image: + repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration + tag: 1.3.6 + pullPolicy: Always + envConfig: { } + envSecret: { } image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6" + tag: 1.3.6 pullPolicy: Always livenessProbe: httpGet: @@ -25,15 +48,15 @@ microservice-chart: service: create: true type: ClusterIP - port: 8080 + ports: + - 8080 ingress: create: true host: "weudev.apiconfig.internal.dev.platform.pagopa.it" path: /pagopa-api-config-selfcare-integration/(.*) + servicePort: 8080 serviceAccount: create: false - annotations: {} - name: "" podAnnotations: {} podSecurityContext: seccompProfile: @@ -50,7 +73,7 @@ microservice-chart: autoscaling: enable: true minReplica: 1 - maxReplica: 10 + maxReplica: 5 pollingInterval: 10 # seconds cooldownPeriod: 50 # seconds triggers: @@ -89,22 +112,3 @@ microservice-chart: operator: In values: - user - canaryDelivery: - create: true - ingress: - create: true - canary: - type: header - headerName: X-Canary - headerValue: canary - weightPercent: 0 - service: - create: true - deployment: - create: true - image: - repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6 - pullPolicy: Always - envConfig: {} - envSecret: {} From 96c124738be22b9b78e7f2b0a6ad2439acb9d476 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Mon, 11 Sep 2023 13:35:49 +0000 Subject: [PATCH 03/29] Bump to version 1.3.6-1-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 6 +++--- helm/values-local.yaml | 3 ++- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 1b74b66c..f9abf9d8 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.16.0 -appVersion: 1.3.6 +version: 1.16.1 +appVersion: 1.3.6-1-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 79ddd014..40c99319 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -21,10 +21,10 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6 + tag: 1.3.6-1-chart pullPolicy: Always - envConfig: { } - envSecret: { } + envConfig: {} + envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration tag: 1.3.6 diff --git a/helm/values-local.yaml b/helm/values-local.yaml index 54e982fd..e996ea3b 100644 --- a/helm/values-local.yaml +++ b/helm/values-local.yaml @@ -92,4 +92,5 @@ microservice-chart: canaryDelivery: deployment: image: - tag: 1.3.6 + tag: 1.3.6-1-chart + create: true diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index ae37fb5f..a6f0bd41 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -104,7 +104,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6 + tag: 1.3.6-1-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 00369c63..2962e66f 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -104,7 +104,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6 + tag: 1.3.6-1-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/openapi/openapi.json b/openapi/openapi.json index 1b4e5a5c..74166152 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6" + "version": "1.3.6-1-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index de38fd48..0e1bea0b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6 + 1.3.6-1-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From 292aaa318d5ad5ea970042b116a9f1a7b0c52650 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Mon, 11 Sep 2023 14:33:41 +0000 Subject: [PATCH 04/29] Bump to version 1.3.6-2-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-local.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index f9abf9d8..f92b5e75 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.16.1 -appVersion: 1.3.6-1-chart +version: 1.16.2 +appVersion: 1.3.6-2-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 40c99319..1e3b0e4c 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -21,7 +21,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-1-chart + tag: 1.3.6-2-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/helm/values-local.yaml b/helm/values-local.yaml index e996ea3b..388deb82 100644 --- a/helm/values-local.yaml +++ b/helm/values-local.yaml @@ -92,5 +92,5 @@ microservice-chart: canaryDelivery: deployment: image: - tag: 1.3.6-1-chart + tag: 1.3.6-2-chart create: true diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index a6f0bd41..e76df9fb 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -104,7 +104,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-1-chart + tag: 1.3.6-2-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 2962e66f..6e492756 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -104,7 +104,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-1-chart + tag: 1.3.6-2-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/openapi/openapi.json b/openapi/openapi.json index 74166152..e0a795e0 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-1-chart" + "version": "1.3.6-2-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 0e1bea0b..e231668f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-1-chart + 1.3.6-2-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From ac6ebc43ba5a3416cd10fe4a4ef9ddf1ba495acc Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 11 Sep 2023 16:43:06 +0200 Subject: [PATCH 05/29] app-name --- .github/workflows/deploy_with_github_runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_with_github_runner.yml b/.github/workflows/deploy_with_github_runner.yml index 2b9a8ef0..5ec061ff 100644 --- a/.github/workflows/deploy_with_github_runner.yml +++ b/.github/workflows/deploy_with_github_runner.yml @@ -10,7 +10,7 @@ on: env: NAMESPACE: apiconfig - APP_NAME: pagopaapiconfig + APP_NAME: apiconfig-selfcare-integration permissions: From 8ea731ee0c54da63af986b82093578afb81cf65c Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Mon, 11 Sep 2023 14:44:40 +0000 Subject: [PATCH 06/29] Bump to version 1.3.6-3-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-local.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index f92b5e75..443fa5a2 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.16.2 -appVersion: 1.3.6-2-chart +version: 1.16.3 +appVersion: 1.3.6-3-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 1e3b0e4c..e2642453 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -21,7 +21,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-2-chart + tag: 1.3.6-3-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/helm/values-local.yaml b/helm/values-local.yaml index 388deb82..a4580438 100644 --- a/helm/values-local.yaml +++ b/helm/values-local.yaml @@ -92,5 +92,5 @@ microservice-chart: canaryDelivery: deployment: image: - tag: 1.3.6-2-chart + tag: 1.3.6-3-chart create: true diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index e76df9fb..30d70a3e 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -104,7 +104,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-2-chart + tag: 1.3.6-3-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 6e492756..8c3b6929 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -104,7 +104,7 @@ microservice-chart: create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-2-chart + tag: 1.3.6-3-chart pullPolicy: Always envConfig: {} envSecret: {} diff --git a/openapi/openapi.json b/openapi/openapi.json index e0a795e0..27ea4dd3 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-2-chart" + "version": "1.3.6-3-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index e231668f..1c9f956d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-2-chart + 1.3.6-3-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From 519167e1836fab020c46a79d4c8cd6793b518b97 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 11 Sep 2023 17:16:18 +0200 Subject: [PATCH 07/29] canary disabled --- helm/values-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 1e3b0e4c..0b4d4b15 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -8,7 +8,7 @@ microservice-chart: maxUnavailable: 0 maxSurge: 1 canaryDelivery: - create: true + create: false ingress: canary: type: header From 7ba33c1e59bb64f3e55cfb612fdc9f4e1597d41d Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 11 Sep 2023 17:22:48 +0200 Subject: [PATCH 08/29] values --- helm/values-local.yaml | 96 ------------------------------------------ helm/values-prod.yaml | 46 +++++++++++--------- helm/values-uat.yaml | 46 +++++++++++--------- 3 files changed, 52 insertions(+), 136 deletions(-) delete mode 100644 helm/values-local.yaml diff --git a/helm/values-local.yaml b/helm/values-local.yaml deleted file mode 100644 index a4580438..00000000 --- a/helm/values-local.yaml +++ /dev/null @@ -1,96 +0,0 @@ -microservice-chart: - namespace: "apiconfig" - nameOverride: "" - fullnameOverride: "" - image: - repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6" - pullPolicy: Always - livenessProbe: - httpGet: - path: /actuator/health/liveness - port: 8080 - initialDelaySeconds: 90 - failureThreshold: 6 - periodSeconds: 10 - readinessProbe: - httpGet: - path: /actuator/health/readiness - port: 8080 - initialDelaySeconds: 90 - failureThreshold: 6 - periodSeconds: 10 - deployment: - create: true - service: - create: true - type: ClusterIP - port: 8080 - ingress: - create: true - host: "weudev.apiconfig.internal.dev.platform.pagopa.it" - path: /pagopa-api-config-selfcare-integration/(.*) - serviceAccount: - create: false - annotations: {} - name: "" - podAnnotations: {} - podSecurityContext: - seccompProfile: - type: RuntimeDefault - securityContext: - allowPrivilegeEscalation: false - resources: - requests: - memory: "512Mi" - cpu: "0.25" - limits: - memory: "512Mi" - cpu: "0.25" - autoscaling: - enable: true - minReplica: 1 - maxReplica: 10 - pollingInterval: 10 # seconds - cooldownPeriod: 50 # seconds - triggers: - - type: cpu - metadata: - # Required - type: Utilization # Allowed types are 'Utilization' or 'AverageValue' - value: "75" - envConfig: - WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights - APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-d-connection-string' - APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration" - ENV: 'azure-dev' - APP_LOGGING_LEVEL: 'DEBUG' - DEFAULT_LOGGING_LEVEL: 'INFO' - CORS_CONFIGURATION: '{}' - SPRING_DATASOURCE_USERNAME: 'NODO4_CFG' - SPRING_DATASOURCE_URL: 'jdbc:oracle:thin:@db-nodo-pagamenti.d.db-nodo-pagamenti.com:1522/NDPSPCT_PP_NODO4_CFG' - SPRING_DATASOURCE_DRIVER: 'oracle.jdbc.OracleDriver' - DB_CONFIG_DRIVER: 'oracle.jdbc.OracleDriver' - DATABASE_SCHEMA: 'NODO4_CFG' - SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect' - envSecret: - SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' - keyvault: - name: "pagopa-d-apiconfig-kv" - tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" - nodeSelector: {} - tolerations: [] - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: node_type - operator: In - values: - - user - canaryDelivery: - deployment: - image: - tag: 1.3.6-3-chart - create: true diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 30d70a3e..beb98486 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -2,6 +2,29 @@ microservice-chart: namespace: "apiconfig" nameOverride: "" fullnameOverride: "" + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 0 + maxSurge: 1 + canaryDelivery: + create: false + ingress: + canary: + type: header + headerName: X-Canary + headerValue: canary + weightPercent: 0 + service: + create: true + deployment: + create: true + image: + repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration + tag: "1.3.6" + pullPolicy: Always + envConfig: {} + envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration tag: "1.3.6" @@ -25,11 +48,13 @@ microservice-chart: service: create: true type: ClusterIP - port: 8080 + ports: + - 8080 ingress: create: true host: "weuprod.apiconfig.internal.platform.pagopa.it" path: /pagopa-api-config-selfcare-integration/(.*) + servicePort: 8080 serviceAccount: create: false annotations: {} @@ -89,22 +114,3 @@ microservice-chart: operator: In values: - user - canaryDelivery: - create: true - ingress: - create: true - canary: - type: header - headerName: X-Canary - headerValue: canary - weightPercent: 0 - service: - create: true - deployment: - create: true - image: - repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-3-chart - pullPolicy: Always - envConfig: {} - envSecret: {} diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 8c3b6929..28001775 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -2,6 +2,29 @@ microservice-chart: namespace: "apiconfig" nameOverride: "" fullnameOverride: "" + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 0 + maxSurge: 1 + canaryDelivery: + create: false + ingress: + canary: + type: header + headerName: X-Canary + headerValue: canary + weightPercent: 0 + service: + create: true + deployment: + create: true + image: + repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration + tag: "1.3.6" + pullPolicy: Always + envConfig: {} + envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration tag: "1.3.6" @@ -25,11 +48,13 @@ microservice-chart: service: create: true type: ClusterIP - port: 8080 + ports: + - 8080 ingress: create: true host: "weuuat.apiconfig.internal.uat.platform.pagopa.it" path: /pagopa-api-config-selfcare-integration/(.*) + servicePort: 8080 serviceAccount: create: false annotations: {} @@ -89,22 +114,3 @@ microservice-chart: operator: In values: - user - canaryDelivery: - create: true - ingress: - create: true - canary: - type: header - headerName: X-Canary - headerValue: canary - weightPercent: 0 - service: - create: true - deployment: - create: true - image: - repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-3-chart - pullPolicy: Always - envConfig: {} - envSecret: {} From 02ab032570a110b2dd9f0153a342513f1118c889 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Mon, 11 Sep 2023 18:27:48 +0200 Subject: [PATCH 09/29] temp dir --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 183dded1..cc49c8f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,3 +22,5 @@ COPY --chown=spring:spring --from=builder spring-boot-loader/ ./ COPY --chown=spring:spring --from=builder application/ ./ EXPOSE 8080 + +ENTRYPOINT ["java","-Djava.io.tmpdir=./tmp/","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"] From bf61bb67fda036ae09e8c47762731e5be52459b9 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Mon, 11 Sep 2023 16:29:26 +0000 Subject: [PATCH 10/29] Bump to version 1.3.6-4-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 443fa5a2..8fb05a4d 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.16.3 -appVersion: 1.3.6-3-chart +version: 1.17.0 +appVersion: 1.3.6-4-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index b6a999e0..9db002e2 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6 + tag: 1.3.6-4-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index beb98486..1b2d676f 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6" + tag: "1.3.6-4-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 28001775..a6ae4aa0 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6" + tag: "1.3.6-4-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 27ea4dd3..ecb264ab 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-3-chart" + "version": "1.3.6-4-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 1c9f956d..2282744e 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-3-chart + 1.3.6-4-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From 9e58f969cd8e2effeecccfc4577b62b3a0048bfa Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 10:24:26 +0200 Subject: [PATCH 11/29] rollback --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc49c8f3..a3e42ed8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,4 +23,4 @@ COPY --chown=spring:spring --from=builder application/ ./ EXPOSE 8080 -ENTRYPOINT ["java","-Djava.io.tmpdir=./tmp/","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"] +ENTRYPOINT ["java", "-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"] From ab5bb9e56badc38443e65a52669e4be53c70df1a Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 08:25:54 +0000 Subject: [PATCH 12/29] Bump to version 1.3.6-5-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 8fb05a4d..de1533d9 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.17.0 -appVersion: 1.3.6-4-chart +version: 1.18.0 +appVersion: 1.3.6-5-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 9db002e2..a692e2c6 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-4-chart + tag: 1.3.6-5-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 1b2d676f..bcb56a9c 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-4-chart" + tag: "1.3.6-5-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index a6ae4aa0..35014a4c 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-4-chart" + tag: "1.3.6-5-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index ecb264ab..ce1043f3 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-4-chart" + "version": "1.3.6-5-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 2282744e..3e0a13f7 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-4-chart + 1.3.6-5-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From 220458c35efcf1bfe34c1f4e965b6ac0e67b59ca Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 10:39:01 +0200 Subject: [PATCH 13/29] agent otl --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3e42ed8..fa19be80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,14 @@ COPY . . RUN --mount=type=secret,id=GH_TOKEN,dst=/tmp/secret_token export GITHUB_TOKEN_READ_PACKAGES="$(cat /tmp/secret_token)" \ && mvn clean package -Dmaven.test.skip=true - FROM adoptopenjdk/openjdk11:alpine-jre as builder COPY --from=buildtime /build/target/*.jar application.jar RUN java -Djarmode=layertools -jar application.jar extract FROM ghcr.io/pagopa/docker-base-springboot-openjdk11:v1.0.1@sha256:bbbe948e91efa0a3e66d8f308047ec255f64898e7f9250bdb63985efd3a95dbf +ADD --chown=spring:spring https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v1.25.1/opentelemetry-javaagent.jar . + COPY --chown=spring:spring --from=builder dependencies/ ./ COPY --chown=spring:spring --from=builder snapshot-dependencies/ ./ # https://github.com/moby/moby/issues/37965#issuecomment-426853382 @@ -23,4 +24,4 @@ COPY --chown=spring:spring --from=builder application/ ./ EXPOSE 8080 -ENTRYPOINT ["java", "-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"] +ENTRYPOINT ["java","-javaagent:opentelemetry-javaagent.jar","--enable-preview","org.springframework.boot.loader.JarLauncher"] From 7d4142263ad9c24610748811d6d6d72d9dbda789 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 08:40:13 +0000 Subject: [PATCH 14/29] Bump to version 1.3.6-6-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index de1533d9..641255dc 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.18.0 -appVersion: 1.3.6-5-chart +version: 1.19.0 +appVersion: 1.3.6-6-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index a692e2c6..6ad27091 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-5-chart + tag: 1.3.6-6-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index bcb56a9c..1dfdee47 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-5-chart" + tag: "1.3.6-6-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 35014a4c..8b170759 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-5-chart" + tag: "1.3.6-6-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index ce1043f3..6bbbbcf5 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-5-chart" + "version": "1.3.6-6-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 3e0a13f7..18dcb330 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-5-chart + 1.3.6-6-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From c0377dee2f980efe8ee5059d755064d567f2bbf4 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 10:42:20 +0200 Subject: [PATCH 15/29] env vars --- helm/values-dev.yaml | 5 +++++ helm/values-prod.yaml | 5 +++++ helm/values-uat.yaml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 6ad27091..24b92049 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -96,6 +96,11 @@ microservice-chart: DB_CONFIG_DRIVER: 'oracle.jdbc.OracleDriver' DATABASE_SCHEMA: 'NODO4_CFG' SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect' + OTEL_SERVICE_NAME: "pagopa-api-config-selfcare-integration" + OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-dev" + OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317" + OTEL_LOGS_EXPORTER: none + OTEL_TRACES_SAMPLER: "always_on" envSecret: SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' keyvault: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 1dfdee47..2ef80629 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -98,6 +98,11 @@ microservice-chart: DB_CONFIG_DRIVER: 'oracle.jdbc.OracleDriver' DATABASE_SCHEMA: 'NODO4_CFG' SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect' + OTEL_SERVICE_NAME: "pagopa-api-config-selfcare-integration" + OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-prod" + OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317" + OTEL_LOGS_EXPORTER: none + OTEL_TRACES_SAMPLER: "always_on" envSecret: SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' keyvault: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 8b170759..90817cea 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -98,6 +98,11 @@ microservice-chart: DB_CONFIG_DRIVER: 'oracle.jdbc.OracleDriver' DATABASE_SCHEMA: 'NODO4_CFG' SPRING_JPA_DB_PLATFORM: 'org.hibernate.dialect.Oracle12cDialect' + OTEL_SERVICE_NAME: "pagopa-api-config-selfcare-integration" + OTEL_RESOURCE_ATTRIBUTES: "deployment.environment=azure-uat" + OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317" + OTEL_LOGS_EXPORTER: none + OTEL_TRACES_SAMPLER: "always_on" envSecret: SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' keyvault: From 8f0dd8ddc6f0f07bb2dbe1ea95447d67786ec1c0 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 10:47:33 +0200 Subject: [PATCH 16/29] logback --- src/main/resources/logback-spring.xml | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/main/resources/logback-spring.xml diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..867f1c6e --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %clr(%mdc){magenta}%n%wEx + + + + + + + + + + + + + + ${OTEL_SERVICE_NAME} + ${ECS_SERVICE_VERSION} + ${ENV} + + + + + + + + + From 1309cd465b4850b26e9e19a68fdd47c482ec722f Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 08:49:47 +0000 Subject: [PATCH 17/29] Bump to version 1.3.6-7-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 641255dc..db0a98c1 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.19.0 -appVersion: 1.3.6-6-chart +version: 1.20.0 +appVersion: 1.3.6-7-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 24b92049..9f94fa78 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-6-chart + tag: 1.3.6-7-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 2ef80629..4273c3fa 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-6-chart" + tag: "1.3.6-7-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 90817cea..3d8017c0 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-6-chart" + tag: "1.3.6-7-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 6bbbbcf5..128d0183 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-6-chart" + "version": "1.3.6-7-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 18dcb330..09c34dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-6-chart + 1.3.6-7-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From a32edf88f1ca7efb7cf13a756bd63860f5770272 Mon Sep 17 00:00:00 2001 From: pasqualespica <36746022+pasqualespica@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:56:43 +0200 Subject: [PATCH 18/29] minor fix --- helm/values-dev.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 9f94fa78..466e1363 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -45,6 +45,15 @@ microservice-chart: periodSeconds: 10 deployment: create: true + serviceMonitor: + create: true + endpoints: + - interval: 10s #jmx-exporter + targetPort: 12345 + path: /metrics + ports: + - 80 #http + - 12345 #jmx-exporter service: create: true type: ClusterIP @@ -101,6 +110,9 @@ microservice-chart: OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel-collector.elastic-system.svc:4317" OTEL_LOGS_EXPORTER: none OTEL_TRACES_SAMPLER: "always_on" + envFieldRef: + APP_NAME: "metadata.labels['app.kubernetes.io/instance']" + APP_VERSION: "metadata.labels['app.kubernetes.io/version']" envSecret: SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' keyvault: From 67c575ffbd8a75a09cb7de36310b855ee5158634 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 11:15:17 +0200 Subject: [PATCH 19/29] dep ecs --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 09c34dfa..43650f63 100644 --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,11 @@ test + + co.elastic.logging + logback-ecs-encoder + 1.5.0 + From 32a2d40cf47d6c1cb9edb24df8d89a382963a302 Mon Sep 17 00:00:00 2001 From: pasqualespica <36746022+pasqualespica@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:16:25 +0200 Subject: [PATCH 20/29] fix tmp folder --- helm/Chart.lock | 6 ++++++ helm/values-dev.yaml | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 helm/Chart.lock diff --git a/helm/Chart.lock b/helm/Chart.lock new file mode 100644 index 00000000..aeb1712e --- /dev/null +++ b/helm/Chart.lock @@ -0,0 +1,6 @@ +dependencies: +- name: microservice-chart + repository: https://pagopa.github.io/aks-microservice-chart-blueprint + version: 2.8.0 +digest: sha256:379d9a7c312874dd1771386d92d8f597cb3fed497bb80dfde102513b582123d4 +generated: "2023-09-12T11:07:51.456809+02:00" diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 466e1363..151b1346 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -71,7 +71,11 @@ microservice-chart: seccompProfile: type: RuntimeDefault securityContext: + readOnlyRootFilesystem: false allowPrivilegeEscalation: false + capabilities: + drop: + - all resources: requests: memory: "512Mi" From 71d0348c33f79ba8216d396f4cfe91af635453c8 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 11:17:07 +0200 Subject: [PATCH 21/29] gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 10d198b3..fd12b47b 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ hs_err_pid* .identity/.terraform/* **/.terraform.lock.hcl **/.terraform +/docker/.env +/.cache/ From dc21364254961df779640adfbddd4762dfb3481b Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 09:18:59 +0000 Subject: [PATCH 22/29] Bump to version 1.3.6-8-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 4 ++-- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index db0a98c1..bcb620ec 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.20.0 -appVersion: 1.3.6-7-chart +version: 1.21.0 +appVersion: 1.3.6-8-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 151b1346..b05ad7a3 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-7-chart + tag: 1.3.6-8-chart pullPolicy: Always livenessProbe: httpGet: @@ -75,7 +75,7 @@ microservice-chart: allowPrivilegeEscalation: false capabilities: drop: - - all + - all resources: requests: memory: "512Mi" diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 4273c3fa..89e76c0c 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-7-chart" + tag: "1.3.6-8-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 3d8017c0..5421146f 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-7-chart" + tag: "1.3.6-8-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 128d0183..b5ef8d68 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-7-chart" + "version": "1.3.6-8-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 43650f63..156c4dc9 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-7-chart + 1.3.6-8-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From 36646bd9a57720b0f9b690835badfa089d9e8604 Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 11:50:53 +0200 Subject: [PATCH 23/29] values --- helm/values-prod.yaml | 4 ++++ helm/values-uat.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 89e76c0c..e0aa588a 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -64,7 +64,11 @@ microservice-chart: seccompProfile: type: RuntimeDefault securityContext: + readOnlyRootFilesystem: false allowPrivilegeEscalation: false + capabilities: + drop: + - all resources: requests: memory: "512Mi" diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 5421146f..661077eb 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -64,7 +64,11 @@ microservice-chart: seccompProfile: type: RuntimeDefault securityContext: + readOnlyRootFilesystem: false allowPrivilegeEscalation: false + capabilities: + drop: + - all resources: requests: memory: "512Mi" From 23a81cf420f47038a09fb09c80883c87a6ca206c Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 12:21:53 +0200 Subject: [PATCH 24/29] hikari --- .gitignore | 1 + docker/run_docker.sh | 2 +- src/main/resources/application.properties | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fd12b47b..0b22acf7 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ hs_err_pid* **/.terraform /docker/.env /.cache/ +/docker/secrets diff --git a/docker/run_docker.sh b/docker/run_docker.sh index 597aac72..196bbf1b 100755 --- a/docker/run_docker.sh +++ b/docker/run_docker.sh @@ -44,7 +44,7 @@ done echo $GH_TOKEN > ./secrets DOCKER_BUILDKIT=1 docker build -t selfcare-integration --secret id=GH_TOKEN,src=./secrets ../ -docker run -p8080:8080 --env-file ./.env selfcare-integration +docker run -d -p8080:8080 --env-file ./.env selfcare-integration # waiting the containers diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a379ccd0..e6208263 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -38,10 +38,17 @@ healthcheck.query=${HEALTHCHECK_QUERY:select 1 from DUAL} # JPA settings spring.jpa.hibernate.ddl-auto=none spring.jpa.properties.hibernate.default_schema=${DATABASE_SCHEMA} +spring.jpa.database-platform=${SPRING_JPA_DB_PLATFORM} +spring.jpa.hibernate.use-new-id-generator-mappings=false +spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +spring.jpa.open-in-view=false # HikariCP configuration spring.datasource.hikari.connection-timeout=15000 spring.datasource.hikari.maxLifetime=30000 +spring.datasource.hikari.connectionTimeout=15000 +spring.datasource.hikari.keepaliveTime=30000 +spring.datasource.hikari.connection-test-query=${HEALTHCHECK_QUERY:select 1 from DUAL} # Applicative parameters sc-int.application_code.max_value: 48 From ba255db0e99f10bae61877ed3c2e146fc43ec6d3 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 10:26:03 +0000 Subject: [PATCH 25/29] Bump to version 1.3.6-9-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index bcb620ec..4199b967 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.21.0 -appVersion: 1.3.6-8-chart +version: 1.22.0 +appVersion: 1.3.6-9-chart dependencies: - name: microservice-chart version: 2.8.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index b05ad7a3..a4ce17d3 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-8-chart + tag: 1.3.6-9-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index e0aa588a..e34bbb81 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-8-chart" + tag: "1.3.6-9-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 661077eb..637048a7 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -27,7 +27,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-8-chart" + tag: "1.3.6-9-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index b5ef8d68..ffe01ccc 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-8-chart" + "version": "1.3.6-9-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 156c4dc9..51529de5 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-8-chart + 1.3.6-9-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From b51a37b555b31162e8ece89e3113c2c676425eaa Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 15:15:12 +0200 Subject: [PATCH 26/29] fix --- helm/Chart.lock | 6 +-- helm/Chart.yaml | 2 +- helm/values-dev.yaml | 54 ++++++++++------------- helm/values-prod.yaml | 42 ++++++++++++------ helm/values-uat.yaml | 42 ++++++++++++------ src/main/resources/application.properties | 1 - 6 files changed, 86 insertions(+), 61 deletions(-) diff --git a/helm/Chart.lock b/helm/Chart.lock index aeb1712e..a98e2cd0 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: 2.8.0 -digest: sha256:379d9a7c312874dd1771386d92d8f597cb3fed497bb80dfde102513b582123d4 -generated: "2023-09-12T11:07:51.456809+02:00" + version: 2.4.0 +digest: sha256:db3f9abdcf9a458c7dc3ae6f5ace7292293cbf05a4ca398c4173807f9d14c561 +generated: "2023-09-12T14:13:45.260548+02:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 4199b967..2c9f2094 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -6,5 +6,5 @@ version: 1.22.0 appVersion: 1.3.6-9-chart dependencies: - name: microservice-chart - version: 2.8.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 a4ce17d3..c94889ed 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -2,29 +2,6 @@ microservice-chart: namespace: "apiconfig" nameOverride: "" fullnameOverride: "" - strategy: - type: RollingUpdate - rollingUpdate: - maxUnavailable: 0 - maxSurge: 1 - canaryDelivery: - create: false - ingress: - canary: - type: header - headerName: X-Canary - headerValue: canary - weightPercent: 0 - service: - create: true - deployment: - create: true - image: - repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-3-chart - pullPolicy: Always - envConfig: {} - envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration tag: 1.3.6-9-chart @@ -40,7 +17,7 @@ microservice-chart: httpGet: path: /actuator/health/readiness port: 8080 - initialDelaySeconds: 90 + initialDelaySeconds: 180 failureThreshold: 6 periodSeconds: 10 deployment: @@ -55,7 +32,6 @@ microservice-chart: - 80 #http - 12345 #jmx-exporter service: - create: true type: ClusterIP ports: - 8080 @@ -86,9 +62,9 @@ microservice-chart: autoscaling: enable: true minReplica: 1 - maxReplica: 5 - pollingInterval: 10 # seconds - cooldownPeriod: 50 # seconds + maxReplica: 2 + pollingInterval: 30 # seconds + cooldownPeriod: 60 # seconds triggers: - type: cpu metadata: @@ -97,8 +73,6 @@ microservice-chart: value: "75" envConfig: WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights - APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-d-connection-string' - APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration" ENV: 'azure-dev' APP_LOGGING_LEVEL: 'DEBUG' DEFAULT_LOGGING_LEVEL: 'INFO' @@ -118,7 +92,9 @@ microservice-chart: APP_NAME: "metadata.labels['app.kubernetes.io/instance']" APP_VERSION: "metadata.labels['app.kubernetes.io/version']" envSecret: + APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-d-connection-string' SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' + OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token keyvault: name: "pagopa-d-apiconfig-kv" tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" @@ -133,3 +109,21 @@ microservice-chart: operator: In values: - user + canaryDelivery: + create: false + ingress: + canary: + type: header + headerName: X-Canary + headerValue: canary + weightPercent: 0 + service: + create: true + deployment: + create: true + image: + repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration + tag: 1.3.6-3-chart + pullPolicy: Always + envConfig: + envSecret: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index e34bbb81..fc5efeeb 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -7,18 +7,6 @@ microservice-chart: rollingUpdate: maxUnavailable: 0 maxSurge: 1 - canaryDelivery: - create: false - ingress: - canary: - type: header - headerName: X-Canary - headerValue: canary - weightPercent: 0 - service: - create: true - deployment: - create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration tag: "1.3.6" @@ -45,6 +33,15 @@ microservice-chart: periodSeconds: 10 deployment: create: true + serviceMonitor: + create: true + endpoints: + - interval: 10s #jmx-exporter + targetPort: 12345 + path: /metrics + ports: + - 80 #http + - 12345 #jmx-exporter service: create: true type: ClusterIP @@ -90,7 +87,6 @@ microservice-chart: value: "75" envConfig: WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights - APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string' APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration" ENV: 'azure-prod' APP_LOGGING_LEVEL: 'INFO' @@ -108,7 +104,9 @@ microservice-chart: OTEL_LOGS_EXPORTER: none OTEL_TRACES_SAMPLER: "always_on" envSecret: + APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-p-connection-string' SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' + OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token keyvault: name: "pagopa-p-apiconfig-kv" tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" @@ -123,3 +121,21 @@ microservice-chart: operator: In values: - user + canaryDelivery: + create: false + ingress: + canary: + type: header + headerName: X-Canary + headerValue: canary + weightPercent: 0 + service: + create: true + deployment: + create: true + image: + repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration + tag: 1.3.6-3-chart + pullPolicy: Always + envConfig: {} + envSecret: {} diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index 637048a7..f41752c6 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -7,18 +7,6 @@ microservice-chart: rollingUpdate: maxUnavailable: 0 maxSurge: 1 - canaryDelivery: - create: false - ingress: - canary: - type: header - headerName: X-Canary - headerValue: canary - weightPercent: 0 - service: - create: true - deployment: - create: true image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration tag: "1.3.6" @@ -45,6 +33,15 @@ microservice-chart: periodSeconds: 10 deployment: create: true + serviceMonitor: + create: true + endpoints: + - interval: 10s #jmx-exporter + targetPort: 12345 + path: /metrics + ports: + - 80 #http + - 12345 #jmx-exporter service: create: true type: ClusterIP @@ -90,7 +87,6 @@ microservice-chart: value: "75" envConfig: WEBSITE_SITE_NAME: 'pagopaapiconfigselfcareintegration' # required to show cloud role name in application insights - APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string' APPLICATIONINSIGHTS_ROLE_NAME: "pagopa-api-config-selfcare-integration" ENV: 'azure-uat' APP_LOGGING_LEVEL: 'DEBUG' @@ -108,7 +104,9 @@ microservice-chart: OTEL_LOGS_EXPORTER: none OTEL_TRACES_SAMPLER: "always_on" envSecret: + APPLICATIONINSIGHTS_CONNECTION_STRING: 'ai-u-connection-string' SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password' + OTEL_EXPORTER_OTLP_HEADERS: elastic-apm-secret-token keyvault: name: "pagopa-u-apiconfig-kv" tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d" @@ -123,3 +121,21 @@ microservice-chart: operator: In values: - user + canaryDelivery: + create: false + ingress: + canary: + type: header + headerName: X-Canary + headerValue: canary + weightPercent: 0 + service: + create: true + deployment: + create: true + image: + repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration + tag: 1.3.6-3-chart + pullPolicy: Always + envConfig: {} + envSecret: {} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e6208263..10bc7ef1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -33,7 +33,6 @@ spring.datasource.url=${SPRING_DATASOURCE_URL} spring.datasource.username=${SPRING_DATASOURCE_USERNAME} spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} spring.datasource.driver-class-name=${DB_CONFIG_DRIVER} -healthcheck.query=${HEALTHCHECK_QUERY:select 1 from DUAL} # JPA settings spring.jpa.hibernate.ddl-auto=none From 1081e3bd3468de5602798e7ff0cea7ebf472f122 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 13:18:50 +0000 Subject: [PATCH 27/29] Bump to version 1.3.6-10-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 2c9f2094..b4d981e0 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.22.0 -appVersion: 1.3.6-9-chart +version: 1.23.0 +appVersion: 1.3.6-10-chart dependencies: - name: microservice-chart version: 2.4.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index c94889ed..cb74a206 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-9-chart + tag: 1.3.6-10-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index fc5efeeb..72daa165 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -15,7 +15,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-9-chart" + tag: "1.3.6-10-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index f41752c6..a0a04107 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -15,7 +15,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-9-chart" + tag: "1.3.6-10-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index ffe01ccc..351f733b 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-9-chart" + "version": "1.3.6-10-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index 51529de5..fe90b6f1 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-9-chart + 1.3.6-10-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare From 9665603b6b488bc473029f57acbb1f265a0c65ae Mon Sep 17 00:00:00 2001 From: Jacopo Date: Tue, 12 Sep 2023 15:59:22 +0200 Subject: [PATCH 28/29] cpu --- helm/values-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index cb74a206..07af11a8 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -55,10 +55,10 @@ microservice-chart: resources: requests: memory: "512Mi" - cpu: "0.25" + cpu: "0.40" limits: memory: "512Mi" - cpu: "0.25" + cpu: "0.5" autoscaling: enable: true minReplica: 1 From 0d9629fa400f464d9b0a10a8baa28f7ee38bc360 Mon Sep 17 00:00:00 2001 From: pagopa-github-bot Date: Tue, 12 Sep 2023 14:00:56 +0000 Subject: [PATCH 29/29] Bump to version 1.3.6-11-chart [skip ci] --- helm/Chart.yaml | 4 ++-- helm/values-dev.yaml | 2 +- helm/values-prod.yaml | 2 +- helm/values-uat.yaml | 2 +- openapi/openapi.json | 2 +- pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helm/Chart.yaml b/helm/Chart.yaml index b4d981e0..d040fdd8 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: pagopa-api-config-selfcare-integration description: Microservice that manages requests from selfcare type: application -version: 1.23.0 -appVersion: 1.3.6-10-chart +version: 1.24.0 +appVersion: 1.3.6-11-chart dependencies: - name: microservice-chart version: 2.4.0 diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml index 07af11a8..d9566460 100644 --- a/helm/values-dev.yaml +++ b/helm/values-dev.yaml @@ -4,7 +4,7 @@ microservice-chart: fullnameOverride: "" image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: 1.3.6-10-chart + tag: 1.3.6-11-chart pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 72daa165..792348f4 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -15,7 +15,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-10-chart" + tag: "1.3.6-11-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index a0a04107..6232a092 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -15,7 +15,7 @@ microservice-chart: envSecret: {} image: repository: ghcr.io/pagopa/pagopa-api-config-selfcare-integration - tag: "1.3.6-10-chart" + tag: "1.3.6-11-chart" pullPolicy: Always livenessProbe: httpGet: diff --git a/openapi/openapi.json b/openapi/openapi.json index 351f733b..729b03fe 100644 --- a/openapi/openapi.json +++ b/openapi/openapi.json @@ -4,7 +4,7 @@ "description": "Spring application exposes APIs for SelfCare", "termsOfService": "https://www.pagopa.gov.it/", "title": "API-Config - SelfCare Integration", - "version": "1.3.6-10-chart" + "version": "1.3.6-11-chart" }, "servers": [ { diff --git a/pom.xml b/pom.xml index fe90b6f1..c9053247 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ it.gov.pagopa.api-config selfcareintegration - 1.3.6-10-chart + 1.3.6-11-chart API-Config - SelfCare Integration Spring application exposes APIs for SelfCare