From b7412be5e72786929e2865cb9bded719fa694f7b Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Thu, 15 Dec 2022 09:17:50 +0200 Subject: [PATCH] Use proper Openshift annotation for VCS According to [this](https://access.redhat.com/documentation/en-us/openshift_container_platform/4.11/html-single/building_applications/index#odc-labels-and-annotations-used-for-topology-view_viewing-application-composition-using-topology-view), the proper annotation uses /vcs-uri instead of /vcs-url Fixes: #29873 (cherry picked from commit 5f41306b46d2ecfb9f02353c1177515c7e892197) --- docs/src/main/asciidoc/deploying-to-kubernetes.adoc | 8 ++++---- .../java/io/quarkus/kubernetes/deployment/Constants.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc index 9d22270d17fa3..0d1070fb4884e 100644 --- a/docs/src/main/asciidoc/deploying-to-kubernetes.adoc +++ b/docs/src/main/asciidoc/deploying-to-kubernetes.adoc @@ -76,7 +76,7 @@ The full source of the `kubernetes.json` file looks something like this: "kind" : "Deployment", "metadata" : { "annotations": { - "app.quarkus.io/vcs-url" : "", + "app.quarkus.io/vcs-uri" : "", "app.quarkus.io/commit-id" : "", }, "labels" : { @@ -123,7 +123,7 @@ The full source of the `kubernetes.json` file looks something like this: "kind" : "Service", "metadata" : { "annotations": { - "app.quarkus.io/vcs-url" : "", + "app.quarkus.io/vcs-uri" : "", "app.quarkus.io/commit-id" : "", }, "labels" : { @@ -305,7 +305,7 @@ Out of the box, the generated resources will be annotated with version control r [source,json] ---- "annotations": { - "app.quarkus.io/vcs-url" : "", + "app.quarkus.io/vcs-uri" : "", "app.quarkus.io/commit-id" : "", } ---- @@ -1049,7 +1049,7 @@ The full source of the `knative.json` file looks something like this: "kind" : "Service", "metadata" : { "annotations": { - "app.quarkus.io/vcs-url" : "", + "app.quarkus.io/vcs-uri" : "", "app.quarkus.io/commit-id" : "" }, "labels" : { diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java index 193643df5c3ad..b368a2e42700a 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/Constants.java @@ -41,7 +41,7 @@ public final class Constants { static final String QUARKUS = "quarkus"; static final String QUARKUS_ANNOTATIONS_COMMIT_ID = "app.quarkus.io/commit-id"; - static final String QUARKUS_ANNOTATIONS_VCS_URL = "app.quarkus.io/vcs-url"; + static final String QUARKUS_ANNOTATIONS_VCS_URL = "app.quarkus.io/vcs-uri"; static final String QUARKUS_ANNOTATIONS_BUILD_TIMESTAMP = "app.quarkus.io/build-timestamp"; public static final String HTTP_PORT = "http";