Merge branch 'refactoring'

Author: Andreas Mautsch

doc/gitparser/adapter.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+GITHUB_URL="https://github.com/goafabric"
+WORKDIR="/tmp/repos"  # Temporary directory to clone repositories
+REPOLIST="$(pwd)/repos.txt"  # List of repositories
+
+# Ensure the working directory exists
+mkdir -p "$WORKDIR"
+cd "$WORKDIR" || exit 1
+
+# Loop through each repository in repos.txt
+while read -r repo; do
+    echo "Processing repository: $repo"
+
+    # Clone the repository (shallow clone for speed)
+    git clone --depth 1 "$GITHUB_URL/$repo.git" "$repo" 2>/dev/null
+
+    # Navigate into the repository
+    cd "$repo" || continue
+
+    # Ensure we are on the main branch
+    git checkout main 2>/dev/null || git checkout master 2>/dev/null
+
+    # Check if application.yaml exists
+    FILE="src/main/resources/application.yml"
+    if [[ -f "$FILE" ]]; then
+         echo "Found inside $repo"
+
+         # Extract the adapter block and process it:
+         sed -n '/^adapter:/,/^[^ ]/p' "$FILE" | \
+         awk '
+             function trim(s) { sub(/^[ \t]+/, "", s); sub(/[ \t]+$/, "", s); return s }
+             BEGIN { current_service="" }
+             # Look for a key at 2-space indent that is “empty” (ends with a colon only)
+             /^[ \t]{2}[a-zA-Z0-9_-]+:[ \t]*$/ {
+                 key = trim($0)
+                 sub(/:$/, "", key)
+                 # Skip common non-service keys (like "timeout")
+                 if (key != "timeout") {
+                     current_service = key
+                 } else {
+                     current_service = ""
+                 }
+                 next
+             }
+             # Look for a line at 4-space indent starting with "url:"
+             /^[ \t]{4}url:[ \t]*/ {
+                 if (current_service != "") {
+                     line = trim($0)
+                     sub(/^url:[ \t]*/, "", line)
+                     print "adapter." current_service ".url=" line
+                 }
+             }
+         '
+         echo "-------------------------"
+     fi
+
+    # Cleanup and move back
+    cd "$WORKDIR"
+    rm -rf "$repo"  # Remove cloned repo to save space
+done < "$REPOLIST"

doc/gitparser/repos.txt

@@ -0,0 +1,2 @@
+person-service
+invoice-process

doc/release-notes.md

@@ -1,3 +1,13 @@
+# 1.3.7
+- upgrade Kind to Kubernetes 1.32 
+- upgrade of Spring Applications to 3.4.3
+- dragonfly added as redis alternative
+- upgrade to istio 1.25.0
+
+- argocd added for all deployments
+- moved specific network polices to terraform/infra/network-policies
+- moved specific auto-scaler policies from terraform to helm charts
+
 # 1.3.6
 - upgrade to Istio 1.24.2 
 - upgrade to Kiali 2.3.0

helm/core/catalog/application/Chart.yaml

@@ -4,6 +4,6 @@ description: catalog-application
 
 type: application
 
-version: 1.3.6
+version: 1.3.7
 
-appVersion: "3.3.3"
+appVersion: "3.4.3"

helm/core/catalog/application/templates/config.yaml

@@ -34,7 +34,7 @@ data:
   management.tracing.sampling.probability: "1.0"
 
   #persistence
-  spring.datasource.url: "jdbc:postgresql://core-postgres-postgresql-ha-pgpool:5432/core"
+  spring.datasource.url: "jdbc:postgresql://{{ .Values.postgresql.host }}:5432/main"
   spring.datasource.hikari.maximum-pool-size: "10"
   spring.datasource.hikari.connection-timeout: "10000"
 

helm/core/catalog/application/templates/deployment.yaml

@@ -22,8 +22,8 @@ spec:
     spec:
       {{- with .Values.initContainers }}
       initContainers:
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        {{ tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
 
       {{ if .Values.image.pullSecrets }}
       imagePullSecrets:

helm/core/catalog/application/templates/scaler.yaml

@@ -0,0 +1,27 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "application.fullname" . }}
+  namespace: {{ .Release.namespace }}
+spec:
+  minReplicas: {{ .Values.replicaCount }}
+  maxReplicas: {{ .Values.maxReplicas }}
+  metrics:
+    - resource:
+        name: cpu
+        target:
+          averageUtilization: 50
+          type: Utilization
+      type: Resource
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "application.fullname" . }}
+  behavior:
+    scaleDown:
+      stabilizationWindowSeconds: 30
+      selectPolicy: Max
+      policies:
+        - type: Percent
+          value: 100
+          periodSeconds: 15

helm/core/catalog/application/templates/secret.yaml

@@ -6,5 +6,5 @@ metadata:
     {{- include "application.labels" . | nindent 4 }}
 
 data:
-  spring.datasource.username: Y29yZQ==
+  spring.datasource.username: bWFpbg==
   spring.datasource.password: {{ .Values.database.password | b64enc }}

helm/core/catalog/application/values.yaml

@@ -1,4 +1,5 @@
-replicaCount: 2
+replicaCount: 1
+maxReplicas: 3
 
 ingress:
   paths: /catalog
@@ -34,10 +35,13 @@ service:
   type: ClusterIP
   port: 8080
 
+postgresql:
+  host: postgresql.data
+
 initContainers:
   - name: check-db-ready
-    image: postgres:17.2
-    command: ['sh', '-c','until pg_isready -h core-postgres-postgresql-ha-pgpool -p 5432;do echo waiting for database; sleep 1; done;']
+    image: postgres:17.4
+    command: ['sh', '-c','until pg_isready -h {{ .Values.postgresql.host }} -p 5432;do echo waiting for database; sleep 1; done;']
 
 oidc:
   enabled:

helm/core/catalog/batch/Chart.yaml

@@ -4,6 +4,6 @@ description: catalog-batch
 
 type: application
 
-version: 1.3.6
+version: 1.3.7
 
-appVersion: "3.3.3"
+appVersion: "3.4.3"