Keda autoscaling

.devops/code-review-pipelines.yml

@@ -76,7 +76,7 @@ stages:
           - task: Docker@2
             displayName: "Docker login"
             inputs:
-              containerRegistry: "$(DEV_CONTAINER_REGISTRY_SERVICE_CONN)"
+              containerRegistry: "$(DEV_CONTAINER_REGISTRY)"
               command: "login"
 
           - task: Bash@3

.devops/deploy-pipelines.yml

@@ -31,31 +31,38 @@ parameters:
     values:
       - False
       - True
+  - name: "DOCKERFILE_NAME"
+    type: string
+    default: Dockerfile
+    values:
+      - Dockerfile
+      - Dockerfile-native
   - name: TEST
     displayName: Run integration/smoke tests
     type: boolean
     default: true
 
 variables:
-  imageRepository: '$(IMAGE_REPOSITORY_NAME)'
+  imageRepository: '$(IMAGE_REPOSITORY)'
   nameSpace: '$(K8S_NAMESPACE)'
 
   ${{ if eq(parameters['ENV'], 'dev') }}:
-    dockerRegistryServiceConnection: $(DEV_CONTAINER_REGISTRY_SERVICE_CONN)
+    dockerRegistryServiceConnection: $(DEV_CONTAINER_REGISTRY)
     dockerRegistryFqdn: $(DEV_CONTAINER_NAMESPACE)
     kubernetesServiceConnection: '$(DEV_KUBERNETES_SERVICE_CONN)'
     poolImage: 'pagopa-dev-linux'
     appInsightsServiceConn: "$(TF_APPINSIGHTS_SERVICE_CONN_DEV)"
     appInsightsResourceId: "$(TF_APPINSIGHTS_RESOURCE_ID_DEV)"
+    pocReportingEnrollmentSubKey: "$(DEV_POC_ENROLLMENT_SUB_KEY)"
   ${{ if eq(parameters['ENV'], 'uat') }}:
-    dockerRegistryServiceConnection: $(UAT_CONTAINER_REGISTRY_SERVICE_CONN)
+    dockerRegistryServiceConnection: $(UAT_CONTAINER_REGISTRY)
     dockerRegistryFqdn: $(UAT_CONTAINER_NAMESPACE)
     kubernetesServiceConnection: '$(UAT_KUBERNETES_SERVICE_CONN)'
     poolImage: 'pagopa-uat-linux'
     appInsightsServiceConn: "$(TF_APPINSIGHTS_SERVICE_CONN_UAT)"
     appInsightsResourceId: "$(TF_APPINSIGHTS_RESOURCE_ID_UAT)"
   ${{ if eq(parameters['ENV'], 'prod') }}:
-    dockerRegistryServiceConnection: $(PROD_CONTAINER_REGISTRY_SERVICE_CONN)
+    dockerRegistryServiceConnection: $(PROD_CONTAINER_REGISTRY)
     dockerRegistryFqdn: $(PROD_CONTAINER_NAMESPACE)
     kubernetesServiceConnection: '$(PROD_KUBERNETES_SERVICE_CONN)'
     poolImage: 'pagopa-prod-linux'
@@ -74,7 +81,7 @@ resources:
     - repository: pagopaCommons
       type: github
       name: pagopa/azure-pipeline-templates
-      ref: refs/tags/v2.10.1
+      ref: refs/tags/v3.9.0
       endpoint: 'io-azure-devops-github-ro'
 
 stages:
@@ -124,6 +131,7 @@ stages:
               DOCKER_IMAGE_NAME: $(imageRepository)
               DOCKER_IMAGE_TAG: $(current_version)
               FORCE_REPLACE_DOCKER_IMAGE: ${{ parameters.FORCE_REPLACE_DOCKER_IMAGE }}
+              DOCKERFILE: ${{ parameters.DOCKERFILE_NAME }}
 
   # Testing the docker image
   - stage: Smoke_Test
@@ -158,11 +166,9 @@ stages:
 
   # Deploy on K8s with Helm
   - stage: Deploy
-    condition: not(failed('Smoke_Test'))
     dependsOn:
       - Release
       - Build
