helm

helm/values-dev.yaml

@@ -4,7 +4,7 @@ microservice-chart:
 
   image:
     repository: ghcr.io/pagopa/ubuntu-vm
-    tag: 1.2.0
+    tag: 1.8.0
     pullPolicy: Always
 
   deployment:

helm/values-prod.yaml

@@ -0,0 +1,93 @@
+microservice-chart:
+  namespace: "apiconfig"
+  nameOverride: "ubuntu-vm"
+
+  image:
+    repository: ghcr.io/pagopa/ubuntu-vm
+    tag: 1.8.0
+    pullPolicy: Always
+
+  deployment:
+    create: true
+    replicas: 1
+
+  tmpVolumeMount:
+    create: true
+    mounts:
+      - name: tmp
+        mountPath: /tmp
+      - name: logs
+        mountPath: /app/logs
+
+  livenessProbe:
+    httpGet:
+      path: /status/live
+      port: 8080
+    initialDelaySeconds: 30
+    failureThreshold: 6
+    periodSeconds: 10
+  readinessProbe:
+    httpGet:
+      path: /status/ready
+      port: 8080
+    initialDelaySeconds: 30
+    failureThreshold: 6
+    periodSeconds: 10
+
+  service:
+    create: true
+    type: ClusterIP
+    ports:
+      - 8080
+  ingress:
+    create: true
+    host: "weuprod.apiconfig.internal.platform.pagopa.it"
+    path: /ubuntu/(.*)
+    servicePort: 8080
+
+  serviceAccount:
+    create: false
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podSecurityContext:
+    seccompProfile:
+      type: RuntimeDefault
+  securityContext:
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: false
+    capabilities:
+      drop:
+        - all
+
+  resources:
+    requests:
+      memory: "256Mi"
+      cpu: "40m"
+    limits:
+      memory: "256Mi"
+      cpu: "150m"
+  autoscaling:
+    enable: true
+    minReplica: 1
+    maxReplica: 1
+    pollingInterval: 30 # seconds
+    cooldownPeriod: 300 # seconds
+    triggers:
+      - type: cpu
+        metadata:
+          type: Utilization
+          value: "60"
+
+  envConfig:
+    SPRING_DATASOURCE_USERNAME: 'NODO4_CFG'
+    SPRING_DATASOURCE_HOST: 'db-nodo-pagamenti.p.db-nodo-pagamenti.com/NDPSPCP_NODO4_CFG'
+    SPRING_DATASOURCE_PORT: '1521'
+  envSecret:
+    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'
+  keyvault:
+    name: "pagopa-d-apiconfig-kv"
+    tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
+
+

helm/values-uat.yaml

@@ -0,0 +1,93 @@
+microservice-chart:
+  namespace: "apiconfig"
+  nameOverride: "ubuntu-vm"
+
+  image:
+    repository: ghcr.io/pagopa/ubuntu-vm
+    tag: 1.8.0
+    pullPolicy: Always
+
+  deployment:
+    create: true
+    replicas: 1
+
+  tmpVolumeMount:
+    create: true
+    mounts:
+      - name: tmp
+        mountPath: /tmp
+      - name: logs
+        mountPath: /app/logs
+
+  livenessProbe:
+    httpGet:
+      path: /status/live
+      port: 8080
+    initialDelaySeconds: 30
+    failureThreshold: 6
+    periodSeconds: 10
+  readinessProbe:
+    httpGet:
+      path: /status/ready
+      port: 8080
+    initialDelaySeconds: 30
+    failureThreshold: 6
+    periodSeconds: 10
+
+  service:
+    create: true
+    type: ClusterIP
+    ports:
+      - 8080
+  ingress:
+    create: true
+    host: "weuuat.apiconfig.internal.uat.platform.pagopa.it"
+    path: /ubuntu/(.*)
+    servicePort: 8080
+
+  serviceAccount:
+    create: false
+    annotations: {}
+    name: ""
+
+  podAnnotations: {}
+  podSecurityContext:
+    seccompProfile:
+      type: RuntimeDefault
+  securityContext:
+    allowPrivilegeEscalation: false
+    readOnlyRootFilesystem: false
+    capabilities:
+      drop:
+        - all
+
+  resources:
+    requests:
+      memory: "256Mi"
+      cpu: "40m"
+    limits:
+      memory: "256Mi"
+      cpu: "150m"
+  autoscaling:
+    enable: true
+    minReplica: 1
+    maxReplica: 1
+    pollingInterval: 30 # seconds
+    cooldownPeriod: 300 # seconds
+    triggers:
+      - type: cpu
+        metadata:
+          type: Utilization
+          value: "60"
+
+  envConfig:
+    SPRING_DATASOURCE_USERNAME: 'PP_NODO4_CFG'
+    SPRING_DATASOURCE_HOST: 'db-nodo-pagamenti.u.db-nodo-pagamenti.com/NDPSPCA_NODO4_CFG'
+    SPRING_DATASOURCE_PORT: '1524'
+  envSecret:
+    SPRING_DATASOURCE_PASSWORD: 'oracle-db-cfg-password'
+  keyvault:
+    name: "pagopa-d-apiconfig-kv"
+    tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
+
+

scripts/connect_oracle.py

@@ -4,8 +4,8 @@
 
 
 connection = oracledb.connect(
-    dsn="db-nodo-pagamenti.d.db-nodo-pagamenti.com/NDPSPCT_PP_NODO4_CFG",
-    port=1522,
+    dsn=os.environ['SPRING_DATASOURCE_HOST'],
+    port=int(os.environ['SPRING_DATASOURCE_PORT']),
     user=os.environ['SPRING_DATASOURCE_USERNAME'],
     password=os.environ['SPRING_DATASOURCE_PASSWORD']
 )
@@ -24,9 +24,10 @@
             tax_code = row[8]
             psp_codes = row[2]
             for psp_code in psp_codes.split(','):
-                print(f'\t PSP {psp_code} set taxcode {tax_code}')
-                line_count += 1
-                values.append((tax_code, psp_code))
+                if len(psp_code) > 0:
+                    print(f'\t PSP {psp_code} set taxcode {tax_code}')
+                    line_count += 1
+                    values.append((tax_code, psp_code))
 
     print("Executing query...")
     cursor = connection.cursor()