From 70bfe38047c4fbb3368a5ec030e08cb381f6fd80 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Fri, 6 May 2022 12:41:32 -0400 Subject: [PATCH 1/9] Add SmallRye Stork service discovery Fixes #40 --- .github/workflows/simple-build-test.yml | 52 ++++++++- rest-fights/README.md | 28 ++++- rest-fights/pom.xml | 40 +++++++ .../src/main/docker-compose/java11.yml | 4 +- .../src/main/docker-compose/java17.yml | 4 +- .../src/main/docker-compose/native-java11.yml | 4 +- .../src/main/docker-compose/native-java17.yml | 4 +- .../fight/client/VillainClient.java | 110 +++++++++++++++--- .../superheroes/fight/rest/FightResource.java | 2 +- rest-fights/src/main/kubernetes/knative.yml | 20 +++- .../src/main/kubernetes/kubernetes.yml | 20 +++- rest-fights/src/main/kubernetes/minikube.yml | 20 +++- rest-fights/src/main/kubernetes/openshift.yml | 20 +++- .../src/main/resources/application.properties | 14 ++- .../HeroesVillainsWiremockServerResource.java | 13 ++- .../fight/client/HeroClientTests.java | 25 +++- .../fight/client/VillainClientTests.java | 25 +++- 17 files changed, 357 insertions(+), 48 deletions(-) diff --git a/.github/workflows/simple-build-test.yml b/.github/workflows/simple-build-test.yml index 2244ee6f4..3e60dd9d2 100644 --- a/.github/workflows/simple-build-test.yml +++ b/.github/workflows/simple-build-test.yml @@ -1,5 +1,8 @@ name: Basic build and test +env: + MANDREL_VERSION: "22.0.0.2-Final" + on: push: paths-ignore: @@ -47,7 +50,7 @@ jobs: - rest-fights - rest-heroes - rest-villains - name: "build-test-${{ matrix.project }}-java-${{ matrix.java }}" + name: "build-test-${{ matrix.project }}-${{ matrix.java }}" steps: - uses: actions/checkout@v3 @@ -61,3 +64,50 @@ jobs: - name: "build-test-jvm-${{ matrix.project }}-java-${{ matrix.java }}" working-directory: ${{ matrix.project }} run: ./mvnw -B clean verify -Dquarkus.http.host=0.0.0.0 -Dmaven.compiler.release=${{ matrix.java }} + + native-build-test: + runs-on: ubuntu-latest + if: github.repository == 'quarkusio/quarkus-super-heroes' + strategy: + fail-fast: false + matrix: + java: + - '11' + - '17' + project: + - event-statistics + - rest-fights + - rest-heroes + - rest-villains + name: "native-build-test-${{ matrix.project }}-${{ matrix.java }}" + steps: + - uses: actions/checkout@v3 + + - name: Cache and restore Mandrel distro + id: check-mandrel-cache + uses: actions/cache@v3 + with: + path: mandrel-${{ env.MANDREL_VERSION }}-${{ matrix.java }}.tar.gz + key: mandrel-distro-${{ env.MANDREL_VERSION }}-${{ matrix.java }} + + - name: Download Mandrel + if: steps.check-mandrel-cache.outputs.cache-hit != 'true' + run: | + download_url="https://github.com/graalvm/mandrel/releases/download/mandrel-${MANDREL_VERSION}/mandrel-java${{ matrix.java }}-linux-amd64-${MANDREL_VERSION}.tar.gz" + wget -q -O mandrel-${{ env.MANDREL_VERSION }}-${{ matrix.java }}.tar.gz $download_url + + - name: Setup Maven+OpenJDK Distro + uses: actions/setup-java@v2 + with: + distribution: 'jdkfile' + jdkFile: mandrel-${{ env.MANDREL_VERSION }}-${{ matrix.java }}.tar.gz + java-version: ${{ matrix.java }} + architecture: x64 + cache: maven + + - name: "build-test-native-${{ matrix.project }}-java-${{ matrix.java }}" + working-directory: ${{ matrix.project }} + run: | + ./mvnw -B clean verify -Pnative \ + -Dquarkus.http.host=0.0.0.0 \ + -Dmaven.compiler.release=${{ matrix.java }} diff --git a/rest-fights/README.md b/rest-fights/README.md index 7926033ad..574d3e54a 100644 --- a/rest-fights/README.md +++ b/rest-fights/README.md @@ -10,6 +10,9 @@ - [Retries](#retries) - [Hero Client](#hero-client) - [Villain Client](#villain-client) +- [Service Discovery and Load Balancing](#service-discovery-and-client-load-balancing) + - [Service Discovery](#service-discovery) + - [Client-side Load Balancing](#client-side-load-balancing) - [Testing](#testing) - [Running the Application](#running-the-application) - [Running Locally via Docker Compose](#running-locally-via-docker-compose) @@ -66,6 +69,27 @@ The [`VillainClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/V - The downstream [Villain service](../rest-villains) returns a `404` if no random [`Villain`](src/main/java/io/quarkus/sample/superheroes/fight/client/Villain.java) is found. `VillainClient` handles this case and simulates the service returning nothing. - In the event the downstream [Villain service](../rest-heroes) returns an error, `VillainClient` adds 3 retries with a 200ms delay between each retry. +## Service Discovery and Client Load Balancing +The fight service implements service discovery and client-side load balancing when making downstream calls to the [`rest-heroes`](../rest-heroes) and [`rest-villains`](../rest-villains) services. The service discovery is implemented in Quarkus using [SmallRye Stork](https://quarkus.io/blog/smallrye-stork-intro). + +Stork [integrates directly with the Quarkus REST Client Reactive](http://smallrye.io/smallrye-stork/1.1.0/quarkus). This means that there is no additional code needed in the [`HeroRestClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/HeroRestClient.java) in order to take advantage of Stork's service discovery and client-side load balancing. + +> You could disable Stork completely for the `HeroRestClient` by setting `quarkus.rest-client.hero-client.url` to any non-Stork URL (i.e. something that doesn't start with `stork://`). + +The [`VillainClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java), on the other hand, is implemented by directly using the [JAX-RS client API](https://docs.oracle.com/javaee/7/tutorial/jaxrs-client001.htm) with the [RESTEasy Reactive client](https://quarkus.io/guides/resteasy-reactive#resteasy-reactive-client). Therefore, the [Stork API](http://smallrye.io/smallrye-stork/1.1.0/concepts) is used directly in order to get the same functionality available in the [`HeroRestClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/HeroRestClient.java). + +> Similarly. you could disable Stork completely for the `VillainClient` by setting `fight.villain.client-base-url` to any non-Stork URL (i.e. something that doesn't start with `stork://`). + +### Service Discovery +In local development mode, as well as when running via Docker Compose, SmallRye Stork is configured using [static list discovery](https://github.com/smallrye/smallrye-stork/blob/main/docs/service-discovery/static-list.md). In this mode, the downstream URLs are statically defined in an address list. In [`application.properties`](src/main/resources/application.properties), see the `quarkus.stork.hero-service.service-discovery.address-list` and `quarkus.stork.villain-service.service-discovery.address-list` properties. + +When [running in Kubernetes](https://quarkus.io/blog/stork-kubernetes-discovery), Stork is configured to use the [Kubernetes Service Discovery](http://smallrye.io/smallrye-stork/1.1.0/kubernetes). In this mode, Stork will read the Kubernetes `Service`s for the [`rest-heroes`](../rest-heroes) and [`rest-villains`](../rest-villains) services to obtain the instance information. Additionally, the instance information has been configured to refresh every minute. See the `rest-fights-config` ConfigMap in [the Kubernetes deployment descriptors](deploy/k8s). Look for the `quarkus.stork.*` properties within the various `ConfigMap`s. + +All of the other Stork service discovery mechanisms ([Consul](http://smallrye.io/smallrye-stork/1.1.0/consul) and [Eureka](http://smallrye.io/smallrye-stork/1.1.0/eureka)) can be used simply by updating the configuration appropriately according to the Stork documentation. + +### Client-Side Load Balancing +In all cases, the default load balancing algorithm used is [round robin](http://smallrye.io/smallrye-stork/1.1.0/round-robin). All of the other load balancing algorithms ([random](http://smallrye.io/smallrye-stork/1.1.0/random), [least requests](http://smallrye.io/smallrye-stork/1.1.0/least-requests), [least response time](http://smallrye.io/smallrye-stork/1.1.0/response-time), and [power of two choices](http://smallrye.io/smallrye-stork/1.1.0/power-of-two-choices)) are available on the application's classpath, so feel free to play around with them by updating the configuration appropriately according to the Stork documentation. + ## Testing This application has a full suite of tests, including an [integration test suite](src/test/java/io/quarkus/sample/superheroes/fight/rest/FightResourceIT.java). - The test suite uses [Wiremock](http://wiremock.org/) for [mocking http calls](https://quarkus.io/guides/rest-client-reactive#using-a-mock-http-server-for-tests) (see [`HeroesVillainsWiremockServerResource`](src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java)) to the downstream [Hero](../rest-heroes) and [Villain](../rest-villains) services. @@ -92,8 +116,8 @@ By default, the application is configured with the following: | Database password | `QUARKUS_MONGODB_CREDENTIALS_PASSWORD` | `quarkus.mongodb.credentials.password` | `superfight` | | Kafka Bootstrap servers | `KAFKA_BOOTSTRAP_SERVERS` | `kafka.bootstrap.servers` | `PLAINTEXT://localhost:9092` | | Apicurio Schema Registry | `MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL` | `mp.messaging.connector.smallrye-kafka.apicurio.registry.url` | `http://localhost:8086/apis/registry/v2` | -| Heroes Service URL | `quarkus.rest-client.hero-client.url` | `quarkus.rest-client.hero-client.url` | `http://localhost:8083` | -| Villains Service URL | `fight.villain.client-base-url` | `fight.villain.client-base-url` | `http://localhost:8084` | +| Heroes Service URL | `QUARKUS_REST_CLIENT_HERO_CLIENT_URL` | `quarkus.rest-client.hero-client.url` | `stork://hero-service` | +| Villains Service URL | `FIGHT_VILLAIN_CLIENT_BASE_URL` | `fight.villain.client-base-url` | `stork://villain-service` | ## Running Locally via Docker Compose Pre-built images for this application can be found at [`quay.io/quarkus-super-heroes/rest-fights`](https://quay.io/repository/quarkus-super-heroes/rest-fights?tab=tags). diff --git a/rest-fights/pom.xml b/rest-fights/pom.xml index 4d602c1ee..4ececf634 100644 --- a/rest-fights/pom.xml +++ b/rest-fights/pom.xml @@ -132,6 +132,46 @@ io.quarkus quarkus-liquibase-mongodb + + io.smallrye.stork + stork-service-discovery-static-list + + + io.smallrye.stork + stork-service-discovery-kubernetes + + + io.smallrye.stork + stork-service-discovery-eureka + + + io.smallrye.stork + stork-service-discovery-consul + + + io.smallrye.stork + stork-load-balancer-random + + + io.smallrye.stork + stork-load-balancer-least-requests + + + io.smallrye.stork + stork-load-balancer-least-response-time + + + io.smallrye.stork + stork-load-balancer-power-of-two-choices + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + io.quarkus quarkus-junit5 diff --git a/rest-fights/src/main/docker-compose/java11.yml b/rest-fights/src/main/docker-compose/java11.yml index f58332d4b..2d89cf5fb 100644 --- a/rest-fights/src/main/docker-compose/java11.yml +++ b/rest-fights/src/main/docker-compose/java11.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/docker-compose/java17.yml b/rest-fights/src/main/docker-compose/java17.yml index 423415df6..0daa87937 100644 --- a/rest-fights/src/main/docker-compose/java17.yml +++ b/rest-fights/src/main/docker-compose/java17.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/docker-compose/native-java11.yml b/rest-fights/src/main/docker-compose/native-java11.yml index 179666a8a..6ca1c7d8a 100644 --- a/rest-fights/src/main/docker-compose/native-java11.yml +++ b/rest-fights/src/main/docker-compose/native-java11.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/docker-compose/native-java17.yml b/rest-fights/src/main/docker-compose/native-java17.yml index f12cc5491..c4d8e80ba 100644 --- a/rest-fights/src/main/docker-compose/native-java17.yml +++ b/rest-fights/src/main/docker-compose/native-java17.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java index 61140f8b2..edbfdf66c 100644 --- a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java +++ b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java @@ -5,6 +5,7 @@ import java.util.concurrent.CompletionStage; import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; @@ -12,10 +13,13 @@ import org.eclipse.microprofile.faulttolerance.CircuitBreaker; import org.jboss.resteasy.reactive.client.impl.UniInvoker; +import io.quarkus.logging.Log; import io.quarkus.sample.superheroes.fight.config.FightConfig; import io.smallrye.faulttolerance.api.CircuitBreakerName; import io.smallrye.mutiny.Uni; +import io.smallrye.stork.Stork; +import io.smallrye.stork.api.ServiceInstance; /** * Bean to be used for interacting with the Villain service. @@ -25,12 +29,20 @@ */ @ApplicationScoped public class VillainClient { - private final WebTarget villainClient; + private static final String STORK_PREFIX = "stork://"; + private static final String VILLAINS_API_PATH = "/api/villains"; + + private final WebTargetProvider webTargetProvider; public VillainClient(FightConfig fightConfig) { - this.villainClient = ClientBuilder.newClient() - .target(fightConfig.villain().clientBaseUrl()) - .path("api/villains/"); + var villainClientBaseUrl = fightConfig.villain().clientBaseUrl(); + + if (villainClientBaseUrl.startsWith(STORK_PREFIX)) { + this.webTargetProvider = new StorkWebTargetProvider(villainClientBaseUrl.replace(STORK_PREFIX, "")); + } + else { + this.webTargetProvider = new DefaultWebTargetProvider(villainClientBaseUrl); + } } /** @@ -39,16 +51,18 @@ public VillainClient(FightConfig fightConfig) { */ @CircuitBreaker(requestVolumeThreshold = 8, failureRatio = 0.5, delay = 2, delayUnit = ChronoUnit.SECONDS) @CircuitBreakerName("findRandomVillain") - CompletionStage getRandomVillain() { - // Want the 404 handling to be part of the circuit breaker - // This means that the 404 responses aren't considered errors by the circuit breaker - return this.villainClient.path("random") - .request(MediaType.APPLICATION_JSON_TYPE) - .rx(UniInvoker.class) - .get(Villain.class) - .onFailure(Is404Exception.IS_404).recoverWithNull() - .subscribeAsCompletionStage(); - } + CompletionStage getRandomVillain() { + // Want the 404 handling to be part of the circuit breaker + // This means that the 404 responses aren't considered errors by the circuit breaker + return this.webTargetProvider.getWebTarget("/random") + .flatMap(webTarget -> + webTarget.request(MediaType.APPLICATION_JSON_TYPE) + .rx(UniInvoker.class) + .get(Villain.class) + .onFailure(Is404Exception.IS_404).recoverWithNull() + ) + .subscribeAsCompletionStage(); + } /** * Finds a random {@link Villain}. The retry logic is applied to the result of the {@link CircuitBreaker}, meaning that retries that return failures could trigger the breaker to open. @@ -66,9 +80,69 @@ public Uni findRandomVillain() { * @return A "hello" from Villains */ public Uni helloVillains() { - return this.villainClient.path("hello") - .request(MediaType.TEXT_PLAIN_TYPE) - .rx(UniInvoker.class) - .get(String.class); + return this.webTargetProvider.getWebTarget("/hello") + .flatMap(webTarget -> + webTarget.request(MediaType.TEXT_PLAIN_TYPE) + .rx(UniInvoker.class) + .get(String.class) + ); + } + + private static abstract class WebTargetProvider { + protected abstract Uni getWebTarget(String path); + } + + private static class DefaultWebTargetProvider extends WebTargetProvider { + private final WebTarget webTarget; + + private DefaultWebTargetProvider(String baseUrl) { + Log.debugf("Creating Default provider for baseUrl = %s", baseUrl); + this.webTarget = ClientBuilder.newClient() + .target(baseUrl) + .path(VILLAINS_API_PATH); + } + + @Override + protected Uni getWebTarget(String path) { + return Uni.createFrom().item(this.webTarget.path(path)); + } + } + + private static class StorkWebTargetProvider extends WebTargetProvider { + private final Client villainClient = ClientBuilder.newClient(); + private final String storkServiceName; + + private StorkWebTargetProvider(String storkServiceName) { + Log.debugf("Creating Stork provider for service name = %s", storkServiceName); + this.storkServiceName = storkServiceName; + } + + private Uni getServiceInstance() { + return Stork.getInstance() + .getService(this.storkServiceName) + .selectInstanceAndRecordStart(true); + } + + private WebTarget createWebTarget(ServiceInstance serviceInstance, String path) { + var url = String.format( + "%s://%s:%d", + serviceInstance.isSecure() ? "https" : "http", + serviceInstance.getHost(), + serviceInstance.getPort() + ); + + Log.debugf("Targeting Stork client for service with URL = %s", url); + + return this.villainClient.target(url) + .path(VILLAINS_API_PATH) + .path(path); + } + + @Override + protected Uni getWebTarget(String path) { + return getServiceInstance() + .onItem().ifNotNull().transform(serviceInstance -> createWebTarget(serviceInstance, path)) + .onItem().ifNull().failWith(() -> new IllegalArgumentException(String.format("Can't determine a downstream service for service name '%s'. Is one configured?", this.storkServiceName))); + } } } diff --git a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java index 0227a2be4..7c5d90b54 100644 --- a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java +++ b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java @@ -88,7 +88,7 @@ public Uni getFight(@Parameter(name = "id", required = true) @PathPara return Response.ok(f).build(); }) .onItem().ifNull().continueWith(() -> { - Log.debugf("No fight found with id %d", id); + Log.debugf("No fight found with id %s", id); return Response.status(Status.NOT_FOUND).build(); }); } diff --git a/rest-fights/src/main/kubernetes/knative.yml b/rest-fights/src/main/kubernetes/knative.yml index e9cba8cd4..f8589a70a 100644 --- a/rest-fights/src/main/kubernetes/knative.yml +++ b/rest-fights/src/main/kubernetes/knative.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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 e9cba8cd4..f8589a70a 100644 --- a/rest-fights/src/main/kubernetes/kubernetes.yml +++ b/rest-fights/src/main/kubernetes/kubernetes.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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 e9cba8cd4..f8589a70a 100644 --- a/rest-fights/src/main/kubernetes/minikube.yml +++ b/rest-fights/src/main/kubernetes/minikube.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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 5bea81a5b..dc738344b 100644 --- a/rest-fights/src/main/kubernetes/openshift.yml +++ b/rest-fights/src/main/kubernetes/openshift.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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/resources/application.properties b/rest-fights/src/main/resources/application.properties index 1e7fb47d3..f86d40b4f 100644 --- a/rest-fights/src/main/resources/application.properties +++ b/rest-fights/src/main/resources/application.properties @@ -16,14 +16,20 @@ quarkus.liquibase-mongodb.migrate-at-start=true quarkus.http.cors=true ## Rest client -quarkus.rest-client.hero-client.url=http://localhost:8083 +quarkus.rest-client.hero-client.url=stork://hero-service + +## Stork +quarkus.stork.hero-service.service-discovery.type=static +quarkus.stork.hero-service.service-discovery.address-list=localhost:8083 +quarkus.stork.villain-service.service-discovery.type=static +quarkus.stork.villain-service.service-discovery.address-list=localhost:8084 ## Fight configuration fight.hero.fallback.name=Fallback hero fight.hero.fallback.picture=https://dummyimage.com/280x380/1e8fff/ffffff&text=Fallback+Hero fight.hero.fallback.powers=Fallback hero powers fight.hero.fallback.level=1 -fight.villain.client-base-url=http://localhost:8084 +fight.villain.client-base-url=stork://villain-service fight.villain.fallback.name=Fallback villain fight.villain.fallback.picture=https://dummyimage.com/280x380/b22222/ffffff&text=Fallback+Villain fight.villain.fallback.powers=Fallback villain powers @@ -37,6 +43,10 @@ mp.messaging.outgoing.fights.apicurio.registry.auto-register=true %test.mp.messaging.outgoing.fights.merge=true ## Logging configuration +%dev.quarkus.log.category."io.quarkus.sample.superheroes.fight".level=DEBUG +%test.quarkus.log.category."io.quarkus.sample.superheroes.fight".level=DEBUG +%dev.quarkus.log.console.level=DEBUG +%test.quarkus.log.console.level=DEBUG quarkus.log.level=INFO quarkus.log.console.enable=true quarkus.log.console.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java index 5655bd286..229fac4a0 100644 --- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java +++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java @@ -20,10 +20,15 @@ public class HeroesVillainsWiremockServerResource implements QuarkusTestResource public Map start() { this.wireMockServer.start(); - return Map.of( - "quarkus.rest-client.hero-client.url", this.wireMockServer.baseUrl(), - "fight.villain.client-base-url", this.wireMockServer.baseUrl() - ); + var url = String.format( + "localhost:%d", + this.wireMockServer.isHttpsEnabled() ? this.wireMockServer.httpsPort() : this.wireMockServer.port() + ); + + return Map.of( + "quarkus.stork.hero-service.service-discovery.address-list", url, + "quarkus.stork.villain-service.service-discovery.address-list", url + ); } @Override diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java index c89d8fc9b..a9e9c4da3 100644 --- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java +++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java @@ -2,7 +2,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*; import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static javax.ws.rs.core.MediaType.*; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -35,7 +35,9 @@ @QuarkusTest @QuarkusTestResource(HeroesVillainsWiremockServerResource.class) class HeroClientTests { - private static final String HERO_URI = "/api/heroes/random"; + private static final String HERO_API_BASE_URI = "/api/heroes"; + private static final String HERO_URI = HERO_API_BASE_URI + "/random"; + private static final String HERO_HELLO_URI = HERO_API_BASE_URI + "/hello"; private static final String DEFAULT_HERO_NAME = "Super Baguette"; private static final String DEFAULT_HERO_PICTURE = "super_baguette.png"; private static final String DEFAULT_HERO_POWERS = "eats baguette really quickly"; @@ -182,6 +184,25 @@ public void doesntRecoverFrom500() { ); } + @Test + public void helloHeroes() { + this.wireMockServer.stubFor( + get(urlEqualTo(HERO_HELLO_URI)) + .willReturn(okForContentType(TEXT_PLAIN, "Hello heroes!")) + ); + + this.heroClient.helloHeroes() + .subscribe().withSubscriber(UniAssertSubscriber.create()) + .assertSubscribed() + .awaitItem(Duration.ofSeconds(5)) + .assertItem("Hello heroes!"); + + this.wireMockServer.verify(1, + getRequestedFor(urlEqualTo(HERO_HELLO_URI)) + .withHeader(ACCEPT, containing(TEXT_PLAIN)) + ); + } + private String getDefaultHeroJson() { try { return this.objectMapper.writeValueAsString(DEFAULT_HERO); diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java index f63c4eb6e..4b9007516 100644 --- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java +++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java @@ -2,7 +2,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*; import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static javax.ws.rs.core.MediaType.*; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -35,7 +35,9 @@ @QuarkusTest @QuarkusTestResource(HeroesVillainsWiremockServerResource.class) class VillainClientTests { - private static final String VILLAIN_API = "/api/villains/random"; + private static final String VILLAIN_API_BASE_URI = "/api/villains"; + private static final String VILLAIN_API = VILLAIN_API_BASE_URI + "/random"; + private static final String VILLAIN_HELLO_URI = VILLAIN_API_BASE_URI + "/hello"; private static final String DEFAULT_VILLAIN_NAME = "Super Chocolatine"; private static final String DEFAULT_VILLAIN_PICTURE = "super_chocolatine.png"; private static final String DEFAULT_VILLAIN_POWERS = "does not eat pain au chocolat"; @@ -182,6 +184,25 @@ public void doesntRecoverFrom500() { ); } + @Test + public void helloVillains() { + this.wireMockServer.stubFor( + get(urlEqualTo(VILLAIN_HELLO_URI)) + .willReturn(okForContentType(TEXT_PLAIN, "Hello villains!")) + ); + + this.villainClient.helloVillains() + .subscribe().withSubscriber(UniAssertSubscriber.create()) + .assertSubscribed() + .awaitItem(Duration.ofSeconds(5)) + .assertItem("Hello villains!"); + + this.wireMockServer.verify(1, + getRequestedFor(urlEqualTo(VILLAIN_HELLO_URI)) + .withHeader(ACCEPT, containing(TEXT_PLAIN)) + ); + } + private String getDefaultVillainJson() { try { return this.objectMapper.writeValueAsString(DEFAULT_VILLAIN); From ddfd2e4282eec2e122c8cd1531cae74460596af9 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Wed, 11 May 2022 07:48:16 -0400 Subject: [PATCH 2/9] multiarch build test --- .github/workflows/test-multiarch-images.yml | 386 ++++++++++---------- 1 file changed, 193 insertions(+), 193 deletions(-) diff --git a/.github/workflows/test-multiarch-images.yml b/.github/workflows/test-multiarch-images.yml index 800d2c312..6046e8e49 100644 --- a/.github/workflows/test-multiarch-images.yml +++ b/.github/workflows/test-multiarch-images.yml @@ -14,77 +14,77 @@ concurrency: cancel-in-progress: false jobs: - build-jvm-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - runs-on: ubuntu-latest - strategy: - matrix: - java: - - '11' - - '17' - project: - - event-statistics - - rest-fights - - rest-heroes - - rest-villains - arch: - - amd64 - - arm64 - name: "Build JVM images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ${{ matrix.project }} - run: | - echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && - echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV && - if [[ ${{ matrix.java }} == '11' ]]; then - echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" - else - echo "JVM_DOCKERFILE=Dockerfile.jvm${{ matrix.java }}" >> "$GITHUB_ENV" - fi - - - name: Create container tags - working-directory: ${{ matrix.project }} - run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}-multiarch" >> $GITHUB_ENV - - - name: Build app (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) - working-directory: ${{ matrix.project }} - run: ./mvnw -B clean package -DskipTests -Dmaven.compiler.release=${{ matrix.java }} -Dquarkus.http.host=0.0.0.0 - - - name: Set up QEMU - if: matrix.arch == 'arm64' - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Build JVM image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) - uses: docker/build-push-action@v3 - with: - context: ${{ matrix.project }} - platforms: linux/${{ matrix.arch }} - push: false - load: true - file: ${{ matrix.project }}/src/main/docker/${{ env.JVM_DOCKERFILE }} - tags: ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} - - - name: Save JVM Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-upload@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" +# build-jvm-images: +# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) +# runs-on: ubuntu-latest +# strategy: +# matrix: +# java: +# - '11' +# - '17' +# project: +# - event-statistics +# - rest-fights +# - rest-heroes +# - rest-villains +# arch: +# - amd64 +# - arm64 +# name: "Build JVM images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" +# steps: +# - uses: actions/checkout@v3 +# +# - name: Setup Java +# uses: actions/setup-java@v3 +# with: +# java-version: ${{ matrix.java }} +# distribution: temurin +# cache: maven +# +# - name: Create env vars +# working-directory: ${{ matrix.project }} +# run: | +# echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && +# echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV && +# if [[ ${{ matrix.java }} == '11' ]]; then +# echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" +# else +# echo "JVM_DOCKERFILE=Dockerfile.jvm${{ matrix.java }}" >> "$GITHUB_ENV" +# fi +# +# - name: Create container tags +# working-directory: ${{ matrix.project }} +# run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}-multiarch" >> $GITHUB_ENV +# +# - name: Build app (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) +# working-directory: ${{ matrix.project }} +# run: ./mvnw -B clean package -DskipTests -Dmaven.compiler.release=${{ matrix.java }} -Dquarkus.http.host=0.0.0.0 +# +# - name: Set up QEMU +# if: matrix.arch == 'arm64' +# uses: docker/setup-qemu-action@v2 +# with: +# platforms: arm64 +# +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v2 +# with: +# install: true +# +# - name: Build JVM image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) +# uses: docker/build-push-action@v3 +# with: +# context: ${{ matrix.project }} +# platforms: linux/${{ matrix.arch }} +# push: false +# load: true +# file: ${{ matrix.project }}/src/main/docker/${{ env.JVM_DOCKERFILE }} +# tags: ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} +# +# - name: Save JVM Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) +# uses: ishworkh/docker-image-artifact-upload@v1 +# with: +# image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" build-native-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) @@ -141,48 +141,48 @@ jobs: with: image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - build-ui-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - runs-on: ubuntu-latest - strategy: - matrix: - arch: - - amd64 - - arm64 - steps: - - uses: actions/checkout@v3 - - - name: Set up QEMU - if: matrix.arch == 'arm64' - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Build UI image (${{ matrix.arch }}) - uses: docker/build-push-action@v3 - with: - context: ui-super-heroes - platforms: linux/${{ matrix.arch }} - push: false - load: true - tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} - - - name: Save UI image (${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-upload@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" +# build-ui-images: +# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) +# runs-on: ubuntu-latest +# strategy: +# matrix: +# arch: +# - amd64 +# - arm64 +# steps: +# - uses: actions/checkout@v3 +# +# - name: Set up QEMU +# if: matrix.arch == 'arm64' +# uses: docker/setup-qemu-action@v2 +# with: +# platforms: arm64 +# +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v2 +# with: +# install: true +# +# - name: Build UI image (${{ matrix.arch }}) +# uses: docker/build-push-action@v3 +# with: +# context: ui-super-heroes +# platforms: linux/${{ matrix.arch }} +# push: false +# load: true +# tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} +# +# - name: Save UI image (${{ matrix.arch }}) +# uses: ishworkh/docker-image-artifact-upload@v1 +# with: +# image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" push-app-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) needs: - - build-jvm-images +# - build-jvm-images - build-native-images - - build-ui-images +# - build-ui-images runs-on: ubuntu-latest strategy: matrix: @@ -190,7 +190,7 @@ jobs: - '11' - '17' kind: - - "" +# - "" - "native-" project: - event-statistics @@ -251,51 +251,51 @@ jobs: working-directory: ${{ matrix.project }} run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}" - push-ui-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - needs: - - build-jvm-images - - build-native-images - - build-ui-images - runs-on: ubuntu-latest - strategy: - matrix: - arch: - - amd64 - - arm64 - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ui-super-heroes - run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Get Saved UI Image (${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-download@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" - - - name: Login to quay - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_REPO_USERNAME }} - password: ${{ secrets.QUAY_REPO_TOKEN }} - - - name: Tag UI image (${{ matrix.arch }}) - working-directory: ui-super-heroes - run: docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-${{ matrix.arch }} - - - name: Push UI image (${{ matrix.arch }}) - working-directory: ui-super-heroes - run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes" +# push-ui-images: +# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) +# needs: +# - build-jvm-images +# - build-native-images +# - build-ui-images +# runs-on: ubuntu-latest +# strategy: +# matrix: +# arch: +# - amd64 +# - arm64 +# steps: +# - uses: actions/checkout@v3 +# +# - name: Setup Java +# uses: actions/setup-java@v3 +# with: +# java-version: 17 +# distribution: temurin +# cache: maven +# +# - name: Create env vars +# working-directory: ui-super-heroes +# run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV +# +# - name: Get Saved UI Image (${{ matrix.arch }}) +# uses: ishworkh/docker-image-artifact-download@v1 +# with: +# image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" +# +# - name: Login to quay +# uses: docker/login-action@v2 +# with: +# registry: quay.io +# username: ${{ secrets.QUAY_REPO_USERNAME }} +# password: ${{ secrets.QUAY_REPO_TOKEN }} +# +# - name: Tag UI image (${{ matrix.arch }}) +# working-directory: ui-super-heroes +# run: docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-${{ matrix.arch }} +# +# - name: Push UI image (${{ matrix.arch }}) +# working-directory: ui-super-heroes +# run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes" create-app-multiarch-manifests: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) @@ -307,14 +307,14 @@ jobs: - '11' - '17' kind: - - "" +# - "" - "native-" project: - event-statistics - rest-fights - rest-heroes - rest-villains - name: Create app multiarch manifests (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }} + name: Create app multiarch manifests (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }}) steps: - uses: actions/checkout@v3 @@ -368,47 +368,47 @@ jobs: -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-amd64 docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} - create-ui-multiarch-manifests: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - needs: push-ui-images - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ui-super-heroes - run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Login to quay - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_REPO_USERNAME }} - password: ${{ secrets.QUAY_REPO_TOKEN }} - - - name: Create and push multi-arch manifests - shell: bash - run: | - docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-amd64 \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-arm64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} - docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-amd64 \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-arm64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch +# create-ui-multiarch-manifests: +# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) +# needs: push-ui-images +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# +# - name: Setup Java +# uses: actions/setup-java@v3 +# with: +# java-version: 17 +# distribution: temurin +# cache: maven +# +# - name: Create env vars +# working-directory: ui-super-heroes +# run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV +# +# - name: Login to quay +# uses: docker/login-action@v2 +# with: +# registry: quay.io +# username: ${{ secrets.QUAY_REPO_USERNAME }} +# password: ${{ secrets.QUAY_REPO_TOKEN }} +# +# - name: Create and push multi-arch manifests +# shell: bash +# run: | +# docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} \ +# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-amd64 \ +# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-arm64 +# docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} +# docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch \ +# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-amd64 \ +# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-arm64 +# docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch cleanup-artifacts: needs: - create-app-multiarch-manifests - - create-ui-multiarch-manifests +# - create-ui-multiarch-manifests if: always() runs-on: ubuntu-latest steps: From 9634c9fcdecc29c51bdbc214617d9965df8c6efd Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Wed, 11 May 2022 08:12:22 -0400 Subject: [PATCH 3/9] multiarch build test --- .github/workflows/test-multiarch-images.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test-multiarch-images.yml b/.github/workflows/test-multiarch-images.yml index 6046e8e49..67f66ed3c 100644 --- a/.github/workflows/test-multiarch-images.yml +++ b/.github/workflows/test-multiarch-images.yml @@ -203,10 +203,10 @@ jobs: name: "Push app images (${{ matrix.arch}}-${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }})" steps: - uses: actions/checkout@v3 - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - name: Setup Java - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} @@ -214,27 +214,27 @@ jobs: cache: maven - name: Create env vars - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: | echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - name: Create container tags - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: | echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-${{ matrix.kind }}java${{ matrix.java }}-multiarch" >> $GITHUB_ENV && echo "ADDITIONAL_TAG=${{ matrix.kind }}java${{ matrix.java }}-${{ env.LATEST_IMAGE_TAG }}" >> $GITHUB_ENV - name: Get saved images (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }}-${{ matrix.arch }}) - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) uses: ishworkh/docker-image-artifact-download@v1 with: image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - name: Login to quay - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) uses: docker/login-action@v2 with: registry: quay.io @@ -242,12 +242,12 @@ jobs: password: ${{ secrets.QUAY_REPO_TOKEN }} - name: Tag image - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: "docker tag ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-${{ matrix.arch }}" - name: Push images - if: ((matrix.kind == 'amd64') || (matrix.kind != 'native-')) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}" From ad93208a154fd618bcc795e0b1594eab0b8ae867 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 08:30:59 -0400 Subject: [PATCH 4/9] Bump quarkus.platform.version from 2.8.3.Final to 2.9.0.Final (#78) Bumps `quarkus.platform.version` from 2.8.3.Final to 2.9.0.Final. Updates `quarkus-bom` from 2.8.3.Final to 2.9.0.Final - [Release notes](https://github.com/quarkusio/quarkus-platform/releases) - [Commits](https://github.com/quarkusio/quarkus-platform/compare/2.8.3.Final...2.9.0.Final) Updates `quarkus-maven-plugin` from 2.8.3.Final to 2.9.0.Final --- updated-dependencies: - dependency-name: io.quarkus.platform:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Eric Deandrea --- event-statistics/pom.xml | 2 +- rest-fights/pom.xml | 2 +- rest-heroes/pom.xml | 2 +- rest-villains/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/event-statistics/pom.xml b/event-statistics/pom.xml index 3be07cea4..79fa893bf 100644 --- a/event-statistics/pom.xml +++ b/event-statistics/pom.xml @@ -16,7 +16,7 @@ UTF-8 quarkus-bom io.quarkus.platform - 2.8.3.Final + 2.9.0.Final 3.0.0-M5 diff --git a/rest-fights/pom.xml b/rest-fights/pom.xml index 4d602c1ee..2e95f4f14 100644 --- a/rest-fights/pom.xml +++ b/rest-fights/pom.xml @@ -16,7 +16,7 @@ UTF-8 quarkus-bom io.quarkus.platform - 2.8.3.Final + 2.9.0.Final 3.0.0-M5 2.33.2 diff --git a/rest-heroes/pom.xml b/rest-heroes/pom.xml index faf604b5c..96599a33a 100644 --- a/rest-heroes/pom.xml +++ b/rest-heroes/pom.xml @@ -15,7 +15,7 @@ UTF-8 quarkus-bom io.quarkus.platform - 2.8.3.Final + 2.9.0.Final 3.0.0-M5 diff --git a/rest-villains/pom.xml b/rest-villains/pom.xml index a1669f80b..36bf34206 100644 --- a/rest-villains/pom.xml +++ b/rest-villains/pom.xml @@ -15,7 +15,7 @@ UTF-8 quarkus-bom io.quarkus.platform - 2.8.3.Final + 2.9.0.Final 3.0.0-M5 From abbfbd4db3a1a94dd5177ac7b934562116fdb923 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Wed, 11 May 2022 08:31:05 -0400 Subject: [PATCH 5/9] multiarch build test --- .github/workflows/test-multiarch-images.yml | 384 ++++++++++---------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/.github/workflows/test-multiarch-images.yml b/.github/workflows/test-multiarch-images.yml index 67f66ed3c..8b9bf2082 100644 --- a/.github/workflows/test-multiarch-images.yml +++ b/.github/workflows/test-multiarch-images.yml @@ -14,77 +14,77 @@ concurrency: cancel-in-progress: false jobs: -# build-jvm-images: -# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) -# runs-on: ubuntu-latest -# strategy: -# matrix: -# java: -# - '11' -# - '17' -# project: -# - event-statistics -# - rest-fights -# - rest-heroes -# - rest-villains -# arch: -# - amd64 -# - arm64 -# name: "Build JVM images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" -# steps: -# - uses: actions/checkout@v3 -# -# - name: Setup Java -# uses: actions/setup-java@v3 -# with: -# java-version: ${{ matrix.java }} -# distribution: temurin -# cache: maven -# -# - name: Create env vars -# working-directory: ${{ matrix.project }} -# run: | -# echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && -# echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV && -# if [[ ${{ matrix.java }} == '11' ]]; then -# echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" -# else -# echo "JVM_DOCKERFILE=Dockerfile.jvm${{ matrix.java }}" >> "$GITHUB_ENV" -# fi -# -# - name: Create container tags -# working-directory: ${{ matrix.project }} -# run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}-multiarch" >> $GITHUB_ENV -# -# - name: Build app (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) -# working-directory: ${{ matrix.project }} -# run: ./mvnw -B clean package -DskipTests -Dmaven.compiler.release=${{ matrix.java }} -Dquarkus.http.host=0.0.0.0 -# -# - name: Set up QEMU -# if: matrix.arch == 'arm64' -# uses: docker/setup-qemu-action@v2 -# with: -# platforms: arm64 -# -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v2 -# with: -# install: true -# -# - name: Build JVM image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) -# uses: docker/build-push-action@v3 -# with: -# context: ${{ matrix.project }} -# platforms: linux/${{ matrix.arch }} -# push: false -# load: true -# file: ${{ matrix.project }}/src/main/docker/${{ env.JVM_DOCKERFILE }} -# tags: ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} -# -# - name: Save JVM Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) -# uses: ishworkh/docker-image-artifact-upload@v1 -# with: -# image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" + build-jvm-images: + if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) + runs-on: ubuntu-latest + strategy: + matrix: + java: + - '11' + - '17' + project: + - event-statistics + - rest-fights + - rest-heroes + - rest-villains + arch: + - amd64 + - arm64 + name: "Build JVM images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" + steps: + - uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: temurin + cache: maven + + - name: Create env vars + working-directory: ${{ matrix.project }} + run: | + echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && + echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV && + if [[ ${{ matrix.java }} == '11' ]]; then + echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" + else + echo "JVM_DOCKERFILE=Dockerfile.jvm${{ matrix.java }}" >> "$GITHUB_ENV" + fi + + - name: Create container tags + working-directory: ${{ matrix.project }} + run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}-multiarch" >> $GITHUB_ENV + + - name: Build app (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) + working-directory: ${{ matrix.project }} + run: ./mvnw -B clean package -DskipTests -Dmaven.compiler.release=${{ matrix.java }} -Dquarkus.http.host=0.0.0.0 + + - name: Set up QEMU + if: matrix.arch == 'arm64' + uses: docker/setup-qemu-action@v2 + with: + platforms: arm64 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Build JVM image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) + uses: docker/build-push-action@v3 + with: + context: ${{ matrix.project }} + platforms: linux/${{ matrix.arch }} + push: false + load: true + file: ${{ matrix.project }}/src/main/docker/${{ env.JVM_DOCKERFILE }} + tags: ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} + + - name: Save JVM Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) + uses: ishworkh/docker-image-artifact-upload@v1 + with: + image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" build-native-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) @@ -141,48 +141,48 @@ jobs: with: image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" -# build-ui-images: -# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) -# runs-on: ubuntu-latest -# strategy: -# matrix: -# arch: -# - amd64 -# - arm64 -# steps: -# - uses: actions/checkout@v3 -# -# - name: Set up QEMU -# if: matrix.arch == 'arm64' -# uses: docker/setup-qemu-action@v2 -# with: -# platforms: arm64 -# -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v2 -# with: -# install: true -# -# - name: Build UI image (${{ matrix.arch }}) -# uses: docker/build-push-action@v3 -# with: -# context: ui-super-heroes -# platforms: linux/${{ matrix.arch }} -# push: false -# load: true -# tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} -# -# - name: Save UI image (${{ matrix.arch }}) -# uses: ishworkh/docker-image-artifact-upload@v1 -# with: -# image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" + build-ui-images: + if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) + runs-on: ubuntu-latest + strategy: + matrix: + arch: + - amd64 + - arm64 + steps: + - uses: actions/checkout@v3 + + - name: Set up QEMU + if: matrix.arch == 'arm64' + uses: docker/setup-qemu-action@v2 + with: + platforms: arm64 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Build UI image (${{ matrix.arch }}) + uses: docker/build-push-action@v3 + with: + context: ui-super-heroes + platforms: linux/${{ matrix.arch }} + push: false + load: true + tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} + + - name: Save UI image (${{ matrix.arch }}) + uses: ishworkh/docker-image-artifact-upload@v1 + with: + image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" push-app-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) needs: -# - build-jvm-images + - build-jvm-images - build-native-images -# - build-ui-images + - build-ui-images runs-on: ubuntu-latest strategy: matrix: @@ -190,7 +190,7 @@ jobs: - '11' - '17' kind: -# - "" + - "" - "native-" project: - event-statistics @@ -251,51 +251,51 @@ jobs: working-directory: ${{ matrix.project }} run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}" -# push-ui-images: -# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) -# needs: -# - build-jvm-images -# - build-native-images -# - build-ui-images -# runs-on: ubuntu-latest -# strategy: -# matrix: -# arch: -# - amd64 -# - arm64 -# steps: -# - uses: actions/checkout@v3 -# -# - name: Setup Java -# uses: actions/setup-java@v3 -# with: -# java-version: 17 -# distribution: temurin -# cache: maven -# -# - name: Create env vars -# working-directory: ui-super-heroes -# run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV -# -# - name: Get Saved UI Image (${{ matrix.arch }}) -# uses: ishworkh/docker-image-artifact-download@v1 -# with: -# image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" -# -# - name: Login to quay -# uses: docker/login-action@v2 -# with: -# registry: quay.io -# username: ${{ secrets.QUAY_REPO_USERNAME }} -# password: ${{ secrets.QUAY_REPO_TOKEN }} -# -# - name: Tag UI image (${{ matrix.arch }}) -# working-directory: ui-super-heroes -# run: docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-${{ matrix.arch }} -# -# - name: Push UI image (${{ matrix.arch }}) -# working-directory: ui-super-heroes -# run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes" + push-ui-images: + if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) + needs: + - build-jvm-images + - build-native-images + - build-ui-images + runs-on: ubuntu-latest + strategy: + matrix: + arch: + - amd64 + - arm64 + steps: + - uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + + - name: Create env vars + working-directory: ui-super-heroes + run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + + - name: Get Saved UI Image (${{ matrix.arch }}) + uses: ishworkh/docker-image-artifact-download@v1 + with: + image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" + + - name: Login to quay + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_REPO_USERNAME }} + password: ${{ secrets.QUAY_REPO_TOKEN }} + + - name: Tag UI image (${{ matrix.arch }}) + working-directory: ui-super-heroes + run: docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-${{ matrix.arch }} + + - name: Push UI image (${{ matrix.arch }}) + working-directory: ui-super-heroes + run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes" create-app-multiarch-manifests: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) @@ -307,7 +307,7 @@ jobs: - '11' - '17' kind: -# - "" + - "" - "native-" project: - event-statistics @@ -368,47 +368,47 @@ jobs: -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-amd64 docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} -# create-ui-multiarch-manifests: -# if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) -# needs: push-ui-images -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# -# - name: Setup Java -# uses: actions/setup-java@v3 -# with: -# java-version: 17 -# distribution: temurin -# cache: maven -# -# - name: Create env vars -# working-directory: ui-super-heroes -# run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV -# -# - name: Login to quay -# uses: docker/login-action@v2 -# with: -# registry: quay.io -# username: ${{ secrets.QUAY_REPO_USERNAME }} -# password: ${{ secrets.QUAY_REPO_TOKEN }} -# -# - name: Create and push multi-arch manifests -# shell: bash -# run: | -# docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} \ -# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-amd64 \ -# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-arm64 -# docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} -# docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch \ -# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-amd64 \ -# -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-arm64 -# docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch + create-ui-multiarch-manifests: + if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) + needs: push-ui-images + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + + - name: Create env vars + working-directory: ui-super-heroes + run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + + - name: Login to quay + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_REPO_USERNAME }} + password: ${{ secrets.QUAY_REPO_TOKEN }} + + - name: Create and push multi-arch manifests + shell: bash + run: | + docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-amd64 \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-arm64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} + docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-amd64 \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-arm64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch cleanup-artifacts: needs: - create-app-multiarch-manifests -# - create-ui-multiarch-manifests + - create-ui-multiarch-manifests if: always() runs-on: ubuntu-latest steps: From 831b919315386eac796f8d7226161d9d1f43f4f1 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Wed, 11 May 2022 12:45:33 -0400 Subject: [PATCH 6/9] Create multi-arch images (#79) * Create multi-arch images Fixes #70 * Create multi-arch images Fixes #70 --- .../workflows/build-push-container-images.yml | 311 +++++++++---- .github/workflows/test-multiarch-images.yml | 420 ------------------ 2 files changed, 216 insertions(+), 515 deletions(-) delete mode 100644 .github/workflows/test-multiarch-images.yml diff --git a/.github/workflows/build-push-container-images.yml b/.github/workflows/build-push-container-images.yml index 91efcf79d..b22ee50fd 100644 --- a/.github/workflows/build-push-container-images.yml +++ b/.github/workflows/build-push-container-images.yml @@ -2,7 +2,9 @@ name: Build and Push Container images env: IMAGE_BASE_NAME: "quay.io/quarkus-super-heroes" - MANDREL_VERSION: "22.0.0.2-Final" + MANDREL_IMAGE: "quay.io/quarkus/ubi-quarkus-mandrel" + MANDREL_VERSION: "22.0" + LATEST_IMAGE_TAG: "latest" on: workflow_run: @@ -19,11 +21,10 @@ concurrency: cancel-in-progress: false jobs: - build-test-jvm-images: + build-jvm-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) runs-on: ubuntu-latest strategy: - fail-fast: true matrix: java: - '11' @@ -33,7 +34,10 @@ jobs: - rest-fights - rest-heroes - rest-villains - name: "build-test-jvm-${{ matrix.project }}-java-${{ matrix.java }}" + arch: + - amd64 + - arm64 + name: "Build JVM images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" steps: - uses: actions/checkout@v3 @@ -49,37 +53,47 @@ jobs: run: | echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV && - if [[ ${{ matrix.java }} == '11' ]]; then - echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" + if [[ ${{ matrix.java }} == '11' ]]; then + echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" else echo "JVM_DOCKERFILE=Dockerfile.jvm${{ matrix.java }}" >> "$GITHUB_ENV" fi - name: Create container tags working-directory: ${{ matrix.project }} - run: | - echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}" >> $GITHUB_ENV && - echo "ADDITIONAL_TAG=java${{ matrix.java }}-latest" >> $GITHUB_ENV + run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}" >> $GITHUB_ENV - - name: "create-test-jvm-image-${{ matrix.project }}-java-${{ matrix.java }}" + - name: Build app (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) working-directory: ${{ matrix.project }} - run: | - # ./mvnw verify \ - ./mvnw clean package -DskipTests \ - -Dmaven.compiler.release=${{ matrix.java }} \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.docker.dockerfile-jvm-path=src/main/docker/${{ env.JVM_DOCKERFILE }} \ - -Dquarkus.container-image.build=true \ - -Dquarkus.container-image.push=false \ - -Dquarkus.container-image.tag=${{ env.CONTAINER_TAG }} \ - -Dquarkus.container-image.additional-tags=${{ env.ADDITIONAL_TAG }} + run: ./mvnw -B clean package -DskipTests -Dmaven.compiler.release=${{ matrix.java }} -Dquarkus.http.host=0.0.0.0 + + - name: Set up QEMU + if: matrix.arch == 'arm64' + uses: docker/setup-qemu-action@v2 + with: + platforms: arm64 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + with: + install: true + + - name: Build JVM image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) + uses: docker/build-push-action@v3 + with: + context: ${{ matrix.project }} + platforms: linux/${{ matrix.arch }} + push: false + load: true + file: ${{ matrix.project }}/src/main/docker/${{ env.JVM_DOCKERFILE }} + tags: ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} - - name: "save-jvm-image-${{ matrix.project }}-java-${{ matrix.java }}" + - name: Save JVM Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) uses: ishworkh/docker-image-artifact-upload@v1 with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}" + image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - build-test-native-images: + build-native-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) runs-on: ubuntu-latest strategy: @@ -93,37 +107,19 @@ jobs: - rest-fights - rest-heroes - rest-villains - name: "build-test-native-${{ matrix.project }}-java-${{ matrix.java }}" + arch: + - amd64 + # - arm64 + name: "Build Native images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" steps: - uses: actions/checkout@v3 - - name: Cache and restore Maven artifacts - id: check-mvn-cache - uses: actions/cache@v3 - with: - path: ~/.m2/repository - key: setup-java-${{ runner.os }}-maven-${{ hashFiles('${{ matrix.project }}/pom.xml') }} - - - name: Cache and restore Mandrel distro - id: check-mandrel-cache - uses: actions/cache@v3 - with: - path: java_package-${{ matrix.java }}.tar.gz - key: mandrel-distro-${{ env.MANDREL_VERSION }}-${{ matrix.java }} - - - name: Download Mandrel - if: steps.check-mandrel-cache.outputs.cache-hit != 'true' - run: | - download_url="https://github.com/graalvm/mandrel/releases/download/mandrel-${MANDREL_VERSION}/mandrel-java${{ matrix.java }}-linux-amd64-${MANDREL_VERSION}.tar.gz" - wget -q -O java_package-${{ matrix.java }}.tar.gz $download_url - - - name: Setup Maven+OpenJDK Distro + - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'jdkfile' - jdkFile: java_package-${{ matrix.java }}.tar.gz java-version: ${{ matrix.java }} - architecture: x64 + distribution: temurin + cache: maven - name: Create env vars working-directory: ${{ matrix.project }} @@ -133,68 +129,69 @@ jobs: - name: Create container tags working-directory: ${{ matrix.project }} - run: | - echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-native-java${{ matrix.java }}" >> $GITHUB_ENV && \ - echo "ADDITIONAL_TAG=native-java${{ matrix.java }}-latest" >> $GITHUB_ENV + run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-native-java${{ matrix.java }}" >> $GITHUB_ENV - - name: "build-test-native-image-${{ matrix.project }}-java-${{ matrix.java }}" + - name: Build native image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) working-directory: ${{ matrix.project }} run: | - ./mvnw -B clean verify -Pnative \ - -Dquarkus.http.host=0.0.0.0 \ - -Dmaven.compiler.release=${{ matrix.java }} - - - name: "build-native-container-${{ matrix.project }}-java-${{ matrix.java }}" - working-directory: ${{ matrix.project }} - run: | - ./mvnw -B package -DskipTests -Pnative \ + ./mvnw -B clean package -DskipTests -Pnative \ -Dmaven.compiler.release=${{ matrix.java }} \ -Dquarkus.http.host=0.0.0.0 \ -Dquarkus.native.container-build=true \ - -Dquarkus.native.reuse-existing=true \ - -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:22.0-java${{ matrix.java }} \ + -Dquarkus.native.builder-image=${{ env.MANDREL_IMAGE }}:${{ env.MANDREL_VERSION }}-java${{ matrix.java }} \ -Dquarkus.container-image.build=true \ -Dquarkus.container-image.push=false \ - -Dquarkus.container-image.tag=${{ env.CONTAINER_TAG }} \ - -Dquarkus.container-image.additional-tags=${{ env.ADDITIONAL_TAG }} + -Dquarkus.container-image.tag=${{ env.CONTAINER_TAG }}-${{ matrix.arch }} - - name: "save-native-image-${{ matrix.project }}-java-${{ matrix.java }}" + - name: Save native Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) uses: ishworkh/docker-image-artifact-upload@v1 with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}" + image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - build-ui-image: + build-ui-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) runs-on: ubuntu-latest + strategy: + matrix: + arch: + - amd64 + - arm64 steps: - - name: Checkout - uses: actions/checkout@v3 + - uses: actions/checkout@v3 + + - name: Set up QEMU + if: matrix.arch == 'arm64' + uses: docker/setup-qemu-action@v2 + with: + platforms: arm64 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + with: + install: true - - name: Build UI image + - name: Build UI image (${{ matrix.arch }}) uses: docker/build-push-action@v3 with: context: ui-super-heroes + platforms: linux/${{ matrix.arch }} push: false load: true - tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:latest + tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} - - name: Save UI image + - name: Save UI image (${{ matrix.arch }}) uses: ishworkh/docker-image-artifact-upload@v1 with: - image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:latest" + image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" push-app-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) needs: - - build-test-jvm-images - - build-test-native-images - - build-ui-image + - build-jvm-images + - build-native-images + - build-ui-images runs-on: ubuntu-latest strategy: - fail-fast: false matrix: java: - '11' @@ -207,11 +204,16 @@ jobs: - rest-fights - rest-heroes - rest-villains - name: "push-app-images-${{ matrix.project }}-${{ matrix.kind }}java-${{ matrix.java }}" + arch: + - amd64 + - arm64 + name: "Push app images (${{ matrix.arch}}-${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }})" steps: - uses: actions/checkout@v3 + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - name: Setup Java + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) uses: actions/setup-java@v3 with: java-version: ${{ matrix.java }} @@ -219,23 +221,27 @@ jobs: cache: maven - name: Create env vars + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: | echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - name: Create container tags + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: | echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-${{ matrix.kind }}java${{ matrix.java }}" >> $GITHUB_ENV && - echo "ADDITIONAL_TAG=${{ matrix.kind }}java${{ matrix.java }}-latest" >> $GITHUB_ENV + echo "ADDITIONAL_TAG=${{ matrix.kind }}java${{ matrix.java }}-${{ env.LATEST_IMAGE_TAG }}" >> $GITHUB_ENV - - name: "get-saved-image-${{ matrix.project }}-${{ matrix.kind }}java-${{ matrix.java }}" + - name: Get saved images (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }}-${{ matrix.arch }}) + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) uses: ishworkh/docker-image-artifact-download@v1 with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}" + image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - name: Login to quay + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) uses: docker/login-action@v2 with: registry: quay.io @@ -243,20 +249,27 @@ jobs: password: ${{ secrets.QUAY_REPO_TOKEN }} - name: Tag image + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} - run: "docker tag ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}" + run: "docker tag ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-${{ matrix.arch }}" - - name: Push images in ${{ matrix.project }} + - name: Push images + if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) working-directory: ${{ matrix.project }} run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}" - push-ui-image: + push-ui-images: if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) needs: - - build-test-jvm-images - - build-test-native-images - - build-ui-image + - build-jvm-images + - build-native-images + - build-ui-images runs-on: ubuntu-latest + strategy: + matrix: + arch: + - amd64 + - arm64 steps: - uses: actions/checkout@v3 @@ -271,10 +284,10 @@ jobs: working-directory: ui-super-heroes run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - name: Get Saved UI Image + - name: Get Saved UI Image (${{ matrix.arch }}) uses: ishworkh/docker-image-artifact-download@v1 with: - image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:latest" + image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" - name: Login to quay uses: docker/login-action@v2 @@ -283,19 +296,127 @@ jobs: username: ${{ secrets.QUAY_REPO_USERNAME }} password: ${{ secrets.QUAY_REPO_TOKEN }} - - name: Tag UI image + - name: Tag UI image (${{ matrix.arch }}) working-directory: ui-super-heroes - run: "docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:latest ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}" + run: docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-${{ matrix.arch }} - - name: Push UI image + - name: Push UI image (${{ matrix.arch }}) working-directory: ui-super-heroes run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes" + create-app-multiarch-manifests: + if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) + needs: push-app-images + runs-on: ubuntu-latest + strategy: + matrix: + java: + - '11' + - '17' + kind: + - "" + - "native-" + project: + - event-statistics + - rest-fights + - rest-heroes + - rest-villains + name: Create app multiarch manifests (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }}) + steps: + - uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java }} + distribution: temurin + cache: maven + + - name: Create env vars + working-directory: ${{ matrix.project }} + run: | + echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && + echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + + - name: Create container tags + working-directory: ${{ matrix.project }} + run: | + echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-${{ matrix.kind }}java${{ matrix.java }}" >> $GITHUB_ENV && + echo "ADDITIONAL_TAG=${{ matrix.kind }}java${{ matrix.java }}-${{ env.LATEST_IMAGE_TAG }}" >> $GITHUB_ENV + + - name: Login to quay + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_REPO_USERNAME }} + password: ${{ secrets.QUAY_REPO_TOKEN }} + + - name: Create and push multi-arch JVM manifests + if: matrix.kind != 'native-' + shell: bash + run: | + docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} \ + -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-amd64 \ + -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-arm64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} + docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} \ + -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-amd64 \ + -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-arm64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} + + - name: Create and push single-arch native manifests + if: matrix.kind == 'native-' + shell: bash + run: | + docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} \ + -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-amd64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} + docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} \ + -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-amd64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} + + create-ui-multiarch-manifests: + if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) + needs: push-ui-images + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Setup Java + uses: actions/setup-java@v3 + with: + java-version: 17 + distribution: temurin + cache: maven + + - name: Create env vars + working-directory: ui-super-heroes + run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + + - name: Login to quay + uses: docker/login-action@v2 + with: + registry: quay.io + username: ${{ secrets.QUAY_REPO_USERNAME }} + password: ${{ secrets.QUAY_REPO_TOKEN }} + + - name: Create and push multi-arch manifests + shell: bash + run: | + docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-amd64 \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-arm64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} + docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }} \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-amd64 \ + -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-arm64 + docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }} + cleanup-artifacts: needs: - - push-app-images - - push-ui-image - if: success() || failure() + - create-app-multiarch-manifests + - create-ui-multiarch-manifests + if: always() runs-on: ubuntu-latest steps: - name: Delete artifacts diff --git a/.github/workflows/test-multiarch-images.yml b/.github/workflows/test-multiarch-images.yml deleted file mode 100644 index 8b9bf2082..000000000 --- a/.github/workflows/test-multiarch-images.yml +++ /dev/null @@ -1,420 +0,0 @@ -name: Test building multi-arch images - -env: - IMAGE_BASE_NAME: "quay.io/quarkus-super-heroes" - MANDREL_IMAGE: "quay.io/quarkus/ubi-quarkus-mandrel" - MANDREL_VERSION: "22.0" - LATEST_IMAGE_TAG: "multiarch-latest" - -on: - workflow_dispatch: - -concurrency: - group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}" - cancel-in-progress: false - -jobs: - build-jvm-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - runs-on: ubuntu-latest - strategy: - matrix: - java: - - '11' - - '17' - project: - - event-statistics - - rest-fights - - rest-heroes - - rest-villains - arch: - - amd64 - - arm64 - name: "Build JVM images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ${{ matrix.project }} - run: | - echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && - echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV && - if [[ ${{ matrix.java }} == '11' ]]; then - echo "JVM_DOCKERFILE=Dockerfile.jvm" >> "$GITHUB_ENV" - else - echo "JVM_DOCKERFILE=Dockerfile.jvm${{ matrix.java }}" >> "$GITHUB_ENV" - fi - - - name: Create container tags - working-directory: ${{ matrix.project }} - run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-java${{ matrix.java }}-multiarch" >> $GITHUB_ENV - - - name: Build app (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) - working-directory: ${{ matrix.project }} - run: ./mvnw -B clean package -DskipTests -Dmaven.compiler.release=${{ matrix.java }} -Dquarkus.http.host=0.0.0.0 - - - name: Set up QEMU - if: matrix.arch == 'arm64' - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Build JVM image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) - uses: docker/build-push-action@v3 - with: - context: ${{ matrix.project }} - platforms: linux/${{ matrix.arch }} - push: false - load: true - file: ${{ matrix.project }}/src/main/docker/${{ env.JVM_DOCKERFILE }} - tags: ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} - - - name: Save JVM Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-upload@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - - build-native-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - java: - - '11' - - '17' - project: - - event-statistics - - rest-fights - - rest-heroes - - rest-villains - arch: - - amd64 -# - arm64 - name: "Build Native images (${{ matrix.arch}}-${{ matrix.project }}-java${{ matrix.java }})" - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ${{ matrix.project }} - run: | - echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && \ - echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Create container tags - working-directory: ${{ matrix.project }} - run: echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-native-java${{ matrix.java }}-multiarch" >> $GITHUB_ENV - - - name: Build native image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch}}) - working-directory: ${{ matrix.project }} - run: | - ./mvnw -B clean package -DskipTests -Pnative \ - -Dmaven.compiler.release=${{ matrix.java }} \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.native.container-build=true \ - -Dquarkus.native.builder-image=${{ env.MANDREL_IMAGE }}:${{ env.MANDREL_VERSION }}-java${{ matrix.java }} \ - -Dquarkus.container-image.build=true \ - -Dquarkus.container-image.push=false \ - -Dquarkus.container-image.tag=${{ env.CONTAINER_TAG }}-${{ matrix.arch }} - - - name: Save native Image (${{ matrix.project }}-java${{ matrix.java }}-${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-upload@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - - build-ui-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - runs-on: ubuntu-latest - strategy: - matrix: - arch: - - amd64 - - arm64 - steps: - - uses: actions/checkout@v3 - - - name: Set up QEMU - if: matrix.arch == 'arm64' - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - with: - install: true - - - name: Build UI image (${{ matrix.arch }}) - uses: docker/build-push-action@v3 - with: - context: ui-super-heroes - platforms: linux/${{ matrix.arch }} - push: false - load: true - tags: ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} - - - name: Save UI image (${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-upload@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" - - push-app-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - needs: - - build-jvm-images - - build-native-images - - build-ui-images - runs-on: ubuntu-latest - strategy: - matrix: - java: - - '11' - - '17' - kind: - - "" - - "native-" - project: - - event-statistics - - rest-fights - - rest-heroes - - rest-villains - arch: - - amd64 - - arm64 - name: "Push app images (${{ matrix.arch}}-${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }})" - steps: - - uses: actions/checkout@v3 - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - - - name: Setup Java - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: temurin - cache: maven - - - name: Create env vars - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - working-directory: ${{ matrix.project }} - run: | - echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && - echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Create container tags - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - working-directory: ${{ matrix.project }} - run: | - echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-${{ matrix.kind }}java${{ matrix.java }}-multiarch" >> $GITHUB_ENV && - echo "ADDITIONAL_TAG=${{ matrix.kind }}java${{ matrix.java }}-${{ env.LATEST_IMAGE_TAG }}" >> $GITHUB_ENV - - - name: Get saved images (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }}-${{ matrix.arch }}) - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - uses: ishworkh/docker-image-artifact-download@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }}" - - - name: Login to quay - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_REPO_USERNAME }} - password: ${{ secrets.QUAY_REPO_TOKEN }} - - - name: Tag image - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - working-directory: ${{ matrix.project }} - run: "docker tag ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-${{ matrix.arch }}" - - - name: Push images - if: ((matrix.arch == 'amd64') || (matrix.kind != 'native-')) - working-directory: ${{ matrix.project }} - run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}" - - push-ui-images: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - needs: - - build-jvm-images - - build-native-images - - build-ui-images - runs-on: ubuntu-latest - strategy: - matrix: - arch: - - amd64 - - arm64 - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ui-super-heroes - run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Get Saved UI Image (${{ matrix.arch }}) - uses: ishworkh/docker-image-artifact-download@v1 - with: - image: "${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }}" - - - name: Login to quay - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_REPO_USERNAME }} - password: ${{ secrets.QUAY_REPO_TOKEN }} - - - name: Tag UI image (${{ matrix.arch }}) - working-directory: ui-super-heroes - run: docker tag ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-${{ matrix.arch }} ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-${{ matrix.arch }} - - - name: Push UI image (${{ matrix.arch }}) - working-directory: ui-super-heroes - run: "docker push -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes" - - create-app-multiarch-manifests: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - needs: push-app-images - runs-on: ubuntu-latest - strategy: - matrix: - java: - - '11' - - '17' - kind: - - "" - - "native-" - project: - - event-statistics - - rest-fights - - rest-heroes - - rest-villains - name: Create app multiarch manifests (${{ matrix.project }}-${{ matrix.kind }}java${{ matrix.java }}) - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java }} - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ${{ matrix.project }} - run: | - echo "QUARKUS_VERSION=$(./mvnw help:evaluate -Dexpression=quarkus.platform.version -q -DforceStdout)" >> $GITHUB_ENV && - echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Create container tags - working-directory: ${{ matrix.project }} - run: | - echo "CONTAINER_TAG=${{ env.APP_VERSION }}-quarkus-${{ env.QUARKUS_VERSION }}-${{ matrix.kind }}java${{ matrix.java }}-multiarch" >> $GITHUB_ENV && - echo "ADDITIONAL_TAG=${{ matrix.kind }}java${{ matrix.java }}-${{ env.LATEST_IMAGE_TAG }}" >> $GITHUB_ENV - - - name: Login to quay - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_REPO_USERNAME }} - password: ${{ secrets.QUAY_REPO_TOKEN }} - - - name: Create and push multi-arch JVM manifests - if: matrix.kind != 'native-' - shell: bash - run: | - docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} \ - -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-amd64 \ - -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-arm64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} - docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} \ - -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-amd64 \ - -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-arm64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} - - - name: Create and push single-arch native manifests - if: matrix.kind == 'native-' - shell: bash - run: | - docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} \ - -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }}-amd64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.CONTAINER_TAG }} - docker manifest create ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} \ - -a ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }}-amd64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/${{ matrix.project }}:${{ env.ADDITIONAL_TAG }} - - create-ui-multiarch-manifests: - if: ((github.event_name == 'workflow_dispatch') || ((github.event_name == 'workflow_run') && ((github.event.workflow_run.event == 'push') || (github.event.workflow_run.event == 'workflow_dispatch')) && (github.event.workflow_run.conclusion == 'success'))) && ((github.repository == 'quarkusio/quarkus-super-heroes') && (github.ref == 'refs/heads/main')) - needs: push-ui-images - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Setup Java - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - cache: maven - - - name: Create env vars - working-directory: ui-super-heroes - run: echo "APP_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV - - - name: Login to quay - uses: docker/login-action@v2 - with: - registry: quay.io - username: ${{ secrets.QUAY_REPO_USERNAME }} - password: ${{ secrets.QUAY_REPO_TOKEN }} - - - name: Create and push multi-arch manifests - shell: bash - run: | - docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-amd64 \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }}-arm64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.LATEST_IMAGE_TAG }} - docker manifest create ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-amd64 \ - -a ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch-arm64 - docker manifest push ${{ env.IMAGE_BASE_NAME }}/ui-super-heroes:${{ env.APP_VERSION }}-multiarch - - cleanup-artifacts: - needs: - - create-app-multiarch-manifests - - create-ui-multiarch-manifests - if: always() - runs-on: ubuntu-latest - steps: - - name: Delete artifacts - env: - WEBHOOK_SECRET: ${{ secrets.WEBHOOK_SECRET }} - run: | - echo "::add-mask::$WEBHOOK_SECRET" - curl --verbose --fail --show-error --location --request POST "https://api.github.com/repos/$GITHUB_REPOSITORY/dispatches" --header "Authorization: token $WEBHOOK_SECRET" --header 'Content-Type: application/json' --header 'Accept: application/vnd.github.everest-preview+json' --data-raw "{ \"event_type\": \"delete_all_artifacts\", \"client_payload\": {\"parent_runid\": \"$GITHUB_RUN_ID\", \"parent_repo\": \"$GITHUB_REPOSITORY\"} }" From 8e50e34889edb5e4a191fb85e03f07cec0343f31 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 May 2022 17:47:26 +0000 Subject: [PATCH 7/9] Generate deploy resources (from Create deploy resources run # 135) --- deploy/k8s/java11-knative.yml | 60 +++---- deploy/k8s/java11-kubernetes.yml | 92 +++++----- deploy/k8s/java11-minikube.yml | 92 +++++----- deploy/k8s/java11-openshift.yml | 146 ++++++---------- deploy/k8s/java17-knative.yml | 58 +++---- deploy/k8s/java17-kubernetes.yml | 76 ++++---- deploy/k8s/java17-minikube.yml | 70 ++++---- deploy/k8s/java17-openshift.yml | 150 +++++++--------- deploy/k8s/native-java11-knative.yml | 52 +++--- deploy/k8s/native-java11-kubernetes.yml | 74 ++++---- deploy/k8s/native-java11-minikube.yml | 78 ++++----- deploy/k8s/native-java11-openshift.yml | 146 ++++++---------- deploy/k8s/native-java17-knative.yml | 62 +++---- deploy/k8s/native-java17-kubernetes.yml | 74 ++++---- deploy/k8s/native-java17-minikube.yml | 74 ++++---- deploy/k8s/native-java17-openshift.yml | 163 ++++++++---------- .../deploy/k8s/java11-knative.yml | 16 +- .../deploy/k8s/java11-kubernetes.yml | 22 +-- .../deploy/k8s/java11-minikube.yml | 34 ++-- .../deploy/k8s/java11-openshift.yml | 47 ++--- .../deploy/k8s/java17-knative.yml | 16 +- .../deploy/k8s/java17-kubernetes.yml | 24 +-- .../deploy/k8s/java17-minikube.yml | 12 +- .../deploy/k8s/java17-openshift.yml | 37 ++-- .../deploy/k8s/native-java11-knative.yml | 8 +- .../deploy/k8s/native-java11-kubernetes.yml | 12 +- .../deploy/k8s/native-java11-minikube.yml | 16 +- .../deploy/k8s/native-java11-openshift.yml | 41 ++--- .../deploy/k8s/native-java17-knative.yml | 16 +- .../deploy/k8s/native-java17-kubernetes.yml | 18 +- .../deploy/k8s/native-java17-minikube.yml | 16 +- .../deploy/k8s/native-java17-openshift.yml | 42 ++--- .../k8s/java11-knative-all-downstream.yml | 44 ++--- rest-fights/deploy/k8s/java11-knative.yml | 16 +- .../k8s/java11-kubernetes-all-downstream.yml | 70 ++++---- rest-fights/deploy/k8s/java11-kubernetes.yml | 28 +-- .../k8s/java11-minikube-all-downstream.yml | 58 +++---- rest-fights/deploy/k8s/java11-minikube.yml | 12 +- .../k8s/java11-openshift-all-downstream.yml | 99 ++++------- rest-fights/deploy/k8s/java11-openshift.yml | 33 ++-- .../k8s/java17-knative-all-downstream.yml | 42 ++--- rest-fights/deploy/k8s/java17-knative.yml | 12 +- .../k8s/java17-kubernetes-all-downstream.yml | 52 +++--- rest-fights/deploy/k8s/java17-kubernetes.yml | 22 +-- .../k8s/java17-minikube-all-downstream.yml | 58 +++---- rest-fights/deploy/k8s/java17-minikube.yml | 12 +- .../k8s/java17-openshift-all-downstream.yml | 113 ++++++------ rest-fights/deploy/k8s/java17-openshift.yml | 38 ++-- .../native-java11-knative-all-downstream.yml | 44 ++--- .../deploy/k8s/native-java11-knative.yml | 16 +- ...ative-java11-kubernetes-all-downstream.yml | 62 +++---- .../deploy/k8s/native-java11-kubernetes.yml | 22 +-- .../native-java11-minikube-all-downstream.yml | 62 +++---- .../deploy/k8s/native-java11-minikube.yml | 30 ++-- ...native-java11-openshift-all-downstream.yml | 105 +++++------ .../deploy/k8s/native-java11-openshift.yml | 33 ++-- .../native-java17-knative-all-downstream.yml | 46 ++--- .../deploy/k8s/native-java17-knative.yml | 14 +- ...ative-java17-kubernetes-all-downstream.yml | 56 +++--- .../deploy/k8s/native-java17-kubernetes.yml | 16 +- .../native-java17-minikube-all-downstream.yml | 58 +++---- .../deploy/k8s/native-java17-minikube.yml | 16 +- ...native-java17-openshift-all-downstream.yml | 121 +++++-------- .../deploy/k8s/native-java17-openshift.yml | 37 ++-- rest-heroes/deploy/k8s/java11-knative.yml | 12 +- rest-heroes/deploy/k8s/java11-kubernetes.yml | 18 +- rest-heroes/deploy/k8s/java11-minikube.yml | 12 +- rest-heroes/deploy/k8s/java11-openshift.yml | 33 ++-- rest-heroes/deploy/k8s/java17-knative.yml | 18 +- rest-heroes/deploy/k8s/java17-kubernetes.yml | 18 +- rest-heroes/deploy/k8s/java17-minikube.yml | 30 ++-- rest-heroes/deploy/k8s/java17-openshift.yml | 42 ++--- .../deploy/k8s/native-java11-knative.yml | 16 +- .../deploy/k8s/native-java11-kubernetes.yml | 18 +- .../deploy/k8s/native-java11-minikube.yml | 16 +- .../deploy/k8s/native-java11-openshift.yml | 43 ++--- .../deploy/k8s/native-java17-knative.yml | 14 +- .../deploy/k8s/native-java17-kubernetes.yml | 22 +-- .../deploy/k8s/native-java17-minikube.yml | 12 +- .../deploy/k8s/native-java17-openshift.yml | 47 ++--- rest-villains/deploy/k8s/java11-knative.yml | 16 +- .../deploy/k8s/java11-kubernetes.yml | 24 +-- rest-villains/deploy/k8s/java11-minikube.yml | 34 ++-- rest-villains/deploy/k8s/java11-openshift.yml | 33 ++-- rest-villains/deploy/k8s/java17-knative.yml | 12 +- .../deploy/k8s/java17-kubernetes.yml | 12 +- rest-villains/deploy/k8s/java17-minikube.yml | 16 +- rest-villains/deploy/k8s/java17-openshift.yml | 33 ++-- .../deploy/k8s/native-java11-knative.yml | 12 +- .../deploy/k8s/native-java11-kubernetes.yml | 22 +-- .../deploy/k8s/native-java11-minikube.yml | 16 +- .../deploy/k8s/native-java11-openshift.yml | 29 ++-- .../deploy/k8s/native-java17-knative.yml | 18 +- .../deploy/k8s/native-java17-kubernetes.yml | 18 +- .../deploy/k8s/native-java17-minikube.yml | 30 ++-- .../deploy/k8s/native-java17-openshift.yml | 37 ++-- 96 files changed, 1850 insertions(+), 2174 deletions(-) diff --git a/deploy/k8s/java11-knative.yml b/deploy/k8s/java11-knative.yml index 3a8586a13..393062650 100644 --- a/deploy/k8s/java11-knative.yml +++ b/deploy/k8s/java11-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:17 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,9 +44,9 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-villains app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: villains-service - app.kubernetes.io/name: rest-villains name: rest-villains spec: template: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:17 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,17 +66,17 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-villains app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: villains-service - app.kubernetes.io/name: rest-villains spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:java11-latest livenessProbe: failureThreshold: 3 @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:35 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -261,8 +261,8 @@ metadata: app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest name: rest-heroes spec: @@ -272,8 +272,8 @@ spec: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:35 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -283,8 +283,8 @@ spec: app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest spec: containerConcurrency: 0 @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:49 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -503,9 +503,9 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights name: rest-fights spec: template: @@ -514,8 +514,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:49 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -525,17 +525,17 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: rest-fights-config - secretRef: name: rest-fights-config-creds + - configMapRef: + name: rest-fights-config image: quay.io/quarkus-super-heroes/rest-fights:java11-latest livenessProbe: failureThreshold: 3 @@ -773,8 +773,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:07 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -785,8 +785,8 @@ metadata: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/part-of: event-stats app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: event-stats name: event-statistics spec: template: @@ -795,8 +795,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:07 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -807,16 +807,16 @@ spec: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/part-of: event-stats app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: event-stats spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java11-latest livenessProbe: failureThreshold: 3 diff --git a/deploy/k8s/java11-kubernetes.yml b/deploy/k8s/java11-kubernetes.yml index 946265df3..0a22a5680 100644 --- a/deploy/k8s/java11-kubernetes.yml +++ b/deploy/k8s/java11-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -119,25 +119,25 @@ metadata: app: rest-villains application: villains-service system: quarkus-super-heroes - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -146,9 +146,9 @@ spec: app: rest-villains application: villains-service system: quarkus-super-heroes - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,16 +407,16 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes template: metadata: @@ -424,8 +424,8 @@ spec: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,8 +434,8 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes spec: containers: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -782,25 +782,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest name: rest-fights spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -809,9 +809,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:java11-latest imagePullPolicy: Always livenessProbe: @@ -896,8 +896,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:29 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:22 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1027,8 +1027,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:29 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:22 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1038,24 +1038,24 @@ metadata: application: event-stats system: quarkus-super-heroes app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java11-latest name: event-statistics spec: replicas: 1 selector: matchLabels: app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:29 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:22 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1065,8 +1065,8 @@ spec: application: event-stats system: quarkus-super-heroes app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -1075,10 +1075,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java11-latest imagePullPolicy: Always livenessProbe: diff --git a/deploy/k8s/java11-minikube.yml b/deploy/k8s/java11-minikube.yml index d891f3bd3..a50e32587 100644 --- a/deploy/k8s/java11-minikube.yml +++ b/deploy/k8s/java11-minikube.yml @@ -30,15 +30,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -107,15 +107,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -134,15 +134,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java11-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -399,8 +399,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -426,8 +426,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -578,8 +578,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -777,8 +777,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -804,8 +804,8 @@ spec: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -896,15 +896,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8085" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:45 +0000 + app.openshift.io/connects-to: "fights-kafka,apicurio" + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:37 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8085" + prometheus.io/scheme: http labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1028,15 +1028,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8085" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:45 +0000 + app.openshift.io/connects-to: "fights-kafka,apicurio" + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:37 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8085" + prometheus.io/scheme: http labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1055,15 +1055,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8085" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:45 +0000 + app.openshift.io/connects-to: "fights-kafka,apicurio" + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:37 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8085" + prometheus.io/scheme: http labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1079,10 +1079,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/deploy/k8s/java11-openshift.yml b/deploy/k8s/java11-openshift.yml index 4b8abf398..64120e855 100644 --- a/deploy/k8s/java11-openshift.yml +++ b/deploy/k8s/java11-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java11-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -348,8 +339,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -381,8 +372,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -476,8 +467,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -494,17 +485,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: heroes-service template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -514,9 +505,9 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: heroes-service spec: containers: - env: @@ -561,15 +552,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -578,8 +560,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -688,8 +670,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -721,8 +703,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -908,8 +890,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +908,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,9 +928,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -993,15 +975,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1031,8 +1004,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -1085,11 +1058,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1135,11 +1108,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1282,11 +1255,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1303,17 +1276,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1323,9 +1296,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -1370,15 +1343,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - event-statistics - from: - kind: ImageStreamTag - name: event-statistics:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1405,11 +1369,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/deploy/k8s/java17-knative.yml b/deploy/k8s/java17-knative.yml index 031b7873f..f23401d4e 100644 --- a/deploy/k8s/java17-knative.yml +++ b/deploy/k8s/java17-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,9 +44,9 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains - app.kubernetes.io/version: java17-latest name: rest-villains spec: template: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,9 +66,9 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains - app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:33 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:30 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -262,30 +262,30 @@ metadata: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java17-latest name: rest-heroes spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:33 +0000 + app.openshift.io/connects-to: heroes-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:30 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" prometheus.io/scheme: http - app.openshift.io/connects-to: heroes-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-heroes app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:54 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -503,9 +503,9 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java17-latest name: rest-fights spec: template: @@ -514,8 +514,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:54 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -525,9 +525,9 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: @@ -773,8 +773,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -784,8 +784,8 @@ metadata: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: java17-latest app.kubernetes.io/name: event-statistics name: event-statistics spec: @@ -795,8 +795,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -806,17 +806,17 @@ spec: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: java17-latest app.kubernetes.io/name: event-statistics spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java17-latest livenessProbe: failureThreshold: 3 diff --git a/deploy/k8s/java17-kubernetes.yml b/deploy/k8s/java17-kubernetes.yml index 5540c3981..301f143f6 100644 --- a/deploy/k8s/java17-kubernetes.yml +++ b/deploy/k8s/java17-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -136,8 +136,8 @@ spec: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,25 +407,25 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,9 +434,9 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest spec: containers: - env: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -782,25 +782,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights name: rest-fights spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -809,9 +809,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:java17-latest imagePullPolicy: Always livenessProbe: @@ -896,8 +896,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1027,8 +1027,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1037,25 +1037,25 @@ metadata: app: event-statistics application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java17-latest name: event-statistics spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1064,9 +1064,9 @@ spec: app: event-statistics application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java17-latest spec: containers: - env: diff --git a/deploy/k8s/java17-minikube.yml b/deploy/k8s/java17-minikube.yml index bb4de8dad..2b545b7fc 100644 --- a/deploy/k8s/java17-minikube.yml +++ b/deploy/k8s/java17-minikube.yml @@ -33,8 +33,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -110,8 +110,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -137,8 +137,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java17-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -289,15 +289,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -396,15 +396,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -423,15 +423,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -576,8 +576,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -775,8 +775,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -802,8 +802,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -899,8 +899,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:43 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:41 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1031,8 +1031,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:43 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:41 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1058,8 +1058,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:43 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:41 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" diff --git a/deploy/k8s/java17-openshift.yml b/deploy/k8s/java17-openshift.yml index 8a20b835b..d548f0432 100644 --- a/deploy/k8s/java17-openshift.yml +++ b/deploy/k8s/java17-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:java17-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -345,11 +336,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -378,11 +369,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -473,11 +464,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -494,17 +485,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -514,9 +505,9 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes spec: containers: - env: @@ -525,10 +516,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-heroes-config - secretRef: name: rest-heroes-config-creds + - configMapRef: + name: rest-heroes-config image: quay.io/quarkus-super-heroes/rest-heroes:java17-latest imagePullPolicy: Always livenessProbe: @@ -575,11 +566,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -685,11 +676,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -718,11 +709,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -905,11 +896,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +917,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,8 +937,8 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights spec: containers: @@ -957,10 +948,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-fights-config - secretRef: name: rest-fights-config-creds + - configMapRef: + name: rest-fights-config image: quay.io/quarkus-super-heroes/rest-fights:java17-latest imagePullPolicy: Always livenessProbe: @@ -1028,11 +1019,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -1088,8 +1079,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1138,8 +1129,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1285,8 +1276,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1303,17 +1294,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java17-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1323,9 +1314,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java17-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -1370,15 +1361,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - event-statistics - from: - kind: ImageStreamTag - name: event-statistics:java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1408,8 +1390,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/deploy/k8s/native-java11-knative.yml b/deploy/k8s/native-java11-knative.yml index becba0e6a..6d2123748 100644 --- a/deploy/k8s/native-java11-knative.yml +++ b/deploy/k8s/native-java11-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:15 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,8 +44,8 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/version: native-java11-latest app.kubernetes.io/name: rest-villains name: rest-villains spec: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:15 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,8 +66,8 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/version: native-java11-latest app.kubernetes.io/name: rest-villains spec: containerConcurrency: 0 @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:31 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -262,15 +262,15 @@ metadata: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: native-java11-latest name: rest-heroes spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:31 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -284,16 +284,16 @@ spec: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: native-java11-latest spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java11-latest livenessProbe: failureThreshold: 3 @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -503,8 +503,8 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest name: rest-fights spec: @@ -514,8 +514,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -525,17 +525,17 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java11-latest livenessProbe: failureThreshold: 3 @@ -773,8 +773,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -795,8 +795,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" diff --git a/deploy/k8s/native-java11-kubernetes.yml b/deploy/k8s/native-java11-kubernetes.yml index 684c7aa0a..1114bf8be 100644 --- a/deploy/k8s/native-java11-kubernetes.yml +++ b/deploy/k8s/native-java11-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -120,24 +120,24 @@ metadata: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -147,8 +147,8 @@ spec: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -157,10 +157,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java11-latest imagePullPolicy: Always livenessProbe: @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,25 +407,25 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,9 +434,9 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service spec: containers: - env: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -782,25 +782,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights name: rest-fights spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -809,9 +809,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java11-latest imagePullPolicy: Always livenessProbe: @@ -896,8 +896,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1027,8 +1027,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1054,8 +1054,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" diff --git a/deploy/k8s/native-java11-minikube.yml b/deploy/k8s/native-java11-minikube.yml index 0636c9706..04ec63e0c 100644 --- a/deploy/k8s/native-java11-minikube.yml +++ b/deploy/k8s/native-java11-minikube.yml @@ -33,8 +33,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -110,8 +110,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -137,8 +137,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -399,8 +399,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -426,8 +426,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -447,10 +447,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -573,15 +573,15 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -772,15 +772,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -799,15 +799,15 @@ spec: template: metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -899,8 +899,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1031,8 +1031,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1058,8 +1058,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1079,10 +1079,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/deploy/k8s/native-java11-openshift.yml b/deploy/k8s/native-java11-openshift.yml index e1b7b5117..0996d5e79 100644 --- a/deploy/k8s/native-java11-openshift.yml +++ b/deploy/k8s/native-java11-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -262,15 +262,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -345,11 +336,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -378,11 +369,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -473,11 +464,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -495,16 +486,16 @@ spec: replicas: 1 selector: app.kubernetes.io/part-of: heroes-service - app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: rest-heroes template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -515,8 +506,8 @@ spec: system: quarkus-super-heroes app.openshift.io/runtime: quarkus app.kubernetes.io/part-of: heroes-service - app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: rest-heroes spec: containers: - env: @@ -561,25 +552,16 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -688,8 +670,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -721,8 +703,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -908,8 +890,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +908,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,9 +928,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -993,15 +975,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1031,8 +1004,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -1088,8 +1061,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1138,8 +1111,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1285,8 +1258,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1303,17 +1276,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1323,9 +1296,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -1334,10 +1307,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java11-latest imagePullPolicy: Always livenessProbe: @@ -1370,15 +1343,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - event-statistics - from: - kind: ImageStreamTag - name: event-statistics:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1408,8 +1372,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/deploy/k8s/native-java17-knative.yml b/deploy/k8s/native-java17-knative.yml index 3c6ab7e51..b41b0e1ff 100644 --- a/deploy/k8s/native-java17-knative.yml +++ b/deploy/k8s/native-java17-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:14 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -52,15 +52,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:14 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" prometheus.io/scheme: http + app.openshift.io/connects-to: villains-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-villains app.openshift.io/runtime: quarkus @@ -73,10 +73,10 @@ spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java17-latest livenessProbe: failureThreshold: 3 @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:35 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -269,15 +269,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: heroes-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:35 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" prometheus.io/scheme: http + app.openshift.io/connects-to: heroes-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-heroes app.openshift.io/runtime: quarkus @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -511,15 +511,15 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:55 +0000 + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-fights app.openshift.io/runtime: quarkus @@ -773,8 +773,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:28:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:47:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -784,9 +784,9 @@ metadata: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest name: event-statistics spec: template: @@ -795,8 +795,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:28:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:47:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -806,17 +806,17 @@ spec: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java17-latest livenessProbe: failureThreshold: 3 diff --git a/deploy/k8s/native-java17-kubernetes.yml b/deploy/k8s/native-java17-kubernetes.yml index ffd192bc9..7fea5118d 100644 --- a/deploy/k8s/native-java17-kubernetes.yml +++ b/deploy/k8s/native-java17-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -120,24 +120,24 @@ metadata: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -147,8 +147,8 @@ spec: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,16 +407,16 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service template: metadata: @@ -424,8 +424,8 @@ spec: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,8 +434,8 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service spec: containers: @@ -445,10 +445,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -799,8 +799,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -896,8 +896,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1027,8 +1027,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1038,24 +1038,24 @@ metadata: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest name: event-statistics spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: event-statistics - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1065,8 +1065,8 @@ spec: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest spec: containers: - env: diff --git a/deploy/k8s/native-java17-minikube.yml b/deploy/k8s/native-java17-minikube.yml index 4680942d2..67a51d394 100644 --- a/deploy/k8s/native-java17-minikube.yml +++ b/deploy/k8s/native-java17-minikube.yml @@ -30,15 +30,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -107,15 +107,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -134,15 +134,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -399,8 +399,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -426,8 +426,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -578,8 +578,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -777,8 +777,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -804,8 +804,8 @@ spec: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -823,10 +823,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java17-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -899,8 +899,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1031,8 +1031,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1058,8 +1058,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1079,10 +1079,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java17-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/deploy/k8s/native-java17-openshift.yml b/deploy/k8s/native-java17-openshift.yml index 939d9d08d..8fd6b0217 100644 --- a/deploy/k8s/native-java17-openshift.yml +++ b/deploy/k8s/native-java17-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -195,17 +195,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-villains app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/name: rest-villains template: metadata: annotations: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -215,9 +215,9 @@ spec: application: villains-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-villains app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/name: rest-villains spec: containers: - env: @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -345,11 +336,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -378,11 +369,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -473,11 +464,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -494,17 +485,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -514,8 +505,8 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes spec: containers: @@ -525,10 +516,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-heroes-config - secretRef: name: rest-heroes-config-creds + - configMapRef: + name: rest-heroes-config image: quay.io/quarkus-super-heroes/rest-heroes:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -561,25 +552,16 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -688,8 +670,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -721,8 +703,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -908,8 +890,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +908,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: native-java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,9 +928,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: native-java17-latest spec: containers: - env: @@ -993,15 +975,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1031,8 +1004,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -1085,11 +1058,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1135,11 +1108,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -1282,11 +1255,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1303,17 +1276,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: event-stats template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -1323,9 +1296,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -1334,10 +1307,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -1405,11 +1378,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/event-statistics/deploy/k8s/java11-knative.yml b/event-statistics/deploy/k8s/java11-knative.yml index ede230f3d..4a6c00867 100644 --- a/event-statistics/deploy/k8s/java11-knative.yml +++ b/event-statistics/deploy/k8s/java11-knative.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:07 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -50,8 +50,8 @@ metadata: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/part-of: event-stats app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: event-stats name: event-statistics spec: template: @@ -60,8 +60,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:07 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -72,16 +72,16 @@ spec: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/part-of: event-stats app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: event-stats spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java11-latest livenessProbe: failureThreshold: 3 diff --git a/event-statistics/deploy/k8s/java11-kubernetes.yml b/event-statistics/deploy/k8s/java11-kubernetes.yml index 445256ac7..98782635a 100644 --- a/event-statistics/deploy/k8s/java11-kubernetes.yml +++ b/event-statistics/deploy/k8s/java11-kubernetes.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:29 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:22 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -169,8 +169,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:29 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:22 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -180,24 +180,24 @@ metadata: application: event-stats system: quarkus-super-heroes app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java11-latest name: event-statistics spec: replicas: 1 selector: matchLabels: app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:29 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:22 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -207,8 +207,8 @@ spec: application: event-stats system: quarkus-super-heroes app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -217,10 +217,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java11-latest imagePullPolicy: Always livenessProbe: diff --git a/event-statistics/deploy/k8s/java11-minikube.yml b/event-statistics/deploy/k8s/java11-minikube.yml index 84aace345..550839d35 100644 --- a/event-statistics/deploy/k8s/java11-minikube.yml +++ b/event-statistics/deploy/k8s/java11-minikube.yml @@ -35,15 +35,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8085" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:45 +0000 + app.openshift.io/connects-to: "fights-kafka,apicurio" + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:37 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8085" + prometheus.io/scheme: http labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -167,15 +167,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8085" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:45 +0000 + app.openshift.io/connects-to: "fights-kafka,apicurio" + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:37 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8085" + prometheus.io/scheme: http labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -194,15 +194,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8085" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:45 +0000 + app.openshift.io/connects-to: "fights-kafka,apicurio" + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:37 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8085" + prometheus.io/scheme: http labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -218,10 +218,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/event-statistics/deploy/k8s/java11-openshift.yml b/event-statistics/deploy/k8s/java11-openshift.yml index 624d4b918..be74b9a7e 100644 --- a/event-statistics/deploy/k8s/java11-openshift.yml +++ b/event-statistics/deploy/k8s/java11-openshift.yml @@ -35,11 +35,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -85,11 +85,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -232,11 +232,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -253,17 +253,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -273,9 +273,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -320,15 +320,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - event-statistics - from: - kind: ImageStreamTag - name: event-statistics:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -355,11 +346,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:59 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:52 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/event-statistics/deploy/k8s/java17-knative.yml b/event-statistics/deploy/k8s/java17-knative.yml index 70904a2ba..02425f781 100644 --- a/event-statistics/deploy/k8s/java17-knative.yml +++ b/event-statistics/deploy/k8s/java17-knative.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -49,8 +49,8 @@ metadata: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: java17-latest app.kubernetes.io/name: event-statistics name: event-statistics spec: @@ -60,8 +60,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -71,17 +71,17 @@ spec: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: java17-latest app.kubernetes.io/name: event-statistics spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:java17-latest livenessProbe: failureThreshold: 3 diff --git a/event-statistics/deploy/k8s/java17-kubernetes.yml b/event-statistics/deploy/k8s/java17-kubernetes.yml index 2a633037e..398eb5cdf 100644 --- a/event-statistics/deploy/k8s/java17-kubernetes.yml +++ b/event-statistics/deploy/k8s/java17-kubernetes.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -169,8 +169,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -179,25 +179,25 @@ metadata: app: event-statistics application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java17-latest name: event-statistics spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -206,9 +206,9 @@ spec: app: event-statistics application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: java17-latest spec: containers: - env: diff --git a/event-statistics/deploy/k8s/java17-minikube.yml b/event-statistics/deploy/k8s/java17-minikube.yml index 227f6cee1..fb3b61bfd 100644 --- a/event-statistics/deploy/k8s/java17-minikube.yml +++ b/event-statistics/deploy/k8s/java17-minikube.yml @@ -38,8 +38,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:43 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:41 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -170,8 +170,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:43 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:41 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -197,8 +197,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:43 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:41 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" diff --git a/event-statistics/deploy/k8s/java17-openshift.yml b/event-statistics/deploy/k8s/java17-openshift.yml index 686009de4..624939a9d 100644 --- a/event-statistics/deploy/k8s/java17-openshift.yml +++ b/event-statistics/deploy/k8s/java17-openshift.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -88,8 +88,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -235,8 +235,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -253,17 +253,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java17-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -273,9 +273,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: java17-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -320,15 +320,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - event-statistics - from: - kind: ImageStreamTag - name: event-statistics:java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -358,8 +349,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:55 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/event-statistics/deploy/k8s/native-java11-knative.yml b/event-statistics/deploy/k8s/native-java11-knative.yml index fc2da85ba..749ed0f82 100644 --- a/event-statistics/deploy/k8s/native-java11-knative.yml +++ b/event-statistics/deploy/k8s/native-java11-knative.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -60,8 +60,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:10 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" diff --git a/event-statistics/deploy/k8s/native-java11-kubernetes.yml b/event-statistics/deploy/k8s/native-java11-kubernetes.yml index 5b66db28a..beb414301 100644 --- a/event-statistics/deploy/k8s/native-java11-kubernetes.yml +++ b/event-statistics/deploy/k8s/native-java11-kubernetes.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -169,8 +169,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -196,8 +196,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" diff --git a/event-statistics/deploy/k8s/native-java11-minikube.yml b/event-statistics/deploy/k8s/native-java11-minikube.yml index 88bf55a35..d7c5ab9f0 100644 --- a/event-statistics/deploy/k8s/native-java11-minikube.yml +++ b/event-statistics/deploy/k8s/native-java11-minikube.yml @@ -38,8 +38,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -170,8 +170,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -197,8 +197,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -218,10 +218,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: event-statistics-config-creds - configMapRef: name: event-statistics-config + - secretRef: + name: event-statistics-config-creds image: quay.io/quarkus-super-heroes/event-statistics:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/event-statistics/deploy/k8s/native-java11-openshift.yml b/event-statistics/deploy/k8s/native-java11-openshift.yml index f69548cf9..616dfb612 100644 --- a/event-statistics/deploy/k8s/native-java11-openshift.yml +++ b/event-statistics/deploy/k8s/native-java11-openshift.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -88,8 +88,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -235,8 +235,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -253,17 +253,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -273,9 +273,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/name: event-statistics app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: event-statistics + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -284,10 +284,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java11-latest imagePullPolicy: Always livenessProbe: @@ -320,15 +320,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - event-statistics - from: - kind: ImageStreamTag - name: event-statistics:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -358,8 +349,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:53 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/event-statistics/deploy/k8s/native-java17-knative.yml b/event-statistics/deploy/k8s/native-java17-knative.yml index c70c94983..f975820f8 100644 --- a/event-statistics/deploy/k8s/native-java17-knative.yml +++ b/event-statistics/deploy/k8s/native-java17-knative.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:28:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:47:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -49,9 +49,9 @@ metadata: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest name: event-statistics spec: template: @@ -60,8 +60,8 @@ spec: app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:28:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:47:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -71,17 +71,17 @@ spec: app.openshift.io/runtime: quarkus application: event-stats system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java17-latest livenessProbe: failureThreshold: 3 diff --git a/event-statistics/deploy/k8s/native-java17-kubernetes.yml b/event-statistics/deploy/k8s/native-java17-kubernetes.yml index 6c8ae8ff9..cd912fdac 100644 --- a/event-statistics/deploy/k8s/native-java17-kubernetes.yml +++ b/event-statistics/deploy/k8s/native-java17-kubernetes.yml @@ -38,8 +38,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -169,8 +169,8 @@ metadata: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -180,24 +180,24 @@ metadata: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest name: event-statistics spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: event-statistics - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-kafka,apicurio" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -207,8 +207,8 @@ spec: application: event-stats system: quarkus-super-heroes app.kubernetes.io/name: event-statistics - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: event-stats + app.kubernetes.io/version: native-java17-latest spec: containers: - env: diff --git a/event-statistics/deploy/k8s/native-java17-minikube.yml b/event-statistics/deploy/k8s/native-java17-minikube.yml index 788ece231..e4a03191f 100644 --- a/event-statistics/deploy/k8s/native-java17-minikube.yml +++ b/event-statistics/deploy/k8s/native-java17-minikube.yml @@ -38,8 +38,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -170,8 +170,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -197,8 +197,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -218,10 +218,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java17-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/event-statistics/deploy/k8s/native-java17-openshift.yml b/event-statistics/deploy/k8s/native-java17-openshift.yml index 42745582c..d7e61e65d 100644 --- a/event-statistics/deploy/k8s/native-java17-openshift.yml +++ b/event-statistics/deploy/k8s/native-java17-openshift.yml @@ -35,11 +35,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -85,11 +85,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats @@ -232,11 +232,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -253,17 +253,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: event-stats template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8085" @@ -273,9 +273,9 @@ spec: application: event-stats system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: event-stats - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: event-statistics + app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: event-stats spec: containers: - env: @@ -284,10 +284,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: event-statistics-config - secretRef: name: event-statistics-config-creds + - configMapRef: + name: event-statistics-config image: quay.io/quarkus-super-heroes/event-statistics:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -355,11 +355,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-kafka,apicurio" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:57 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:57 +0000 labels: app.kubernetes.io/name: event-statistics app.kubernetes.io/part-of: event-stats diff --git a/rest-fights/deploy/k8s/java11-knative-all-downstream.yml b/rest-fights/deploy/k8s/java11-knative-all-downstream.yml index cb4f67199..da0d8dafb 100644 --- a/rest-fights/deploy/k8s/java11-knative-all-downstream.yml +++ b/rest-fights/deploy/k8s/java11-knative-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:17 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,9 +44,9 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-villains app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: villains-service - app.kubernetes.io/name: rest-villains name: rest-villains spec: template: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:17 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,17 +66,17 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-villains app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: villains-service - app.kubernetes.io/name: rest-villains spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:java11-latest livenessProbe: failureThreshold: 3 @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:35 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -261,8 +261,8 @@ metadata: app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest name: rest-heroes spec: @@ -272,8 +272,8 @@ spec: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:35 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -283,8 +283,8 @@ spec: app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest spec: containerConcurrency: 0 @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:49 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -503,9 +503,9 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights name: rest-fights spec: template: @@ -514,8 +514,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:49 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -525,17 +525,17 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: rest-fights-config - secretRef: name: rest-fights-config-creds + - configMapRef: + name: rest-fights-config image: quay.io/quarkus-super-heroes/rest-fights:java11-latest livenessProbe: failureThreshold: 3 diff --git a/rest-fights/deploy/k8s/java11-knative.yml b/rest-fights/deploy/k8s/java11-knative.yml index 93424f0da..641621239 100644 --- a/rest-fights/deploy/k8s/java11-knative.yml +++ b/rest-fights/deploy/k8s/java11-knative.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:49 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -102,9 +102,9 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights name: rest-fights spec: template: @@ -113,8 +113,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:49 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -124,17 +124,17 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: rest-fights-config - secretRef: name: rest-fights-config-creds + - configMapRef: + name: rest-fights-config image: quay.io/quarkus-super-heroes/rest-fights:java11-latest livenessProbe: failureThreshold: 3 diff --git a/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml index 5ae06cfd0..8667ef010 100644 --- a/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml +++ b/rest-fights/deploy/k8s/java11-kubernetes-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -119,25 +119,25 @@ metadata: app: rest-villains application: villains-service system: quarkus-super-heroes - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -146,9 +146,9 @@ spec: app: rest-villains application: villains-service system: quarkus-super-heroes - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,16 +407,16 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes template: metadata: @@ -424,8 +424,8 @@ spec: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,8 +434,8 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes spec: containers: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -782,25 +782,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest name: rest-fights spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -809,9 +809,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:java11-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/java11-kubernetes.yml b/rest-fights/deploy/k8s/java11-kubernetes.yml index f50d0c3c1..887fe39dc 100644 --- a/rest-fights/deploy/k8s/java11-kubernetes.yml +++ b/rest-fights/deploy/k8s/java11-kubernetes.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -289,8 +289,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -299,25 +299,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest name: rest-fights spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:11 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:03 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -326,9 +326,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -337,10 +337,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:java11-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml b/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml index dcf73228f..2a0d16cbf 100644 --- a/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml +++ b/rest-fights/deploy/k8s/java11-minikube-all-downstream.yml @@ -30,15 +30,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -107,15 +107,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -134,15 +134,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java11-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -399,8 +399,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -426,8 +426,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -578,8 +578,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -777,8 +777,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -804,8 +804,8 @@ spec: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: diff --git a/rest-fights/deploy/k8s/java11-minikube.yml b/rest-fights/deploy/k8s/java11-minikube.yml index a73352ec0..addf2c56b 100644 --- a/rest-fights/deploy/k8s/java11-minikube.yml +++ b/rest-fights/deploy/k8s/java11-minikube.yml @@ -93,8 +93,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -319,8 +319,8 @@ spec: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:27 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: diff --git a/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml b/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml index c85979084..4a6d37161 100644 --- a/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml +++ b/rest-fights/deploy/k8s/java11-openshift-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java11-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -348,8 +339,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -381,8 +372,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -476,8 +467,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -494,17 +485,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: heroes-service template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -514,9 +505,9 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: heroes-service spec: containers: - env: @@ -561,15 +552,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -578,8 +560,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -688,8 +670,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -721,8 +703,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -908,8 +890,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +908,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,9 +928,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -993,15 +975,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1031,8 +1004,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/java11-openshift.yml b/rest-fights/deploy/k8s/java11-openshift.yml index 2bafafad8..db0595ed5 100644 --- a/rest-fights/deploy/k8s/java11-openshift.yml +++ b/rest-fights/deploy/k8s/java11-openshift.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -124,8 +124,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -311,8 +311,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -329,17 +329,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -349,9 +349,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java11-latest spec: containers: - env: @@ -396,15 +396,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -434,8 +425,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:42 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:34 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/java17-knative-all-downstream.yml b/rest-fights/deploy/k8s/java17-knative-all-downstream.yml index ea5d233b0..defb2750d 100644 --- a/rest-fights/deploy/k8s/java17-knative-all-downstream.yml +++ b/rest-fights/deploy/k8s/java17-knative-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,9 +44,9 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains - app.kubernetes.io/version: java17-latest name: rest-villains spec: template: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,9 +66,9 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains - app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:33 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:30 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -262,30 +262,30 @@ metadata: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java17-latest name: rest-heroes spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:33 +0000 + app.openshift.io/connects-to: heroes-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:30 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" prometheus.io/scheme: http - app.openshift.io/connects-to: heroes-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-heroes app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:54 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -503,9 +503,9 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java17-latest name: rest-fights spec: template: @@ -514,8 +514,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:54 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -525,9 +525,9 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: diff --git a/rest-fights/deploy/k8s/java17-knative.yml b/rest-fights/deploy/k8s/java17-knative.yml index e3bec8a51..ee1066b41 100644 --- a/rest-fights/deploy/k8s/java17-knative.yml +++ b/rest-fights/deploy/k8s/java17-knative.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:54 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -102,9 +102,9 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java17-latest name: rest-fights spec: template: @@ -113,8 +113,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:54 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -124,9 +124,9 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: diff --git a/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml index d2e3bc4ba..220b74ebf 100644 --- a/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml +++ b/rest-fights/deploy/k8s/java17-kubernetes-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -136,8 +136,8 @@ spec: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,25 +407,25 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,9 +434,9 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest spec: containers: - env: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -782,25 +782,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights name: rest-fights spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -809,9 +809,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:java17-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/java17-kubernetes.yml b/rest-fights/deploy/k8s/java17-kubernetes.yml index c7b1a12ec..4cf744f54 100644 --- a/rest-fights/deploy/k8s/java17-kubernetes.yml +++ b/rest-fights/deploy/k8s/java17-kubernetes.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -289,8 +289,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -299,25 +299,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights name: rest-fights spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:12 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -326,9 +326,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest - app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -337,10 +337,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:java17-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml b/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml index 2b07b03af..b048f468d 100644 --- a/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml +++ b/rest-fights/deploy/k8s/java17-minikube-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -110,8 +110,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -137,8 +137,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java17-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -289,15 +289,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -396,15 +396,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -423,15 +423,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -576,8 +576,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -775,8 +775,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -802,8 +802,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" diff --git a/rest-fights/deploy/k8s/java17-minikube.yml b/rest-fights/deploy/k8s/java17-minikube.yml index 1458d4ac8..93cb18a15 100644 --- a/rest-fights/deploy/k8s/java17-minikube.yml +++ b/rest-fights/deploy/k8s/java17-minikube.yml @@ -91,8 +91,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -290,8 +290,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -317,8 +317,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:26 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:23 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" diff --git a/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml b/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml index 59c9e390b..f759b5b48 100644 --- a/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml +++ b/rest-fights/deploy/k8s/java17-openshift-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:java17-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -345,11 +336,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -378,11 +369,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -473,11 +464,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -494,17 +485,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -514,9 +505,9 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes spec: containers: - env: @@ -525,10 +516,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-heroes-config - secretRef: name: rest-heroes-config-creds + - configMapRef: + name: rest-heroes-config image: quay.io/quarkus-super-heroes/rest-heroes:java17-latest imagePullPolicy: Always livenessProbe: @@ -575,11 +566,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -685,11 +676,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -718,11 +709,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -905,11 +896,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +917,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,8 +937,8 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights spec: containers: @@ -957,10 +948,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-fights-config - secretRef: name: rest-fights-config-creds + - configMapRef: + name: rest-fights-config image: quay.io/quarkus-super-heroes/rest-fights:java17-latest imagePullPolicy: Always livenessProbe: @@ -1028,11 +1019,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/java17-openshift.yml b/rest-fights/deploy/k8s/java17-openshift.yml index 707b8e285..d2b75ddc7 100644 --- a/rest-fights/deploy/k8s/java17-openshift.yml +++ b/rest-fights/deploy/k8s/java17-openshift.yml @@ -88,11 +88,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -121,11 +121,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -308,11 +308,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -329,17 +329,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -349,8 +349,8 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: fights-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: fights-service app.kubernetes.io/name: rest-fights spec: containers: @@ -360,10 +360,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-fights-config - secretRef: name: rest-fights-config-creds + - configMapRef: + name: rest-fights-config image: quay.io/quarkus-super-heroes/rest-fights:java17-latest imagePullPolicy: Always livenessProbe: @@ -431,11 +431,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:38 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml index cc99823d5..8db8950b0 100644 --- a/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java11-knative-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:15 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,8 +44,8 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/version: native-java11-latest app.kubernetes.io/name: rest-villains name: rest-villains spec: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:15 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,8 +66,8 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/version: native-java11-latest app.kubernetes.io/name: rest-villains spec: containerConcurrency: 0 @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:31 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -262,15 +262,15 @@ metadata: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: native-java11-latest name: rest-heroes spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:31 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -284,16 +284,16 @@ spec: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: native-java11-latest spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java11-latest livenessProbe: failureThreshold: 3 @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -503,8 +503,8 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest name: rest-fights spec: @@ -514,8 +514,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -525,17 +525,17 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java11-latest livenessProbe: failureThreshold: 3 diff --git a/rest-fights/deploy/k8s/native-java11-knative.yml b/rest-fights/deploy/k8s/native-java11-knative.yml index 2ef2d8271..a2e5844d6 100644 --- a/rest-fights/deploy/k8s/native-java11-knative.yml +++ b/rest-fights/deploy/k8s/native-java11-knative.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -102,8 +102,8 @@ metadata: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest name: rest-fights spec: @@ -113,8 +113,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:52 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -124,17 +124,17 @@ spec: app.openshift.io/runtime: quarkus application: fights-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java11-latest livenessProbe: failureThreshold: 3 diff --git a/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml index 4a33bc86d..cbe101d91 100644 --- a/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java11-kubernetes-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -120,24 +120,24 @@ metadata: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -147,8 +147,8 @@ spec: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -157,10 +157,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java11-latest imagePullPolicy: Always livenessProbe: @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,25 +407,25 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,9 +434,9 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service spec: containers: - env: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -782,25 +782,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights name: rest-fights spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -809,9 +809,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java11-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/native-java11-kubernetes.yml b/rest-fights/deploy/k8s/native-java11-kubernetes.yml index 70a0cf538..92e8cea5e 100644 --- a/rest-fights/deploy/k8s/native-java11-kubernetes.yml +++ b/rest-fights/deploy/k8s/native-java11-kubernetes.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -289,8 +289,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -299,25 +299,25 @@ metadata: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights name: rest-fights spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:10 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -326,9 +326,9 @@ spec: app: rest-fights application: fights-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service - app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -337,10 +337,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java11-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml index bf23ccd41..a15bcacb5 100644 --- a/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java11-minikube-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -110,8 +110,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -137,8 +137,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -399,8 +399,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -426,8 +426,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -447,10 +447,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: @@ -573,15 +573,15 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -772,15 +772,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -799,15 +799,15 @@ spec: template: metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/native-java11-minikube.yml b/rest-fights/deploy/k8s/native-java11-minikube.yml index c9571ab8a..8e8d504a9 100644 --- a/rest-fights/deploy/k8s/native-java11-minikube.yml +++ b/rest-fights/deploy/k8s/native-java11-minikube.yml @@ -88,15 +88,15 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -287,15 +287,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -314,15 +314,15 @@ spec: template: metadata: annotations: + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:23 +0000 - prometheus.io/scrape: "true" - prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:20 +0000 + prometheus.io/scrape: "true" + prometheus.io/path: /q/metrics labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml b/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml index b005bbe9d..647e30a67 100644 --- a/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java11-openshift-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -262,15 +262,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -345,11 +336,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -378,11 +369,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -473,11 +464,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -495,16 +486,16 @@ spec: replicas: 1 selector: app.kubernetes.io/part-of: heroes-service - app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: rest-heroes template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -515,8 +506,8 @@ spec: system: quarkus-super-heroes app.openshift.io/runtime: quarkus app.kubernetes.io/part-of: heroes-service - app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: rest-heroes spec: containers: - env: @@ -561,25 +552,16 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -688,8 +670,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -721,8 +703,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -908,8 +890,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +908,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,9 +928,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -993,15 +975,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1031,8 +1004,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/native-java11-openshift.yml b/rest-fights/deploy/k8s/native-java11-openshift.yml index f861b3330..f4d088f45 100644 --- a/rest-fights/deploy/k8s/native-java11-openshift.yml +++ b/rest-fights/deploy/k8s/native-java11-openshift.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -124,8 +124,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -311,8 +311,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -329,17 +329,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -349,9 +349,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-fights app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights spec: containers: - env: @@ -396,15 +396,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -434,8 +425,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:40 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:36 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml index 95419978b..93f5493f7 100644 --- a/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java17-knative-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:14 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -52,15 +52,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:14 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" prometheus.io/scheme: http + app.openshift.io/connects-to: villains-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-villains app.openshift.io/runtime: quarkus @@ -73,10 +73,10 @@ spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java17-latest livenessProbe: failureThreshold: 3 @@ -250,8 +250,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:35 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -269,15 +269,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: heroes-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:35 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" prometheus.io/scheme: http + app.openshift.io/connects-to: heroes-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-heroes app.openshift.io/runtime: quarkus @@ -492,8 +492,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -511,15 +511,15 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:55 +0000 + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-fights app.openshift.io/runtime: quarkus diff --git a/rest-fights/deploy/k8s/native-java17-knative.yml b/rest-fights/deploy/k8s/native-java17-knative.yml index 8c0086f68..d82bd644d 100644 --- a/rest-fights/deploy/k8s/native-java17-knative.yml +++ b/rest-fights/deploy/k8s/native-java17-knative.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:55 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -110,15 +110,15 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:55 +0000 + app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" prometheus.io/scheme: http - app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-fights app.openshift.io/runtime: quarkus diff --git a/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml index 7bfa10924..ba8560c31 100644 --- a/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java17-kubernetes-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -120,24 +120,24 @@ metadata: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -147,8 +147,8 @@ spec: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -291,8 +291,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -397,8 +397,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -407,16 +407,16 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service template: metadata: @@ -424,8 +424,8 @@ spec: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -434,8 +434,8 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service spec: containers: @@ -445,10 +445,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -574,8 +574,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -772,8 +772,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -799,8 +799,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -820,10 +820,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java17-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/native-java17-kubernetes.yml b/rest-fights/deploy/k8s/native-java17-kubernetes.yml index 59a31976b..3e0217426 100644 --- a/rest-fights/deploy/k8s/native-java17-kubernetes.yml +++ b/rest-fights/deploy/k8s/native-java17-kubernetes.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -289,8 +289,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -316,8 +316,8 @@ spec: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:09 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:08 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -337,10 +337,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java17-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml index b3a250cd2..5b2abefa5 100644 --- a/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java17-minikube-all-downstream.yml @@ -30,15 +30,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -107,15 +107,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -134,15 +134,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -399,8 +399,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -426,8 +426,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -578,8 +578,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -777,8 +777,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -804,8 +804,8 @@ spec: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -823,10 +823,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java17-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/rest-fights/deploy/k8s/native-java17-minikube.yml b/rest-fights/deploy/k8s/native-java17-minikube.yml index 18de30aa5..c32a0c4a7 100644 --- a/rest-fights/deploy/k8s/native-java17-minikube.yml +++ b/rest-fights/deploy/k8s/native-java17-minikube.yml @@ -93,8 +93,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -292,8 +292,8 @@ metadata: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -319,8 +319,8 @@ spec: app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes prometheus.io/port: "8082" prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:24 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:26 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics labels: @@ -338,10 +338,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-fights-config-creds - configMapRef: name: rest-fights-config + - secretRef: + name: rest-fights-config-creds image: quay.io/quarkus-super-heroes/rest-fights:native-java17-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml b/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml index 65eb9331b..fae46562f 100644 --- a/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml +++ b/rest-fights/deploy/k8s/native-java17-openshift-all-downstream.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -195,17 +195,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-villains app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/name: rest-villains template: metadata: annotations: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -215,9 +215,9 @@ spec: application: villains-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-villains app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/name: rest-villains spec: containers: - env: @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -345,11 +336,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -378,11 +369,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -473,11 +464,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -494,17 +485,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -514,8 +505,8 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes spec: containers: @@ -525,10 +516,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-heroes-config - secretRef: name: rest-heroes-config-creds + - configMapRef: + name: rest-heroes-config image: quay.io/quarkus-super-heroes/rest-heroes:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -561,25 +552,16 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -688,8 +670,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -721,8 +703,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -908,8 +890,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -926,17 +908,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: native-java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -946,9 +928,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: native-java17-latest spec: containers: - env: @@ -993,15 +975,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -1031,8 +1004,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-fights/deploy/k8s/native-java17-openshift.yml b/rest-fights/deploy/k8s/native-java17-openshift.yml index d9e633780..1d2d5a06c 100644 --- a/rest-fights/deploy/k8s/native-java17-openshift.yml +++ b/rest-fights/deploy/k8s/native-java17-openshift.yml @@ -91,8 +91,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -124,8 +124,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service @@ -311,8 +311,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -329,17 +329,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: native-java17-latest template: metadata: annotations: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8082" @@ -349,9 +349,9 @@ spec: application: fights-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service + app.kubernetes.io/name: rest-fights + app.kubernetes.io/version: native-java17-latest spec: containers: - env: @@ -396,15 +396,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-fights - from: - kind: ImageStreamTag - name: rest-fights:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -434,8 +425,8 @@ metadata: app.openshift.io/connects-to: "fights-db,fights-kafka,apicurio,rest-villains,rest-heroes" app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:39 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:39 +0000 labels: app.kubernetes.io/name: rest-fights app.kubernetes.io/part-of: fights-service diff --git a/rest-heroes/deploy/k8s/java11-knative.yml b/rest-heroes/deploy/k8s/java11-knative.yml index 8ef538cff..7cb9f583e 100644 --- a/rest-heroes/deploy/k8s/java11-knative.yml +++ b/rest-heroes/deploy/k8s/java11-knative.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:35 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -61,8 +61,8 @@ metadata: app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest name: rest-heroes spec: @@ -72,8 +72,8 @@ spec: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:35 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -83,8 +83,8 @@ spec: app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest spec: containerConcurrency: 0 diff --git a/rest-heroes/deploy/k8s/java11-kubernetes.yml b/rest-heroes/deploy/k8s/java11-kubernetes.yml index 36fb7f657..e23c627eb 100644 --- a/rest-heroes/deploy/k8s/java11-kubernetes.yml +++ b/rest-heroes/deploy/k8s/java11-kubernetes.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -156,8 +156,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -166,16 +166,16 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes template: metadata: @@ -183,8 +183,8 @@ spec: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:39 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -193,8 +193,8 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-heroes spec: containers: diff --git a/rest-heroes/deploy/k8s/java11-minikube.yml b/rest-heroes/deploy/k8s/java11-minikube.yml index 0c356dfbc..487979d8d 100644 --- a/rest-heroes/deploy/k8s/java11-minikube.yml +++ b/rest-heroes/deploy/k8s/java11-minikube.yml @@ -50,8 +50,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -157,8 +157,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -184,8 +184,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:10:05 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" diff --git a/rest-heroes/deploy/k8s/java11-openshift.yml b/rest-heroes/deploy/k8s/java11-openshift.yml index 3501f48f3..bbe3a6bd1 100644 --- a/rest-heroes/deploy/k8s/java11-openshift.yml +++ b/rest-heroes/deploy/k8s/java11-openshift.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -178,8 +178,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -196,17 +196,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: heroes-service template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -216,9 +216,9 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: heroes-service spec: containers: - env: @@ -263,15 +263,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -280,8 +271,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:22 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:30:14 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service diff --git a/rest-heroes/deploy/k8s/java17-knative.yml b/rest-heroes/deploy/k8s/java17-knative.yml index 1f700786c..ba56b29ea 100644 --- a/rest-heroes/deploy/k8s/java17-knative.yml +++ b/rest-heroes/deploy/k8s/java17-knative.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:33 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:30 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -62,30 +62,30 @@ metadata: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java17-latest name: rest-heroes spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:33 +0000 + app.openshift.io/connects-to: heroes-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:30 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" prometheus.io/scheme: http - app.openshift.io/connects-to: heroes-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-heroes app.openshift.io/runtime: quarkus application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: diff --git a/rest-heroes/deploy/k8s/java17-kubernetes.yml b/rest-heroes/deploy/k8s/java17-kubernetes.yml index 398ee95b0..d0b4a3c36 100644 --- a/rest-heroes/deploy/k8s/java17-kubernetes.yml +++ b/rest-heroes/deploy/k8s/java17-kubernetes.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -156,8 +156,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -166,25 +166,25 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:51 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:48 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -193,9 +193,9 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: java17-latest spec: containers: - env: diff --git a/rest-heroes/deploy/k8s/java17-minikube.yml b/rest-heroes/deploy/k8s/java17-minikube.yml index 7fe9b4e26..b9e98d223 100644 --- a/rest-heroes/deploy/k8s/java17-minikube.yml +++ b/rest-heroes/deploy/k8s/java17-minikube.yml @@ -47,15 +47,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -154,15 +154,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -181,15 +181,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8083" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:20:06 +0000 + app.openshift.io/connects-to: heroes-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:02 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8083" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service diff --git a/rest-heroes/deploy/k8s/java17-openshift.yml b/rest-heroes/deploy/k8s/java17-openshift.yml index 1499225a0..c259af713 100644 --- a/rest-heroes/deploy/k8s/java17-openshift.yml +++ b/rest-heroes/deploy/k8s/java17-openshift.yml @@ -47,11 +47,11 @@ apiVersion: v1 kind: Service metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -80,11 +80,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -175,11 +175,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -196,17 +196,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes template: metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -216,9 +216,9 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: java17-latest + app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/name: rest-heroes spec: containers: - env: @@ -227,10 +227,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-heroes-config - secretRef: name: rest-heroes-config-creds + - configMapRef: + name: rest-heroes-config image: quay.io/quarkus-super-heroes/rest-heroes:java17-latest imagePullPolicy: Always livenessProbe: @@ -277,11 +277,11 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:19 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:40:18 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service diff --git a/rest-heroes/deploy/k8s/native-java11-knative.yml b/rest-heroes/deploy/k8s/native-java11-knative.yml index 7530e4d39..c87efb2d5 100644 --- a/rest-heroes/deploy/k8s/native-java11-knative.yml +++ b/rest-heroes/deploy/k8s/native-java11-knative.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:31 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -62,15 +62,15 @@ metadata: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: native-java11-latest name: rest-heroes spec: template: metadata: annotations: - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:31 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -84,16 +84,16 @@ spec: application: heroes-service system: quarkus-super-heroes app.kubernetes.io/name: rest-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: heroes-service + app.kubernetes.io/version: native-java11-latest spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java11-latest livenessProbe: failureThreshold: 3 diff --git a/rest-heroes/deploy/k8s/native-java11-kubernetes.yml b/rest-heroes/deploy/k8s/native-java11-kubernetes.yml index 0ab481c9a..df281f95b 100644 --- a/rest-heroes/deploy/k8s/native-java11-kubernetes.yml +++ b/rest-heroes/deploy/k8s/native-java11-kubernetes.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -156,8 +156,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -166,25 +166,25 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service template: metadata: annotations: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:49 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:43 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -193,9 +193,9 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/part-of: heroes-service spec: containers: - env: diff --git a/rest-heroes/deploy/k8s/native-java11-minikube.yml b/rest-heroes/deploy/k8s/native-java11-minikube.yml index b972b345c..094a1c182 100644 --- a/rest-heroes/deploy/k8s/native-java11-minikube.yml +++ b/rest-heroes/deploy/k8s/native-java11-minikube.yml @@ -50,8 +50,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -157,8 +157,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -184,8 +184,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -205,10 +205,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/rest-heroes/deploy/k8s/native-java11-openshift.yml b/rest-heroes/deploy/k8s/native-java11-openshift.yml index 7fa6dcb9d..7dd35e36d 100644 --- a/rest-heroes/deploy/k8s/native-java11-openshift.yml +++ b/rest-heroes/deploy/k8s/native-java11-openshift.yml @@ -47,11 +47,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -80,11 +80,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -175,11 +175,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -197,16 +197,16 @@ spec: replicas: 1 selector: app.kubernetes.io/part-of: heroes-service - app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: rest-heroes template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -217,8 +217,8 @@ spec: system: quarkus-super-heroes app.openshift.io/runtime: quarkus app.kubernetes.io/part-of: heroes-service - app.kubernetes.io/name: rest-heroes app.kubernetes.io/version: native-java11-latest + app.kubernetes.io/name: rest-heroes spec: containers: - env: @@ -263,25 +263,16 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:16:18 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:35:15 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service diff --git a/rest-heroes/deploy/k8s/native-java17-knative.yml b/rest-heroes/deploy/k8s/native-java17-knative.yml index e3b109de3..ecd5df11e 100644 --- a/rest-heroes/deploy/k8s/native-java17-knative.yml +++ b/rest-heroes/deploy/k8s/native-java17-knative.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:35 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -69,15 +69,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: heroes-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:34 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:35 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" prometheus.io/scheme: http + app.openshift.io/connects-to: heroes-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-heroes app.openshift.io/runtime: quarkus diff --git a/rest-heroes/deploy/k8s/native-java17-kubernetes.yml b/rest-heroes/deploy/k8s/native-java17-kubernetes.yml index 00e4fdb50..5a968ef3b 100644 --- a/rest-heroes/deploy/k8s/native-java17-kubernetes.yml +++ b/rest-heroes/deploy/k8s/native-java17-kubernetes.yml @@ -50,8 +50,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -156,8 +156,8 @@ metadata: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -166,16 +166,16 @@ metadata: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service name: rest-heroes spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service template: metadata: @@ -183,8 +183,8 @@ spec: app.openshift.io/connects-to: heroes-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:47 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -193,8 +193,8 @@ spec: app: rest-heroes application: heroes-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java17-latest app.kubernetes.io/name: rest-heroes + app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: heroes-service spec: containers: @@ -204,10 +204,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-heroes-config-creds - configMapRef: name: rest-heroes-config + - secretRef: + name: rest-heroes-config-creds image: quay.io/quarkus-super-heroes/rest-heroes:native-java17-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-heroes/deploy/k8s/native-java17-minikube.yml b/rest-heroes/deploy/k8s/native-java17-minikube.yml index 4f0ca550b..f7cb407e4 100644 --- a/rest-heroes/deploy/k8s/native-java17-minikube.yml +++ b/rest-heroes/deploy/k8s/native-java17-minikube.yml @@ -50,8 +50,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -157,8 +157,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -184,8 +184,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:25:04 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:44:05 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" diff --git a/rest-heroes/deploy/k8s/native-java17-openshift.yml b/rest-heroes/deploy/k8s/native-java17-openshift.yml index 9cc2bfbc6..1f0fc861e 100644 --- a/rest-heroes/deploy/k8s/native-java17-openshift.yml +++ b/rest-heroes/deploy/k8s/native-java17-openshift.yml @@ -47,11 +47,11 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -80,11 +80,11 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service @@ -175,11 +175,11 @@ apiVersion: apps.openshift.io/v1 kind: DeploymentConfig metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -196,17 +196,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes template: metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8083" @@ -216,8 +216,8 @@ spec: application: heroes-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/part-of: heroes-service app.kubernetes.io/version: native-java17-latest + app.kubernetes.io/part-of: heroes-service app.kubernetes.io/name: rest-heroes spec: containers: @@ -227,10 +227,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-heroes-config - secretRef: name: rest-heroes-config-creds + - configMapRef: + name: rest-heroes-config image: quay.io/quarkus-super-heroes/rest-heroes:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -263,25 +263,16 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-heroes - from: - kind: ImageStreamTag - name: rest-heroes:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route metadata: annotations: - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: heroes-db app.openshift.io/vcs-ref: main - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:19 +0000 + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:19 +0000 labels: app.kubernetes.io/name: rest-heroes app.kubernetes.io/part-of: heroes-service diff --git a/rest-villains/deploy/k8s/java11-knative.yml b/rest-villains/deploy/k8s/java11-knative.yml index f4d0ecb35..295685427 100644 --- a/rest-villains/deploy/k8s/java11-knative.yml +++ b/rest-villains/deploy/k8s/java11-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:17 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,9 +44,9 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-villains app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: villains-service - app.kubernetes.io/name: rest-villains name: rest-villains spec: template: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:12:17 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:31:09 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,17 +66,17 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/name: rest-villains app.kubernetes.io/version: java11-latest app.kubernetes.io/part-of: villains-service - app.kubernetes.io/name: rest-villains spec: containerConcurrency: 0 containers: - envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:java11-latest livenessProbe: failureThreshold: 3 diff --git a/rest-villains/deploy/k8s/java11-kubernetes.yml b/rest-villains/deploy/k8s/java11-kubernetes.yml index 17b12191a..03f384a46 100644 --- a/rest-villains/deploy/k8s/java11-kubernetes.yml +++ b/rest-villains/deploy/k8s/java11-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -119,25 +119,25 @@ metadata: app: rest-villains application: villains-service system: quarkus-super-heroes - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:08:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:27:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -146,9 +146,9 @@ spec: app: rest-villains application: villains-service system: quarkus-super-heroes - app.kubernetes.io/part-of: villains-service - app.kubernetes.io/version: java11-latest app.kubernetes.io/name: rest-villains + app.kubernetes.io/version: java11-latest + app.kubernetes.io/part-of: villains-service spec: containers: - env: diff --git a/rest-villains/deploy/k8s/java11-minikube.yml b/rest-villains/deploy/k8s/java11-minikube.yml index 016523232..caa0c2b35 100644 --- a/rest-villains/deploy/k8s/java11-minikube.yml +++ b/rest-villains/deploy/k8s/java11-minikube.yml @@ -30,15 +30,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -107,15 +107,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -134,15 +134,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:09:46 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:28:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/rest-villains/deploy/k8s/java11-openshift.yml b/rest-villains/deploy/k8s/java11-openshift.yml index 4bf707f55..031b11f8a 100644 --- a/rest-villains/deploy/k8s/java11-openshift.yml +++ b/rest-villains/deploy/k8s/java11-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java11-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:11:03 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:29:55 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service diff --git a/rest-villains/deploy/k8s/java17-knative.yml b/rest-villains/deploy/k8s/java17-knative.yml index 5fc0be92b..a501dfbb7 100644 --- a/rest-villains/deploy/k8s/java17-knative.yml +++ b/rest-villains/deploy/k8s/java17-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,9 +44,9 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains - app.kubernetes.io/version: java17-latest name: rest-villains spec: template: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:22:13 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:41:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,9 +66,9 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes + app.kubernetes.io/version: java17-latest app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains - app.kubernetes.io/version: java17-latest spec: containerConcurrency: 0 containers: diff --git a/rest-villains/deploy/k8s/java17-kubernetes.yml b/rest-villains/deploy/k8s/java17-kubernetes.yml index 579d7c57f..28c4aeacb 100644 --- a/rest-villains/deploy/k8s/java17-kubernetes.yml +++ b/rest-villains/deploy/k8s/java17-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -136,8 +136,8 @@ spec: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:18:31 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:37:29 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" diff --git a/rest-villains/deploy/k8s/java17-minikube.yml b/rest-villains/deploy/k8s/java17-minikube.yml index 7b23e75fb..e7998d22e 100644 --- a/rest-villains/deploy/k8s/java17-minikube.yml +++ b/rest-villains/deploy/k8s/java17-minikube.yml @@ -33,8 +33,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -110,8 +110,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -137,8 +137,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:19:48 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:38:44 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:java17-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/rest-villains/deploy/k8s/java17-openshift.yml b/rest-villains/deploy/k8s/java17-openshift.yml index a042589ba..ffc160e94 100644 --- a/rest-villains/deploy/k8s/java17-openshift.yml +++ b/rest-villains/deploy/k8s/java17-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:java17-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 768Mi requests: memory: 256Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:21:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:39:59 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service diff --git a/rest-villains/deploy/k8s/native-java11-knative.yml b/rest-villains/deploy/k8s/native-java11-knative.yml index d845eeb05..8ec6e9197 100644 --- a/rest-villains/deploy/k8s/native-java11-knative.yml +++ b/rest-villains/deploy/k8s/native-java11-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:15 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -44,8 +44,8 @@ metadata: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/version: native-java11-latest app.kubernetes.io/name: rest-villains name: rest-villains spec: @@ -55,8 +55,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:17:15 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:36:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -66,8 +66,8 @@ spec: app.openshift.io/runtime: quarkus application: villains-service system: quarkus-super-heroes - app.kubernetes.io/version: native-java11-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/version: native-java11-latest app.kubernetes.io/name: rest-villains spec: containerConcurrency: 0 diff --git a/rest-villains/deploy/k8s/native-java11-kubernetes.yml b/rest-villains/deploy/k8s/native-java11-kubernetes.yml index 9182ea34c..68e6b9016 100644 --- a/rest-villains/deploy/k8s/native-java11-kubernetes.yml +++ b/rest-villains/deploy/k8s/native-java11-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -120,24 +120,24 @@ metadata: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:13:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:32:24 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -147,8 +147,8 @@ spec: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java11-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service spec: containers: - env: @@ -157,10 +157,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java11-latest imagePullPolicy: Always livenessProbe: diff --git a/rest-villains/deploy/k8s/native-java11-minikube.yml b/rest-villains/deploy/k8s/native-java11-minikube.yml index d1b199d1b..9fea49800 100644 --- a/rest-villains/deploy/k8s/native-java11-minikube.yml +++ b/rest-villains/deploy/k8s/native-java11-minikube.yml @@ -33,8 +33,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -110,8 +110,8 @@ metadata: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -137,8 +137,8 @@ spec: app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes app.openshift.io/connects-to: villains-db - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:14:45 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:33:40 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -158,10 +158,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - configMapRef: - name: rest-villains-config - secretRef: name: rest-villains-config-creds + - configMapRef: + name: rest-villains-config image: quay.io/quarkus-super-heroes/rest-villains:native-java11-latest imagePullPolicy: IfNotPresent livenessProbe: diff --git a/rest-villains/deploy/k8s/native-java11-openshift.yml b/rest-villains/deploy/k8s/native-java11-openshift.yml index fffa06244..a23c3d937 100644 --- a/rest-villains/deploy/k8s/native-java11-openshift.yml +++ b/rest-villains/deploy/k8s/native-java11-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -204,8 +204,8 @@ spec: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -262,15 +262,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:native-java11-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:15:58 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:34:56 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service diff --git a/rest-villains/deploy/k8s/native-java17-knative.yml b/rest-villains/deploy/k8s/native-java17-knative.yml index 2659908f1..08156a631 100644 --- a/rest-villains/deploy/k8s/native-java17-knative.yml +++ b/rest-villains/deploy/k8s/native-java17-knative.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:14 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -52,15 +52,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db - app.openshift.io/vcs-ref: main - app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:27:14 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:46:15 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" prometheus.io/scheme: http + app.openshift.io/connects-to: villains-db + app.openshift.io/vcs-ref: main + app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes labels: app: rest-villains app.openshift.io/runtime: quarkus @@ -73,10 +73,10 @@ spec: containerConcurrency: 0 containers: - envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java17-latest livenessProbe: failureThreshold: 3 diff --git a/rest-villains/deploy/k8s/native-java17-kubernetes.yml b/rest-villains/deploy/k8s/native-java17-kubernetes.yml index 8fccf756c..5451b02dc 100644 --- a/rest-villains/deploy/k8s/native-java17-kubernetes.yml +++ b/rest-villains/deploy/k8s/native-java17-kubernetes.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -109,8 +109,8 @@ metadata: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -120,24 +120,24 @@ metadata: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service name: rest-villains spec: replicas: 1 selector: matchLabels: app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service template: metadata: annotations: app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:23:30 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:42:28 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -147,8 +147,8 @@ spec: application: villains-service system: quarkus-super-heroes app.kubernetes.io/version: native-java17-latest - app.kubernetes.io/part-of: villains-service app.kubernetes.io/name: rest-villains + app.kubernetes.io/part-of: villains-service spec: containers: - env: diff --git a/rest-villains/deploy/k8s/native-java17-minikube.yml b/rest-villains/deploy/k8s/native-java17-minikube.yml index 9d3f72a5a..f2eae325b 100644 --- a/rest-villains/deploy/k8s/native-java17-minikube.yml +++ b/rest-villains/deploy/k8s/native-java17-minikube.yml @@ -30,15 +30,15 @@ apiVersion: v1 kind: Service metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -107,15 +107,15 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -134,15 +134,15 @@ spec: template: metadata: annotations: - app.openshift.io/connects-to: villains-db app.quarkus.io/vcs-ref: main app.quarkus.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - prometheus.io/port: "8084" - prometheus.io/scheme: http - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:24:45 +0000 + app.openshift.io/connects-to: villains-db + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:43:46 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics + prometheus.io/port: "8084" + prometheus.io/scheme: http labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service diff --git a/rest-villains/deploy/k8s/native-java17-openshift.yml b/rest-villains/deploy/k8s/native-java17-openshift.yml index d550d159d..8cd5e46c4 100644 --- a/rest-villains/deploy/k8s/native-java17-openshift.yml +++ b/rest-villains/deploy/k8s/native-java17-openshift.yml @@ -33,8 +33,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -83,8 +83,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service @@ -177,8 +177,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -195,17 +195,17 @@ metadata: spec: replicas: 1 selector: - app.kubernetes.io/name: rest-villains app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/name: rest-villains template: metadata: annotations: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8084" @@ -215,9 +215,9 @@ spec: application: villains-service system: quarkus-super-heroes app.openshift.io/runtime: quarkus - app.kubernetes.io/name: rest-villains app.kubernetes.io/version: native-java17-latest app.kubernetes.io/part-of: villains-service + app.kubernetes.io/name: rest-villains spec: containers: - env: @@ -226,10 +226,10 @@ spec: fieldRef: fieldPath: metadata.namespace envFrom: - - secretRef: - name: rest-villains-config-creds - configMapRef: name: rest-villains-config + - secretRef: + name: rest-villains-config-creds image: quay.io/quarkus-super-heroes/rest-villains:native-java17-latest imagePullPolicy: Always livenessProbe: @@ -262,15 +262,6 @@ spec: memory: 128Mi requests: memory: 32Mi - triggers: - - imageChangeParams: - automatic: true - containerNames: - - rest-villains - from: - kind: ImageStreamTag - name: rest-villains:native-java17-latest - type: ImageChange --- apiVersion: route.openshift.io/v1 kind: Route @@ -279,8 +270,8 @@ metadata: app.openshift.io/connects-to: villains-db app.openshift.io/vcs-ref: main app.openshift.io/vcs-url: https://github.com/quarkusio/quarkus-super-heroes - app.quarkus.io/commit-id: ffd034241f48a08d2eba982358a95fbfaa65042a - app.quarkus.io/build-timestamp: 2022-05-10 - 13:26:00 +0000 + app.quarkus.io/commit-id: 831b919315386eac796f8d7226161d9d1f43f4f1 + app.quarkus.io/build-timestamp: 2022-05-11 - 17:45:00 +0000 labels: app.kubernetes.io/name: rest-villains app.kubernetes.io/part-of: villains-service From 11f5cf277938193b284dedcfd1f22bcdd526d4b8 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Fri, 6 May 2022 12:41:32 -0400 Subject: [PATCH 8/9] Add SmallRye Stork service discovery Fixes #40 --- .github/workflows/simple-build-test.yml | 1 - rest-fights/README.md | 28 ++++- rest-fights/pom.xml | 40 +++++++ .../src/main/docker-compose/java11.yml | 4 +- .../src/main/docker-compose/java17.yml | 4 +- .../src/main/docker-compose/native-java11.yml | 4 +- .../src/main/docker-compose/native-java17.yml | 4 +- .../fight/client/VillainClient.java | 110 +++++++++++++++--- .../superheroes/fight/rest/FightResource.java | 2 +- rest-fights/src/main/kubernetes/knative.yml | 20 +++- .../src/main/kubernetes/kubernetes.yml | 20 +++- rest-fights/src/main/kubernetes/minikube.yml | 20 +++- rest-fights/src/main/kubernetes/openshift.yml | 20 +++- .../src/main/resources/application.properties | 14 ++- .../HeroesVillainsWiremockServerResource.java | 13 ++- .../fight/client/HeroClientTests.java | 25 +++- .../fight/client/VillainClientTests.java | 25 +++- 17 files changed, 306 insertions(+), 48 deletions(-) diff --git a/.github/workflows/simple-build-test.yml b/.github/workflows/simple-build-test.yml index 368e03c85..2a2d2952b 100644 --- a/.github/workflows/simple-build-test.yml +++ b/.github/workflows/simple-build-test.yml @@ -12,7 +12,6 @@ on: - '**/images/**' - '.github/dependabot.yml' - 'scripts/deploy-to-azure-containerapps.sh' - - '.github/workflows/test-multiarch-images.yml' branches: - main pull_request: diff --git a/rest-fights/README.md b/rest-fights/README.md index 7926033ad..574d3e54a 100644 --- a/rest-fights/README.md +++ b/rest-fights/README.md @@ -10,6 +10,9 @@ - [Retries](#retries) - [Hero Client](#hero-client) - [Villain Client](#villain-client) +- [Service Discovery and Load Balancing](#service-discovery-and-client-load-balancing) + - [Service Discovery](#service-discovery) + - [Client-side Load Balancing](#client-side-load-balancing) - [Testing](#testing) - [Running the Application](#running-the-application) - [Running Locally via Docker Compose](#running-locally-via-docker-compose) @@ -66,6 +69,27 @@ The [`VillainClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/V - The downstream [Villain service](../rest-villains) returns a `404` if no random [`Villain`](src/main/java/io/quarkus/sample/superheroes/fight/client/Villain.java) is found. `VillainClient` handles this case and simulates the service returning nothing. - In the event the downstream [Villain service](../rest-heroes) returns an error, `VillainClient` adds 3 retries with a 200ms delay between each retry. +## Service Discovery and Client Load Balancing +The fight service implements service discovery and client-side load balancing when making downstream calls to the [`rest-heroes`](../rest-heroes) and [`rest-villains`](../rest-villains) services. The service discovery is implemented in Quarkus using [SmallRye Stork](https://quarkus.io/blog/smallrye-stork-intro). + +Stork [integrates directly with the Quarkus REST Client Reactive](http://smallrye.io/smallrye-stork/1.1.0/quarkus). This means that there is no additional code needed in the [`HeroRestClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/HeroRestClient.java) in order to take advantage of Stork's service discovery and client-side load balancing. + +> You could disable Stork completely for the `HeroRestClient` by setting `quarkus.rest-client.hero-client.url` to any non-Stork URL (i.e. something that doesn't start with `stork://`). + +The [`VillainClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java), on the other hand, is implemented by directly using the [JAX-RS client API](https://docs.oracle.com/javaee/7/tutorial/jaxrs-client001.htm) with the [RESTEasy Reactive client](https://quarkus.io/guides/resteasy-reactive#resteasy-reactive-client). Therefore, the [Stork API](http://smallrye.io/smallrye-stork/1.1.0/concepts) is used directly in order to get the same functionality available in the [`HeroRestClient`](src/main/java/io/quarkus/sample/superheroes/fight/client/HeroRestClient.java). + +> Similarly. you could disable Stork completely for the `VillainClient` by setting `fight.villain.client-base-url` to any non-Stork URL (i.e. something that doesn't start with `stork://`). + +### Service Discovery +In local development mode, as well as when running via Docker Compose, SmallRye Stork is configured using [static list discovery](https://github.com/smallrye/smallrye-stork/blob/main/docs/service-discovery/static-list.md). In this mode, the downstream URLs are statically defined in an address list. In [`application.properties`](src/main/resources/application.properties), see the `quarkus.stork.hero-service.service-discovery.address-list` and `quarkus.stork.villain-service.service-discovery.address-list` properties. + +When [running in Kubernetes](https://quarkus.io/blog/stork-kubernetes-discovery), Stork is configured to use the [Kubernetes Service Discovery](http://smallrye.io/smallrye-stork/1.1.0/kubernetes). In this mode, Stork will read the Kubernetes `Service`s for the [`rest-heroes`](../rest-heroes) and [`rest-villains`](../rest-villains) services to obtain the instance information. Additionally, the instance information has been configured to refresh every minute. See the `rest-fights-config` ConfigMap in [the Kubernetes deployment descriptors](deploy/k8s). Look for the `quarkus.stork.*` properties within the various `ConfigMap`s. + +All of the other Stork service discovery mechanisms ([Consul](http://smallrye.io/smallrye-stork/1.1.0/consul) and [Eureka](http://smallrye.io/smallrye-stork/1.1.0/eureka)) can be used simply by updating the configuration appropriately according to the Stork documentation. + +### Client-Side Load Balancing +In all cases, the default load balancing algorithm used is [round robin](http://smallrye.io/smallrye-stork/1.1.0/round-robin). All of the other load balancing algorithms ([random](http://smallrye.io/smallrye-stork/1.1.0/random), [least requests](http://smallrye.io/smallrye-stork/1.1.0/least-requests), [least response time](http://smallrye.io/smallrye-stork/1.1.0/response-time), and [power of two choices](http://smallrye.io/smallrye-stork/1.1.0/power-of-two-choices)) are available on the application's classpath, so feel free to play around with them by updating the configuration appropriately according to the Stork documentation. + ## Testing This application has a full suite of tests, including an [integration test suite](src/test/java/io/quarkus/sample/superheroes/fight/rest/FightResourceIT.java). - The test suite uses [Wiremock](http://wiremock.org/) for [mocking http calls](https://quarkus.io/guides/rest-client-reactive#using-a-mock-http-server-for-tests) (see [`HeroesVillainsWiremockServerResource`](src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java)) to the downstream [Hero](../rest-heroes) and [Villain](../rest-villains) services. @@ -92,8 +116,8 @@ By default, the application is configured with the following: | Database password | `QUARKUS_MONGODB_CREDENTIALS_PASSWORD` | `quarkus.mongodb.credentials.password` | `superfight` | | Kafka Bootstrap servers | `KAFKA_BOOTSTRAP_SERVERS` | `kafka.bootstrap.servers` | `PLAINTEXT://localhost:9092` | | Apicurio Schema Registry | `MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL` | `mp.messaging.connector.smallrye-kafka.apicurio.registry.url` | `http://localhost:8086/apis/registry/v2` | -| Heroes Service URL | `quarkus.rest-client.hero-client.url` | `quarkus.rest-client.hero-client.url` | `http://localhost:8083` | -| Villains Service URL | `fight.villain.client-base-url` | `fight.villain.client-base-url` | `http://localhost:8084` | +| Heroes Service URL | `QUARKUS_REST_CLIENT_HERO_CLIENT_URL` | `quarkus.rest-client.hero-client.url` | `stork://hero-service` | +| Villains Service URL | `FIGHT_VILLAIN_CLIENT_BASE_URL` | `fight.villain.client-base-url` | `stork://villain-service` | ## Running Locally via Docker Compose Pre-built images for this application can be found at [`quay.io/quarkus-super-heroes/rest-fights`](https://quay.io/repository/quarkus-super-heroes/rest-fights?tab=tags). diff --git a/rest-fights/pom.xml b/rest-fights/pom.xml index 2e95f4f14..e5f788b2c 100644 --- a/rest-fights/pom.xml +++ b/rest-fights/pom.xml @@ -132,6 +132,46 @@ io.quarkus quarkus-liquibase-mongodb + + io.smallrye.stork + stork-service-discovery-static-list + + + io.smallrye.stork + stork-service-discovery-kubernetes + + + io.smallrye.stork + stork-service-discovery-eureka + + + io.smallrye.stork + stork-service-discovery-consul + + + io.smallrye.stork + stork-load-balancer-random + + + io.smallrye.stork + stork-load-balancer-least-requests + + + io.smallrye.stork + stork-load-balancer-least-response-time + + + io.smallrye.stork + stork-load-balancer-power-of-two-choices + + + org.bouncycastle + bcprov-jdk15on + + + org.bouncycastle + bcpkix-jdk15on + io.quarkus quarkus-junit5 diff --git a/rest-fights/src/main/docker-compose/java11.yml b/rest-fights/src/main/docker-compose/java11.yml index f58332d4b..2d89cf5fb 100644 --- a/rest-fights/src/main/docker-compose/java11.yml +++ b/rest-fights/src/main/docker-compose/java11.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/docker-compose/java17.yml b/rest-fights/src/main/docker-compose/java17.yml index 423415df6..0daa87937 100644 --- a/rest-fights/src/main/docker-compose/java17.yml +++ b/rest-fights/src/main/docker-compose/java17.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/docker-compose/native-java11.yml b/rest-fights/src/main/docker-compose/native-java11.yml index 179666a8a..6ca1c7d8a 100644 --- a/rest-fights/src/main/docker-compose/native-java11.yml +++ b/rest-fights/src/main/docker-compose/native-java11.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/docker-compose/native-java17.yml b/rest-fights/src/main/docker-compose/native-java17.yml index f12cc5491..c4d8e80ba 100644 --- a/rest-fights/src/main/docker-compose/native-java17.yml +++ b/rest-fights/src/main/docker-compose/native-java17.yml @@ -16,8 +16,8 @@ QUARKUS_LIQUIBASE_MONGODB_MIGRATE_AT_START: false QUARKUS_MONGODB_CREDENTIALS_USERNAME: superfight QUARKUS_MONGODB_CREDENTIALS_PASSWORD: superfight - QUARKUS_REST_CLIENT_HERO_CLIENT_URL: http://rest-heroes:8083 - FIGHT_VILLAIN_CLIENT_BASE_URL: http://rest-villains:8084 + QUARKUS_STORK_HERO_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-heroes:8083 + QUARKUS_STORK_VILLAIN_SERVICE_SERVICE_DISCOVERY_ADDRESS_LIST: rest-villains:8084 MP_MESSAGING_CONNECTOR_SMALLRYE_KAFKA_APICURIO_REGISTRY_URL: http://apicurio:8086/apis/registry/v2 restart: on-failure networks: diff --git a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java index 61140f8b2..edbfdf66c 100644 --- a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java +++ b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/client/VillainClient.java @@ -5,6 +5,7 @@ import java.util.concurrent.CompletionStage; import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.MediaType; @@ -12,10 +13,13 @@ import org.eclipse.microprofile.faulttolerance.CircuitBreaker; import org.jboss.resteasy.reactive.client.impl.UniInvoker; +import io.quarkus.logging.Log; import io.quarkus.sample.superheroes.fight.config.FightConfig; import io.smallrye.faulttolerance.api.CircuitBreakerName; import io.smallrye.mutiny.Uni; +import io.smallrye.stork.Stork; +import io.smallrye.stork.api.ServiceInstance; /** * Bean to be used for interacting with the Villain service. @@ -25,12 +29,20 @@ */ @ApplicationScoped public class VillainClient { - private final WebTarget villainClient; + private static final String STORK_PREFIX = "stork://"; + private static final String VILLAINS_API_PATH = "/api/villains"; + + private final WebTargetProvider webTargetProvider; public VillainClient(FightConfig fightConfig) { - this.villainClient = ClientBuilder.newClient() - .target(fightConfig.villain().clientBaseUrl()) - .path("api/villains/"); + var villainClientBaseUrl = fightConfig.villain().clientBaseUrl(); + + if (villainClientBaseUrl.startsWith(STORK_PREFIX)) { + this.webTargetProvider = new StorkWebTargetProvider(villainClientBaseUrl.replace(STORK_PREFIX, "")); + } + else { + this.webTargetProvider = new DefaultWebTargetProvider(villainClientBaseUrl); + } } /** @@ -39,16 +51,18 @@ public VillainClient(FightConfig fightConfig) { */ @CircuitBreaker(requestVolumeThreshold = 8, failureRatio = 0.5, delay = 2, delayUnit = ChronoUnit.SECONDS) @CircuitBreakerName("findRandomVillain") - CompletionStage getRandomVillain() { - // Want the 404 handling to be part of the circuit breaker - // This means that the 404 responses aren't considered errors by the circuit breaker - return this.villainClient.path("random") - .request(MediaType.APPLICATION_JSON_TYPE) - .rx(UniInvoker.class) - .get(Villain.class) - .onFailure(Is404Exception.IS_404).recoverWithNull() - .subscribeAsCompletionStage(); - } + CompletionStage getRandomVillain() { + // Want the 404 handling to be part of the circuit breaker + // This means that the 404 responses aren't considered errors by the circuit breaker + return this.webTargetProvider.getWebTarget("/random") + .flatMap(webTarget -> + webTarget.request(MediaType.APPLICATION_JSON_TYPE) + .rx(UniInvoker.class) + .get(Villain.class) + .onFailure(Is404Exception.IS_404).recoverWithNull() + ) + .subscribeAsCompletionStage(); + } /** * Finds a random {@link Villain}. The retry logic is applied to the result of the {@link CircuitBreaker}, meaning that retries that return failures could trigger the breaker to open. @@ -66,9 +80,69 @@ public Uni findRandomVillain() { * @return A "hello" from Villains */ public Uni helloVillains() { - return this.villainClient.path("hello") - .request(MediaType.TEXT_PLAIN_TYPE) - .rx(UniInvoker.class) - .get(String.class); + return this.webTargetProvider.getWebTarget("/hello") + .flatMap(webTarget -> + webTarget.request(MediaType.TEXT_PLAIN_TYPE) + .rx(UniInvoker.class) + .get(String.class) + ); + } + + private static abstract class WebTargetProvider { + protected abstract Uni getWebTarget(String path); + } + + private static class DefaultWebTargetProvider extends WebTargetProvider { + private final WebTarget webTarget; + + private DefaultWebTargetProvider(String baseUrl) { + Log.debugf("Creating Default provider for baseUrl = %s", baseUrl); + this.webTarget = ClientBuilder.newClient() + .target(baseUrl) + .path(VILLAINS_API_PATH); + } + + @Override + protected Uni getWebTarget(String path) { + return Uni.createFrom().item(this.webTarget.path(path)); + } + } + + private static class StorkWebTargetProvider extends WebTargetProvider { + private final Client villainClient = ClientBuilder.newClient(); + private final String storkServiceName; + + private StorkWebTargetProvider(String storkServiceName) { + Log.debugf("Creating Stork provider for service name = %s", storkServiceName); + this.storkServiceName = storkServiceName; + } + + private Uni getServiceInstance() { + return Stork.getInstance() + .getService(this.storkServiceName) + .selectInstanceAndRecordStart(true); + } + + private WebTarget createWebTarget(ServiceInstance serviceInstance, String path) { + var url = String.format( + "%s://%s:%d", + serviceInstance.isSecure() ? "https" : "http", + serviceInstance.getHost(), + serviceInstance.getPort() + ); + + Log.debugf("Targeting Stork client for service with URL = %s", url); + + return this.villainClient.target(url) + .path(VILLAINS_API_PATH) + .path(path); + } + + @Override + protected Uni getWebTarget(String path) { + return getServiceInstance() + .onItem().ifNotNull().transform(serviceInstance -> createWebTarget(serviceInstance, path)) + .onItem().ifNull().failWith(() -> new IllegalArgumentException(String.format("Can't determine a downstream service for service name '%s'. Is one configured?", this.storkServiceName))); + } } } diff --git a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java index 0227a2be4..7c5d90b54 100644 --- a/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java +++ b/rest-fights/src/main/java/io/quarkus/sample/superheroes/fight/rest/FightResource.java @@ -88,7 +88,7 @@ public Uni getFight(@Parameter(name = "id", required = true) @PathPara return Response.ok(f).build(); }) .onItem().ifNull().continueWith(() -> { - Log.debugf("No fight found with id %d", id); + Log.debugf("No fight found with id %s", id); return Response.status(Status.NOT_FOUND).build(); }); } diff --git a/rest-fights/src/main/kubernetes/knative.yml b/rest-fights/src/main/kubernetes/knative.yml index e9cba8cd4..f8589a70a 100644 --- a/rest-fights/src/main/kubernetes/knative.yml +++ b/rest-fights/src/main/kubernetes/knative.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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 e9cba8cd4..f8589a70a 100644 --- a/rest-fights/src/main/kubernetes/kubernetes.yml +++ b/rest-fights/src/main/kubernetes/kubernetes.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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 e9cba8cd4..f8589a70a 100644 --- a/rest-fights/src/main/kubernetes/minikube.yml +++ b/rest-fights/src/main/kubernetes/minikube.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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 5bea81a5b..dc738344b 100644 --- a/rest-fights/src/main/kubernetes/openshift.yml +++ b/rest-fights/src/main/kubernetes/openshift.yml @@ -1,4 +1,16 @@ --- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: default_view +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: view +subjects: + - kind: ServiceAccount + name: default +--- apiVersion: v1 kind: ConfigMap metadata: @@ -10,8 +22,12 @@ metadata: data: quarkus.liquibase-mongodb.migrate-at-start: false quarkus.mongodb.hosts: fights-db:27017 - quarkus.rest-client.hero-client.url: http://rest-heroes - fight.villain.client-base-url: http://rest-villains + 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: 1M + 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: 1M 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/resources/application.properties b/rest-fights/src/main/resources/application.properties index 1e7fb47d3..f86d40b4f 100644 --- a/rest-fights/src/main/resources/application.properties +++ b/rest-fights/src/main/resources/application.properties @@ -16,14 +16,20 @@ quarkus.liquibase-mongodb.migrate-at-start=true quarkus.http.cors=true ## Rest client -quarkus.rest-client.hero-client.url=http://localhost:8083 +quarkus.rest-client.hero-client.url=stork://hero-service + +## Stork +quarkus.stork.hero-service.service-discovery.type=static +quarkus.stork.hero-service.service-discovery.address-list=localhost:8083 +quarkus.stork.villain-service.service-discovery.type=static +quarkus.stork.villain-service.service-discovery.address-list=localhost:8084 ## Fight configuration fight.hero.fallback.name=Fallback hero fight.hero.fallback.picture=https://dummyimage.com/280x380/1e8fff/ffffff&text=Fallback+Hero fight.hero.fallback.powers=Fallback hero powers fight.hero.fallback.level=1 -fight.villain.client-base-url=http://localhost:8084 +fight.villain.client-base-url=stork://villain-service fight.villain.fallback.name=Fallback villain fight.villain.fallback.picture=https://dummyimage.com/280x380/b22222/ffffff&text=Fallback+Villain fight.villain.fallback.powers=Fallback villain powers @@ -37,6 +43,10 @@ mp.messaging.outgoing.fights.apicurio.registry.auto-register=true %test.mp.messaging.outgoing.fights.merge=true ## Logging configuration +%dev.quarkus.log.category."io.quarkus.sample.superheroes.fight".level=DEBUG +%test.quarkus.log.category."io.quarkus.sample.superheroes.fight".level=DEBUG +%dev.quarkus.log.console.level=DEBUG +%test.quarkus.log.console.level=DEBUG quarkus.log.level=INFO quarkus.log.console.enable=true quarkus.log.console.format=%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java index 5655bd286..229fac4a0 100644 --- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java +++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/HeroesVillainsWiremockServerResource.java @@ -20,10 +20,15 @@ public class HeroesVillainsWiremockServerResource implements QuarkusTestResource public Map start() { this.wireMockServer.start(); - return Map.of( - "quarkus.rest-client.hero-client.url", this.wireMockServer.baseUrl(), - "fight.villain.client-base-url", this.wireMockServer.baseUrl() - ); + var url = String.format( + "localhost:%d", + this.wireMockServer.isHttpsEnabled() ? this.wireMockServer.httpsPort() : this.wireMockServer.port() + ); + + return Map.of( + "quarkus.stork.hero-service.service-discovery.address-list", url, + "quarkus.stork.villain-service.service-discovery.address-list", url + ); } @Override diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java index c89d8fc9b..a9e9c4da3 100644 --- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java +++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/HeroClientTests.java @@ -2,7 +2,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*; import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static javax.ws.rs.core.MediaType.*; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -35,7 +35,9 @@ @QuarkusTest @QuarkusTestResource(HeroesVillainsWiremockServerResource.class) class HeroClientTests { - private static final String HERO_URI = "/api/heroes/random"; + private static final String HERO_API_BASE_URI = "/api/heroes"; + private static final String HERO_URI = HERO_API_BASE_URI + "/random"; + private static final String HERO_HELLO_URI = HERO_API_BASE_URI + "/hello"; private static final String DEFAULT_HERO_NAME = "Super Baguette"; private static final String DEFAULT_HERO_PICTURE = "super_baguette.png"; private static final String DEFAULT_HERO_POWERS = "eats baguette really quickly"; @@ -182,6 +184,25 @@ public void doesntRecoverFrom500() { ); } + @Test + public void helloHeroes() { + this.wireMockServer.stubFor( + get(urlEqualTo(HERO_HELLO_URI)) + .willReturn(okForContentType(TEXT_PLAIN, "Hello heroes!")) + ); + + this.heroClient.helloHeroes() + .subscribe().withSubscriber(UniAssertSubscriber.create()) + .assertSubscribed() + .awaitItem(Duration.ofSeconds(5)) + .assertItem("Hello heroes!"); + + this.wireMockServer.verify(1, + getRequestedFor(urlEqualTo(HERO_HELLO_URI)) + .withHeader(ACCEPT, containing(TEXT_PLAIN)) + ); + } + private String getDefaultHeroJson() { try { return this.objectMapper.writeValueAsString(DEFAULT_HERO); diff --git a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java index f63c4eb6e..4b9007516 100644 --- a/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java +++ b/rest-fights/src/test/java/io/quarkus/sample/superheroes/fight/client/VillainClientTests.java @@ -2,7 +2,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.*; import static javax.ws.rs.core.HttpHeaders.ACCEPT; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static javax.ws.rs.core.MediaType.*; import static org.assertj.core.api.Assertions.assertThat; import java.time.Duration; @@ -35,7 +35,9 @@ @QuarkusTest @QuarkusTestResource(HeroesVillainsWiremockServerResource.class) class VillainClientTests { - private static final String VILLAIN_API = "/api/villains/random"; + private static final String VILLAIN_API_BASE_URI = "/api/villains"; + private static final String VILLAIN_API = VILLAIN_API_BASE_URI + "/random"; + private static final String VILLAIN_HELLO_URI = VILLAIN_API_BASE_URI + "/hello"; private static final String DEFAULT_VILLAIN_NAME = "Super Chocolatine"; private static final String DEFAULT_VILLAIN_PICTURE = "super_chocolatine.png"; private static final String DEFAULT_VILLAIN_POWERS = "does not eat pain au chocolat"; @@ -182,6 +184,25 @@ public void doesntRecoverFrom500() { ); } + @Test + public void helloVillains() { + this.wireMockServer.stubFor( + get(urlEqualTo(VILLAIN_HELLO_URI)) + .willReturn(okForContentType(TEXT_PLAIN, "Hello villains!")) + ); + + this.villainClient.helloVillains() + .subscribe().withSubscriber(UniAssertSubscriber.create()) + .assertSubscribed() + .awaitItem(Duration.ofSeconds(5)) + .assertItem("Hello villains!"); + + this.wireMockServer.verify(1, + getRequestedFor(urlEqualTo(VILLAIN_HELLO_URI)) + .withHeader(ACCEPT, containing(TEXT_PLAIN)) + ); + } + private String getDefaultVillainJson() { try { return this.objectMapper.writeValueAsString(DEFAULT_VILLAIN); From 75999fd63095d4c1773dfa3281c8e26edd6f5c15 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Thu, 12 May 2022 13:22:35 -0400 Subject: [PATCH 9/9] Use quarkus extension --- rest-fights/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rest-fights/pom.xml b/rest-fights/pom.xml index e5f788b2c..1356f088a 100644 --- a/rest-fights/pom.xml +++ b/rest-fights/pom.xml @@ -132,6 +132,10 @@ io.quarkus quarkus-liquibase-mongodb + + io.quarkus + quarkus-smallrye-stork + io.smallrye.stork stork-service-discovery-static-list @@ -165,12 +169,8 @@ stork-load-balancer-power-of-two-choices - org.bouncycastle - bcprov-jdk15on - - - org.bouncycastle - bcpkix-jdk15on + io.quarkus + quarkus-kubernetes-client io.quarkus