-      - Smoke_Test
     variables:
       deploy_version: $[ stageDependencies.Release.make_release.outputs['current_version.value'] ]
     jobs:
@@ -219,5 +225,6 @@ stages:
               targetType: 'inline'
               script: |
                 cd ./integration-test/src
+                export ORG_ENROLLMENT_SUBSCRIPTION_KEY=${{ variables.pocReportingEnrollmentSubKey }}
                 yarn install
                 yarn test:${{ parameters.ENV }}

.devops/performance-test-pipelines.yml

@@ -1,47 +1,54 @@
 # azure-pipelines.yml
 trigger: none
 
-pool:
-  name: performance-test-linux
-
 parameters:
-  - name: "API_SUBSCRIPTION_KEY"
-    displayName: "API_SUBSCRIPTION_KEY"
-    type: string
   - name: "ENVIRONMENT"
     displayName: "Environment"
     type: string
     values:
       - "dev"
       - "uat"
-      - "prod"
   - name: "TEST_TYPE"
     displayName: "Test type"
     type: string
     values:
       - "load"
       - "spike"
       - "stress"
-      - "soak"
-      - # TODO: add your values
+      - "constant"
+      - "smoke"
   - name: "SCRIPT"
     displayName: "Script name"
     type: string
     values:
-      - yourscriptname # TODO: add your script
+      - create_organization
+      - delete_organization
+      - get_organization
+      - get_organizations
+
+variables:
+  ${{ if eq(parameters['ENVIRONMENT'], 'dev') }}:
+    poolImage: 'pagopa-dev-loadtest-linux'
+    orgEnrollmentSubscriptionKey: '$(DEV_POC_ENROLLMENT_SUB_KEY)'
+  ${{ if eq(parameters['ENVIRONMENT'], 'uat') }}:
+    poolImage: 'pagopa-uat-loadtest-linux'
+    orgEnrollmentSubscriptionKey: '$(UAT_POC_ENROLLMENT_SUB_KEY)'
+
+pool:
+  name: $(poolImage)
 
 steps:
   - script: |
-      cd ./performance-tests/src
+      cd ./performance-test/src
       docker pull grafana/k6
     displayName: Pull k6 image
 
-    # TODO: add your env params
   - script: |
+      cd ./performance-test/src
       docker run \
         -v ${PWD}:/script \
-        -e API_SUBSCRIPTION_KEY=${{ parameters.API_SUBSCRIPTION_KEY }} \
+        -e ORG_ENROLLMENT_SUBSCRIPTION_KEY=$(orgEnrollmentSubscriptionKey) \
         -e VARS=${{ parameters.ENVIRONMENT }}.environment.json \
         -e TEST_TYPE=./test-types/${{ parameters.TEST_TYPE }}.json \
-        grafana/k6 run /script/${{ parameters.SCRIPT }}.js \
+        grafana/k6 run /script/${{ parameters.SCRIPT }}.js
     displayName: Run k6 ${{ parameters.SCRIPT }} on ${{ parameters.ENVIRONMENT }}

Dockerfile

@@ -6,12 +6,14 @@ COPY src /home/app/src
 COPY pom.xml /home/app
 COPY openapi.properties /home/app
 RUN mvn -f /home/app/pom.xml clean package -Dmaven.test.skip=true
+RUN mvn -f /home/app/pom.xml dependency:copy-dependencies
 
 #
 # Package stage
 #
