From ae56ad2ed1510eaa09f3241a373e23cc95a18e70 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Mon, 20 Nov 2023 09:30:19 -0500 Subject: [PATCH] Revert "Update env var formatting" This reverts commit 2f5ed7762d23d0d865c4da7c6dbedc0cef3ff831. --- .../src/main/kubernetes/common.yml | 6 +-- grpc-locations/src/main/kubernetes/common.yml | 12 +++--- rest-fights/src/main/kubernetes/common.yml | 4 +- rest-fights/src/main/kubernetes/knative.yml | 32 ++++++++-------- .../src/main/kubernetes/kubernetes.yml | 38 +++++++++---------- rest-fights/src/main/kubernetes/minikube.yml | 38 +++++++++---------- rest-fights/src/main/kubernetes/openshift.yml | 38 +++++++++---------- rest-heroes/src/main/kubernetes/common.yml | 12 +++--- rest-narration/src/main/kubernetes/common.yml | 2 +- rest-villains/src/main/kubernetes/common.yml | 12 +++--- 10 files changed, 97 insertions(+), 97 deletions(-) diff --git a/event-statistics/src/main/kubernetes/common.yml b/event-statistics/src/main/kubernetes/common.yml index ca6e0d9cb..184dac4eb 100644 --- a/event-statistics/src/main/kubernetes/common.yml +++ b/event-statistics/src/main/kubernetes/common.yml @@ -8,9 +8,9 @@ metadata: application: event-stats system: quarkus-super-heroes data: - KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092 - MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8080/apis/registry/v2 - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 + kafka.bootstrap.servers: PLAINTEXT://fights-kafka:9092 + mp.messaging.connector.smallrye-kafka.apicurio.registry.url: http://apicurio:8080/apis/registry/v2 + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 --- apiVersion: v1 kind: Secret diff --git a/grpc-locations/src/main/kubernetes/common.yml b/grpc-locations/src/main/kubernetes/common.yml index d2bb8527d..18c6e5ee0 100644 --- a/grpc-locations/src/main/kubernetes/common.yml +++ b/grpc-locations/src/main/kubernetes/common.yml @@ -8,10 +8,10 @@ metadata: application: locations-service system: quarkus-super-heroes data: - QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate - QUARKUS_HIBERNATE_ORM_SQL_LOAD_SCRIPT: no-file - QUARKUS_DATASOURCE_JDBC_URL: jdbc:mariadb://locations-db:3306/locations_database - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 + quarkus.hibernate-orm.database.generation: validate + quarkus.hibernate-orm.sql-load-script: no-file + quarkus.datasource.jdbc.url: jdbc:mariadb://locations-db:3306/locations_database + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 --- apiVersion: v1 kind: Secret @@ -23,8 +23,8 @@ metadata: application: locations-service system: quarkus-super-heroes data: - QUARKUS_DATASOURCE_USERNAME: bG9jYXRpb25z - QUARKUS_DATASOURCE_PASSWORD: bG9jYXRpb25z + quarkus.datasource.username: bG9jYXRpb25z + quarkus.datasource.password: bG9jYXRpb25z --- apiVersion: v1 kind: Secret diff --git a/rest-fights/src/main/kubernetes/common.yml b/rest-fights/src/main/kubernetes/common.yml index d7fe375fb..807bbf75e 100644 --- a/rest-fights/src/main/kubernetes/common.yml +++ b/rest-fights/src/main/kubernetes/common.yml @@ -21,8 +21,8 @@ metadata: application: fights-service system: quarkus-super-heroes data: - QUARKUS_MONGODB_CREDENTIALS_USERNAME: c3VwZXJmaWdodA== - QUARKUS_MONGODB_CREDENTIALS_PASSWORD: c3VwZXJmaWdodA== + quarkus.mongodb.credentials.username: c3VwZXJmaWdodA== + quarkus.mongodb.credentials.password: c3VwZXJmaWdodA== --- apiVersion: v1 kind: Secret diff --git a/rest-fights/src/main/kubernetes/knative.yml b/rest-fights/src/main/kubernetes/knative.yml index 5a9e90f6b..28ceb8f5e 100644 --- a/rest-fights/src/main/kubernetes/knative.yml +++ b/rest-fights/src/main/kubernetes/knative.yml @@ -8,19 +8,19 @@ metadata: application: fights-service system: quarkus-super-heroes data: - QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false - QUARKUS_MONGODB_HOSTS: fights-db:27017 - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_TYPE: knative - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-heroes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1M - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_TYPE: knative - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-villains - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1M - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_TYPE: knative - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-narration - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1M - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 - QUARKUS_GRPC_CLIENTS_LOCATIONS_HOST: grpc-locations - QUARKUS_GRPC_CLIENTS_LOCATIONS_PORT: 80 - KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092 - MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8080/apis/registry/v2 + quarkus.liquibase-mongodb.migrate-at-start: false + quarkus.mongodb.hosts: fights-db:27017 + quarkus.stork.hero-service.service-discovery.type: knative + quarkus.stork.hero-service.service-discovery.application: rest-heroes + quarkus.stork.hero-service.service-discovery.refresh-period: 1M + quarkus.stork.villain-service.service-discovery.type: knative + quarkus.stork.villain-service.service-discovery.application: rest-villains + quarkus.stork.villain-service.service-discovery.refresh-period: 1M + quarkus.stork.narration-service.service-discovery.type: knative + quarkus.stork.narration-service.service-discovery.application: rest-narration + quarkus.stork.narration-service.service-discovery.refresh-period: 1M + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 + quarkus.grpc.clients.locations.host: grpc-locations + quarkus.grpc.clients.locations.port: 80 + kafka.bootstrap.servers: PLAINTEXT://fights-kafka:9092 + mp.messaging.connector.smallrye-kafka.apicurio.registry.url: http://apicurio:8080/apis/registry/v2 diff --git a/rest-fights/src/main/kubernetes/kubernetes.yml b/rest-fights/src/main/kubernetes/kubernetes.yml index 4f7faeacd..17f049890 100644 --- a/rest-fights/src/main/kubernetes/kubernetes.yml +++ b/rest-fights/src/main/kubernetes/kubernetes.yml @@ -8,22 +8,22 @@ metadata: application: fights-service system: quarkus-super-heroes data: - QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false - QUARKUS_MONGODB_HOSTS: fights-db:27017 - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-heroes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-villains - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-narration - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_GRPC_CLIENTS_LOCATIONS_HOST: grpc-locations - QUARKUS_GRPC_CLIENTS_LOCATIONS_PORT: 80 - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 - KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092 - MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8080/apis/registry/v2 + quarkus.liquibase-mongodb.migrate-at-start: false + quarkus.mongodb.hosts: fights-db:27017 + quarkus.stork.hero-service.service-discovery.type: kubernetes + quarkus.stork.hero-service.service-discovery.application: rest-heroes + quarkus.stork.hero-service.service-discovery.port-name: http + quarkus.stork.hero-service.service-discovery.refresh-period: 1H + quarkus.stork.villain-service.service-discovery.type: kubernetes + quarkus.stork.villain-service.service-discovery.application: rest-villains + quarkus.stork.villain-service.service-discovery.refresh-period: 1H + quarkus.stork.villain-service.service-discovery.port-name: http + quarkus.stork.narration-service.service-discovery.type: kubernetes + quarkus.stork.narration-service.service-discovery.application: rest-narration + quarkus.stork.narration-service.service-discovery.refresh-period: 1H + quarkus.stork.narration-service.service-discovery.port-name: http + quarkus.grpc.clients.locations.host: grpc-locations + quarkus.grpc.clients.locations.port: 80 + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 + kafka.bootstrap.servers: PLAINTEXT://fights-kafka:9092 + mp.messaging.connector.smallrye-kafka.apicurio.registry.url: http://apicurio:8080/apis/registry/v2 diff --git a/rest-fights/src/main/kubernetes/minikube.yml b/rest-fights/src/main/kubernetes/minikube.yml index 691af8956..aba78c953 100644 --- a/rest-fights/src/main/kubernetes/minikube.yml +++ b/rest-fights/src/main/kubernetes/minikube.yml @@ -8,22 +8,22 @@ metadata: application: fights-service system: quarkus-super-heroes data: - QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false - QUARKUS_MONGODB_HOSTS: fights-db:27017 - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-heroes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-villains - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-narration - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_GRPC_CLIENTS_LOCATIONS_HOST: grpc-locations - QUARKUS_GRPC_CLIENTS_LOCATIONS_PORT: 80 - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 - KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092 - MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8080/apis/registry/v2 + quarkus.liquibase-mongodb.migrate-at-start: false + quarkus.mongodb.hosts: fights-db:27017 + quarkus.stork.hero-service.service-discovery.type: kubernetes + quarkus.stork.hero-service.service-discovery.application: rest-heroes + quarkus.stork.hero-service.service-discovery.refresh-period: 1H + quarkus.stork.hero-service.service-discovery.port-name: http + quarkus.stork.villain-service.service-discovery.type: kubernetes + quarkus.stork.villain-service.service-discovery.application: rest-villains + quarkus.stork.villain-service.service-discovery.refresh-period: 1H + quarkus.stork.villain-service.service-discovery.port-name: http + quarkus.stork.narration-service.service-discovery.type: kubernetes + quarkus.stork.narration-service.service-discovery.application: rest-narration + quarkus.stork.narration-service.service-discovery.refresh-period: 1H + quarkus.stork.narration-service.service-discovery.port-name: http + quarkus.grpc.clients.locations.host: grpc-locations + quarkus.grpc.clients.locations.port: 80 + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 + kafka.bootstrap.servers: PLAINTEXT://fights-kafka:9092 + mp.messaging.connector.smallrye-kafka.apicurio.registry.url: http://apicurio:8080/apis/registry/v2 diff --git a/rest-fights/src/main/kubernetes/openshift.yml b/rest-fights/src/main/kubernetes/openshift.yml index f48ffbed7..db1a34b66 100644 --- a/rest-fights/src/main/kubernetes/openshift.yml +++ b/rest-fights/src/main/kubernetes/openshift.yml @@ -8,25 +8,25 @@ metadata: application: fights-service system: quarkus-super-heroes data: - QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false - QUARKUS_MONGODB_HOSTS: fights-db:27017 - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-heroes - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-villains - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_TYPE: kubernetes - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_APPLICATION: rest-narration - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_REFRESH_PERIOD: 1H - QUARKUS_STORK_NARRATION_SERVICE_SERVICE_DISCOVERY_PORT_NAME: http - QUARKUS_GRPC_CLIENTS_LOCATIONS_HOST: grpc-locations - QUARKUS_GRPC_CLIENTS_LOCATIONS_PORT: 80 - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 - KAFKA_BOOTSTRAP_SERVERS: PLAINTEXT://fights-kafka:9092 - MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8080/apis/registry/v2 + quarkus.liquibase-mongodb.migrate-at-start: false + quarkus.mongodb.hosts: fights-db:27017 + quarkus.stork.hero-service.service-discovery.type: kubernetes + quarkus.stork.hero-service.service-discovery.application: rest-heroes + quarkus.stork.hero-service.service-discovery.refresh-period: 1H + quarkus.stork.hero-service.service-discovery.port-name: http + quarkus.stork.villain-service.service-discovery.type: kubernetes + quarkus.stork.villain-service.service-discovery.application: rest-villains + quarkus.stork.villain-service.service-discovery.refresh-period: 1H + quarkus.stork.villain-service.service-discovery.port-name: http + quarkus.stork.narration-service.service-discovery.type: kubernetes + quarkus.stork.narration-service.service-discovery.application: rest-narration + quarkus.stork.narration-service.service-discovery.refresh-period: 1H + quarkus.stork.narration-service.service-discovery.port-name: http + quarkus.grpc.clients.locations.host: grpc-locations + quarkus.grpc.clients.locations.port: 80 + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 + kafka.bootstrap.servers: PLAINTEXT://fights-kafka:9092 + mp.messaging.connector.smallrye-kafka.apicurio.registry.url: http://apicurio:8080/apis/registry/v2 --- apiVersion: route.openshift.io/v1 kind: Route diff --git a/rest-heroes/src/main/kubernetes/common.yml b/rest-heroes/src/main/kubernetes/common.yml index 6661124ff..695573894 100644 --- a/rest-heroes/src/main/kubernetes/common.yml +++ b/rest-heroes/src/main/kubernetes/common.yml @@ -8,10 +8,10 @@ metadata: application: heroes-service system: quarkus-super-heroes data: - QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate - QUARKUS_HIBERNATE_ORM_DATABASE_SQL_LOAD_SCRIPT: no-file - QUARKUS_DATASOURCE_REACTIVE_URL: postgresql://heroes-db:5432/heroes_database - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 + quarkus.hibernate-orm.database.generation: validate + quarkus.hibernate-orm.sql-load-script: no-file + quarkus.datasource.reactive.url: postgresql://heroes-db:5432/heroes_database + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 --- apiVersion: v1 kind: Secret @@ -23,8 +23,8 @@ metadata: application: heroes-service system: quarkus-super-heroes data: - QUARKUS_DATASOURCE_USERNAME: c3VwZXJtYW4= - QUARKUS_DATASOURCE_PASSWORD: c3VwZXJtYW4= + quarkus.datasource.username: c3VwZXJtYW4= + quarkus.datasource.password: c3VwZXJtYW4= --- apiVersion: v1 kind: Secret diff --git a/rest-narration/src/main/kubernetes/common.yml b/rest-narration/src/main/kubernetes/common.yml index 1dac38426..8dc902040 100644 --- a/rest-narration/src/main/kubernetes/common.yml +++ b/rest-narration/src/main/kubernetes/common.yml @@ -8,4 +8,4 @@ metadata: application: narration-service system: quarkus-super-heroes data: - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 diff --git a/rest-villains/src/main/kubernetes/common.yml b/rest-villains/src/main/kubernetes/common.yml index c1d242703..abdaf0f18 100644 --- a/rest-villains/src/main/kubernetes/common.yml +++ b/rest-villains/src/main/kubernetes/common.yml @@ -8,10 +8,10 @@ metadata: application: villains-service system: quarkus-super-heroes data: - QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION: validate - QUARKUS_HIBERNATE_ORM_DATABASE_SQL_LOAD_SCRIPT: no-file - QUARKUS_DATASOURCE_JDBC_URL: jdbc:postgresql://villains-db:5432/villains_database - QUARKUS_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://otel-collector:4317 + quarkus.hibernate-orm.database.generation: validate + quarkus.hibernate-orm.sql-load-script: no-file + quarkus.datasource.jdbc.url: jdbc:postgresql://villains-db:5432/villains_database + quarkus.otel.exporter.otlp.traces.endpoint: http://otel-collector:4317 --- apiVersion: v1 kind: Secret @@ -23,8 +23,8 @@ metadata: application: villains-service system: quarkus-super-heroes data: - QUARKUS_DATASOURCE_USERNAME: c3VwZXJiYWQ= - QUARKUS_DATASOURCE_PASSWORD: c3VwZXJiYWQ= + quarkus.datasource.username: c3VwZXJiYWQ= + quarkus.datasource.password: c3VwZXJiYWQ= --- apiVersion: v1 kind: Secret