From 5e308bdeea1336b88e66c3d29f89fed696508d34 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Fri, 25 Oct 2024 13:26:39 -0400 Subject: [PATCH] Update versions of infra services (#1252) Signed-off-by: Eric Deandrea --- event-statistics/src/main/docker-compose/infra.yml | 4 ++-- event-statistics/src/main/kubernetes/common.yml | 4 ++-- .../src/main/resources/application.properties | 1 + grpc-locations/src/main/docker-compose/infra.yml | 2 +- grpc-locations/src/main/kubernetes/common.yml | 2 +- grpc-locations/src/main/resources/application.yml | 2 ++ monitoring/config/otel-collector-config.yml | 6 +++--- monitoring/docker-compose/monitoring.yml | 5 +++-- monitoring/k8s/base.yml | 11 ++++++----- rest-fights/src/main/docker-compose/infra.yml | 6 +++--- rest-fights/src/main/kubernetes/common.yml | 6 +++--- rest-fights/src/main/resources/application.properties | 1 + rest-heroes/src/main/docker-compose/infra.yml | 2 +- rest-heroes/src/main/kubernetes/common.yml | 2 +- rest-heroes/src/main/resources/application.yml | 3 +++ rest-villains/src/main/docker-compose/infra.yml | 2 +- rest-villains/src/main/kubernetes/common.yml | 2 +- .../src/main/resources/application.properties | 1 + .../src/main/resources/application.properties | 2 +- 19 files changed, 37 insertions(+), 27 deletions(-) diff --git a/event-statistics/src/main/docker-compose/infra.yml b/event-statistics/src/main/docker-compose/infra.yml index 3b46d4107..c093758d8 100644 --- a/event-statistics/src/main/docker-compose/infra.yml +++ b/event-statistics/src/main/docker-compose/infra.yml @@ -1,6 +1,6 @@ apicurio: - image: quay.io/apicurio/apicurio-registry-mem:2.4.2.Final + image: quay.io/apicurio/apicurio-registry-mem:2.6.5.Final container_name: apicurio ports: - "8086:8086" @@ -9,7 +9,7 @@ QUARKUS_HTTP_PORT: 8086 fights-kafka: - image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0 + image: quay.io/strimzi/kafka:0.43.0-kafka-3.8.0 container_name: fights-kafka depends_on: - apicurio diff --git a/event-statistics/src/main/kubernetes/common.yml b/event-statistics/src/main/kubernetes/common.yml index b8a72353c..a86febff3 100644 --- a/event-statistics/src/main/kubernetes/common.yml +++ b/event-statistics/src/main/kubernetes/common.yml @@ -45,7 +45,7 @@ spec: system: quarkus-super-heroes spec: containers: - - image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0 + - image: quay.io/strimzi/kafka:0.43.0-kafka-3.8.0 name: fights-kafka ports: - containerPort: 9092 @@ -116,7 +116,7 @@ spec: system: quarkus-super-heroes spec: containers: - - image: quay.io/apicurio/apicurio-registry-mem:2.4.2.Final + - image: quay.io/apicurio/apicurio-registry-mem:2.6.5.Final name: apicurio livenessProbe: failureThreshold: 3 diff --git a/event-statistics/src/main/resources/application.properties b/event-statistics/src/main/resources/application.properties index ba67180a1..2e2737b72 100644 --- a/event-statistics/src/main/resources/application.properties +++ b/event-statistics/src/main/resources/application.properties @@ -13,6 +13,7 @@ mp.messaging.incoming.fights.auto.offset.reset=earliest mp.messaging.incoming.fights.broadcast=true mp.messaging.incoming.fights.enable.auto.commit=false %test.mp.messaging.incoming.fights.connector=smallrye-in-memory +quarkus.apicurio-registry.devservices.image-name=quay.io/apicurio/apicurio-registry-mem:2.6.5.Final ## Logging configuration quarkus.log.category."io.quarkus.sample.superheroes".level=DEBUG diff --git a/grpc-locations/src/main/docker-compose/infra.yml b/grpc-locations/src/main/docker-compose/infra.yml index d289eb57d..5be804205 100644 --- a/grpc-locations/src/main/docker-compose/infra.yml +++ b/grpc-locations/src/main/docker-compose/infra.yml @@ -1,6 +1,6 @@ locations-db: - image: mariadb:10.11 + image: mariadb:11.5 container_name: locations-db ports: - "3306" diff --git a/grpc-locations/src/main/kubernetes/common.yml b/grpc-locations/src/main/kubernetes/common.yml index 18c6e5ee0..b6190dec6 100644 --- a/grpc-locations/src/main/kubernetes/common.yml +++ b/grpc-locations/src/main/kubernetes/common.yml @@ -89,7 +89,7 @@ spec: - name: locations-db-init mountPath: /tmp/dbinit containers: - - image: bitnami/mariadb:10.11 + - image: bitnami/mariadb:11.5 name: locations-db ports: - containerPort: 3306 diff --git a/grpc-locations/src/main/resources/application.yml b/grpc-locations/src/main/resources/application.yml index b40456082..73d7da16f 100644 --- a/grpc-locations/src/main/resources/application.yml +++ b/grpc-locations/src/main/resources/application.yml @@ -24,6 +24,8 @@ quarkus: datasource: jdbc: telemetry: true + devservices: + image-name: mariadb:11.5 otel: resource: attributes: "app=${quarkus.application.name},application=grpc-locations,system=quarkus-super-heroes" diff --git a/monitoring/config/otel-collector-config.yml b/monitoring/config/otel-collector-config.yml index d4ada8eee..41c71cb93 100644 --- a/monitoring/config/otel-collector-config.yml +++ b/monitoring/config/otel-collector-config.yml @@ -5,8 +5,8 @@ receivers: endpoint: otel-collector:4317 exporters: - jaeger: - endpoint: jaeger:14250 + otlp/jaeger: + endpoint: jaeger:4317 tls: insecure: true @@ -26,4 +26,4 @@ service: processors: - batch exporters: - - jaeger + - otlp/jaeger diff --git a/monitoring/docker-compose/monitoring.yml b/monitoring/docker-compose/monitoring.yml index 2b5cb7446..37f6ed60a 100644 --- a/monitoring/docker-compose/monitoring.yml +++ b/monitoring/docker-compose/monitoring.yml @@ -2,7 +2,7 @@ version: "3" services: prometheus: - image: quay.io/prometheus/prometheus:v2.43.0 + image: quay.io/prometheus/prometheus:v2.55.0 container_name: prometheus ports: - "9090:9090" @@ -16,9 +16,10 @@ services: - "16686:16686" # Jaeger UI - "14268" # Accept thrift spans - "14250" # Accept gRPC spans + - "4317" # Otel gRPC otel-collector: - image: otel/opentelemetry-collector:0.75.0 + image: otel/opentelemetry-collector:0.112.0 container_name: otel-collector command: - "--config=/conf/otel-collector-config.yml" diff --git a/monitoring/k8s/base.yml b/monitoring/k8s/base.yml index d73d46c45..cbb11e071 100644 --- a/monitoring/k8s/base.yml +++ b/monitoring/k8s/base.yml @@ -79,8 +79,8 @@ data: grpc: exporters: - jaeger: - endpoint: jaeger:14250 + otlp/jaeger: + endpoint: jaeger:4317 tls: insecure: true @@ -100,7 +100,7 @@ data: processors: - batch exporters: - - jaeger + - otlp/jaeger --- apiVersion: apps/v1 kind: Deployment @@ -129,7 +129,7 @@ spec: role: monitoring spec: containers: - - image: quay.io/prometheus/prometheus:v2.43.0 + - image: quay.io/prometheus/prometheus:v2.55.0 name: prometheus ports: - containerPort: 9090 @@ -181,6 +181,7 @@ spec: - containerPort: 16686 - containerPort: 14268 - containerPort: 14250 + - containerPort: 4317 resources: limits: memory: 128Mi @@ -214,7 +215,7 @@ spec: role: monitoring spec: containers: - - image: otel/opentelemetry-collector:0.75.0 + - image: otel/opentelemetry-collector:0.112.0 name: otel-collector args: - "--config=/conf/otel-collector-config.yml" diff --git a/rest-fights/src/main/docker-compose/infra.yml b/rest-fights/src/main/docker-compose/infra.yml index 3c2696615..834c0ceb8 100644 --- a/rest-fights/src/main/docker-compose/infra.yml +++ b/rest-fights/src/main/docker-compose/infra.yml @@ -1,6 +1,6 @@ fights-db: - image: mongo:5.0 + image: mongo:7.0 container_name: fights-db ports: - "27017" @@ -12,7 +12,7 @@ - ../../../rest-fights/deploy/db-init/initialize-database.js:/docker-entrypoint-initdb.d/1-init-db.js apicurio: - image: quay.io/apicurio/apicurio-registry-mem:2.4.2.Final + image: quay.io/apicurio/apicurio-registry-mem:2.6.5.Final container_name: apicurio ports: - "8086:8086" @@ -21,7 +21,7 @@ QUARKUS_HTTP_PORT: 8086 fights-kafka: - image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0 + image: quay.io/strimzi/kafka:0.43.0-kafka-3.8.0 container_name: fights-kafka depends_on: - apicurio diff --git a/rest-fights/src/main/kubernetes/common.yml b/rest-fights/src/main/kubernetes/common.yml index 3df2d2b43..f1ba33b04 100644 --- a/rest-fights/src/main/kubernetes/common.yml +++ b/rest-fights/src/main/kubernetes/common.yml @@ -63,7 +63,7 @@ spec: system: quarkus-super-heroes spec: containers: - - image: bitnami/mongodb:5.0 + - image: bitnami/mongodb:7.0 name: fights-db ports: - containerPort: 27017 @@ -116,7 +116,7 @@ spec: system: quarkus-super-heroes spec: containers: - - image: quay.io/strimzi/kafka:0.41.0-kafka-3.7.0 + - image: quay.io/strimzi/kafka:0.43.0-kafka-3.8.0 name: fights-kafka ports: - containerPort: 9092 @@ -187,7 +187,7 @@ spec: system: quarkus-super-heroes spec: containers: - - image: quay.io/apicurio/apicurio-registry-mem:2.4.2.Final + - image: quay.io/apicurio/apicurio-registry-mem:2.6.5.Final name: apicurio livenessProbe: failureThreshold: 3 diff --git a/rest-fights/src/main/resources/application.properties b/rest-fights/src/main/resources/application.properties index 09637028c..2deca60ee 100644 --- a/rest-fights/src/main/resources/application.properties +++ b/rest-fights/src/main/resources/application.properties @@ -81,6 +81,7 @@ mp.messaging.outgoing.fights.topic=fights mp.messaging.outgoing.fights.apicurio.registry.auto-register=true %test.mp.messaging.outgoing.fights.connector=smallrye-in-memory %test.mp.messaging.outgoing.fights.merge=true +quarkus.apicurio-registry.devservices.image-name=quay.io/apicurio/apicurio-registry-mem:2.6.5.Final ## Logging configuration quarkus.log.category."io.quarkus.sample.superheroes".level=DEBUG diff --git a/rest-heroes/src/main/docker-compose/infra.yml b/rest-heroes/src/main/docker-compose/infra.yml index 7d7bb33d0..51d06739a 100644 --- a/rest-heroes/src/main/docker-compose/infra.yml +++ b/rest-heroes/src/main/docker-compose/infra.yml @@ -1,6 +1,6 @@ heroes-db: - image: postgres:14 + image: postgres:16 container_name: heroes-db ports: - "5432" diff --git a/rest-heroes/src/main/kubernetes/common.yml b/rest-heroes/src/main/kubernetes/common.yml index 695573894..e5830ca2b 100644 --- a/rest-heroes/src/main/kubernetes/common.yml +++ b/rest-heroes/src/main/kubernetes/common.yml @@ -89,7 +89,7 @@ spec: - name: heroes-db-init-data mountPath: /docker-entrypoint-initdb.d containers: - - image: bitnami/postgresql:14 + - image: bitnami/postgresql:16 name: heroes-db ports: - containerPort: 5432 diff --git a/rest-heroes/src/main/resources/application.yml b/rest-heroes/src/main/resources/application.yml index 5e7e9b82c..66580e00d 100644 --- a/rest-heroes/src/main/resources/application.yml +++ b/rest-heroes/src/main/resources/application.yml @@ -3,6 +3,9 @@ quarkus: name: rest-heroes banner: path: banner.txt + datasource: + devservices: + image-name: postgres:16 log: level: INFO category: diff --git a/rest-villains/src/main/docker-compose/infra.yml b/rest-villains/src/main/docker-compose/infra.yml index 38de39da6..92044d834 100644 --- a/rest-villains/src/main/docker-compose/infra.yml +++ b/rest-villains/src/main/docker-compose/infra.yml @@ -1,6 +1,6 @@ villains-db: - image: postgres:14 + image: postgres:16 container_name: villains-db ports: - "5432" diff --git a/rest-villains/src/main/kubernetes/common.yml b/rest-villains/src/main/kubernetes/common.yml index abdaf0f18..fbc1ce049 100644 --- a/rest-villains/src/main/kubernetes/common.yml +++ b/rest-villains/src/main/kubernetes/common.yml @@ -88,7 +88,7 @@ spec: - name: villains-db-init-data mountPath: /docker-entrypoint-initdb.d containers: - - image: bitnami/postgresql:14 + - image: bitnami/postgresql:16 name: villains-db ports: - containerPort: 5432 diff --git a/rest-villains/src/main/resources/application.properties b/rest-villains/src/main/resources/application.properties index e7b33ec8a..242312259 100644 --- a/rest-villains/src/main/resources/application.properties +++ b/rest-villains/src/main/resources/application.properties @@ -1,5 +1,6 @@ quarkus.application.name=rest-villains quarkus.banner.path=banner.txt +quarkus.datasource.devservices.image-name=postgres:16 ## HTTP configuration quarkus.http.port=8084 diff --git a/ui-super-heroes/src/main/resources/application.properties b/ui-super-heroes/src/main/resources/application.properties index 2877a2e72..93f314094 100644 --- a/ui-super-heroes/src/main/resources/application.properties +++ b/ui-super-heroes/src/main/resources/application.properties @@ -4,7 +4,7 @@ quarkus.banner.path=banner.txt quarkus.http.test-port=0 quarkus.quinoa.package-manager-install=true -quarkus.quinoa.package-manager-install.node-version=20.11.0 +quarkus.quinoa.package-manager-install.node-version=20.18.0 # Fight service config api.base.url=http://localhost:8082