-FROM adoptopenjdk/openjdk16:alpine
-COPY --from=build /home/app/target/ReportingOrgsEnrollment-*.jar /usr/local/lib/app.jar
-RUN true
+FROM openjdk:17-alpine
+WORKDIR /home/app
+COPY --from=build /home/app/target/classes /home/app/classes
+COPY --from=build /home/app/target/dependency/* /home/app/libs/
 EXPOSE 8080
-ENTRYPOINT ["java","-jar","/usr/local/lib/app.jar"]
+ENTRYPOINT ["java", "-cp", "/home/app/libs/*:/home/app/classes/", "it.gov.pagopa.reportingorgsenrollment.Application"]

Dockerfile-native

@@ -0,0 +1,24 @@
+FROM maven:3.8.4-jdk-11-slim as buildtime
+WORKDIR /build
+COPY . .
+RUN mvn clean package -Dmaven.test.skip=true
+RUN mvn dependency:copy-dependencies
+
+FROM ghcr.io/graalvm/native-image:ol7-java11-22.2.0 as builder
+WORKDIR /home/app
+COPY --from=buildtime build/target/classes /home/app/classes
+COPY --from=buildtime build/target/dependency/* /home/app/libs/
+COPY --from=buildtime build/native-image/* /home/app/classes/native-image/
+ENV CLASS_NAME=it.gov.pagopa.reportingorgsenrollment.Application
+ENV GRAALVM_ARGS="-H:+ReportExceptionStackTraces --initialize-at-build-time=org.codehaus.stax2.typed.Base64Variants -H:+AddAllCharsets -H:DynamicProxyConfigurationResources=./native-image/proxy-config.json -H:JNIConfigurationResources=./native-image/jni-config.json -H:ReflectionConfigurationResources=./native-image/reflect-config.json -H:ResourceConfigurationResources=./native-image/resource-config.json -H:SerializationConfigurationResources=./native-image/serialization-config.json --initialize-at-build-time=com.azure.data.tables.implementation.models"
+ENV USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
+RUN native-image ${GRAALVM_ARGS} -H:Class=${CLASS_NAME} -H:Name=application --no-fallback -cp "/home/app/libs/*:/home/app/classes/"
+
+FROM frolvlad/alpine-glibc:alpine-3.12
+ARG EXTRA_CMD
+RUN if [[ -n "${EXTRA_CMD}" ]] ; then eval ${EXTRA_CMD} ; fi
+COPY --from=builder /home/app/application /app/application
+
+ARG PORT=8080
+EXPOSE ${PORT}
+ENTRYPOINT ["/app/application"]

docker/config/.env

@@ -1,11 +1,4 @@
-# TODO: put docker env vars here
 ENV=docker
-# to use azurite
-#CONNECTION_STRING=UseDevelopmentStorage=true;DevelopmentStorageProxyUri=http://azure-storage
-
-# to use cosmosDB
-#COSMOS_URI=http://10.20.0.2:8081/
-#COSMOS_KEY=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==
-
-ORGANIZATIONS_TABLE=organizations
-STORAGE_PRIMARY_CONNECTION_KEY=<key>
+# to use local azurite emulator
+STORAGE_PRIMARY_CONNECTION_KEY=AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;DefaultEndpointsProtocol=http;BlobEndpoint=http://host.docker.internal:10000/devstoreaccount1;QueueEndpoint=http://host.docker.internal:10001/devstoreaccount1;TableEndpoint=http://host.docker.internal:10002/devstoreaccount1;
+ORGANIZATIONS_TABLE=organizations

docker/docker-compose.yml

@@ -34,16 +34,16 @@ services:
 #    networks:
 #      afm_net:
 
-#  azure-storage:
-#    container_name: 'azure-storage'
-#    image: mcr.microsoft.com/azure-storage/azurite
-#    ports:
-#      - '10000:10000'
-#      - '10001:10001'
-#      - '10002:10002'
-#    networks:
-#      app_net:
-#        ipv4_address: 10.20.0.3
+  azure-storage:
+    container_name: 'azure-storage'
+    image: mcr.microsoft.com/azure-storage/azurite
+    ports:
+      - '10000:10000'
+      - '10001:10001'
+      - '10002:10002'
+    networks:
+      app_net:
+        ipv4_address: 10.20.0.3
 
 #  cosmosdb:
 #    container_name: 'cosmosdb'

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: 5.0.0
+digest: sha256:acce690c924529c84ccd541dd046bf2fa8e6d379d0bfe6f2e200d95466cdb253
+generated: "2023-06-22T16:15:27.249626+02:00"

helm/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-name: pagopa-afm-calculator
-description: Microservice that handles calculation for pagoPA Advanced Fees Management
+name: pagopa-poc-micronaut
+description: PoC Micronaut
 type: application
-version: 0.0.3
-appVersion: 0.0.3
+version: 0.1.0
+appVersion: 0.1.0
 dependencies:
   - name: microservice-chart
-    version: 1.21.0
+    version: 5.0.0
     repository: "https://pagopa.github.io/aks-microservice-chart-blueprint"

helm/values-dev.yaml

@@ -4,18 +4,18 @@ microservice-chart:
   fullnameOverride: ""
   image:
     repository: pagopadcommonacr.azurecr.io/pagopapocmicronaut
-    tag: "latest"
+    tag: "0.1.0"
     pullPolicy: Always
   livenessProbe:
     httpGet:
-      path: /info
+      path: /health/liveness
       port: 8080
     initialDelaySeconds: 90
     failureThreshold: 6
     periodSeconds: 10
   readinessProbe:
     httpGet:
-      path: /info
+      path: /health/readiness
       port: 8080
     initialDelaySeconds: 90
     failureThreshold: 6
@@ -42,23 +42,23 @@ microservice-chart:
     allowPrivilegeEscalation: false
   resources:
     requests:
-      memory: "384Mi"
-      cpu: "0.20"
+      memory: "256Mi"
+      cpu: "0.25"
     limits:
       memory: "512Mi"
-      cpu: "0.30"
+      cpu: "0.25"
   autoscaling:
     enable: true
     minReplica: 1
-    maxReplica: 2
+    maxReplica: 3
     pollingInterval: 10 # seconds
     cooldownPeriod: 50 # seconds
     triggers:
-      - type: cpu
+      - type: metrics-api
         metadata:
-          # Required
-          type: Utilization # Allowed types are 'Utilization' or 'AverageValue'
-          value: "75"
+          targetValue: "1"
+          url: "https://weudev.shared.internal.dev.platform.pagopa.it/pagopa-poc-micronaut-service/metrics/custom"
+          valueLocation: "meanTimePerRequest"
   envConfig:
     WEBSITE_SITE_NAME: 'pagopa-d-poc-micronaut-service' # required to show cloud role name in application insights
     ENV: 'azure-d-aks'
@@ -73,4 +73,12 @@ microservice-chart:
     tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
   nodeSelector: {}
   tolerations: []
-  affinity: {}
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: node_type
+                operator: In
+                values:
+                  - user

integration-test/run_integration_test.sh

@@ -1,10 +1,7 @@
 # example: sh ./run_integration_test.sh <local|dev|uat|prod>
-if [[ "$(pwd)" =~ .*"integration-test" ]]; then
-  cd ..
-fi
 
 # create containers
-cd ./docker || exit
+cd ../docker || exit
 sh ./run_docker.sh "$1"
 
 # waiting the containers

integration-test/src/config/.env.dev

@@ -1 +1 @@
-APP_HOST=https://host
+REPORTING_ENROLLMENT_HOST=https://api.dev.platform.pagopa.it/shared/poc/reporting-orgs-enrollment/v1

integration-test/src/config/.env.local

@@ -1,2 +1,2 @@
 REPORTING_ENROLLMENT_HOST=http://localhost:8080
-
+ORG_ENROLLMENT_SUBSCRIPTION_KEY=<subkey>

integration-test/src/features/organizations.feature

@@ -7,6 +7,7 @@ Feature: All about Organizations
     Given an organization with id "UNKNOW"
     When the organization "creates" enrollment
     Then the organization gets the status code 201
+    Then the organization "deletes" enrollment
 
   Scenario: An organization deletes an enrollment
     Given a valid enrollment
@@ -17,11 +18,13 @@ Feature: All about Organizations
   	Given a valid enrollment
   	When the organization "gets" enrollment
   	Then the organization gets the status code 200
+    Then the organization "deletes" enrollment
 
   Scenario: An organization gets all the enrollments
   	Given a valid enrollment
   	When the organization "gets all" enrollment
   	Then the organization gets the status code 200
+    Then the organization "deletes" enrollment
 
 # 404
 
@@ -41,3 +44,4 @@ Feature: All about Organizations
     Given a valid enrollment
     When the organization "creates" enrollment
     Then the organization gets the status code 409
+    When the organization "deletes" enrollment