From 168022ebd1ae6d33696148e88a8078726174d4dd Mon Sep 17 00:00:00 2001
From: Jonathan Dowland <jdowland@redhat.com>
Date: Thu, 30 Nov 2023 13:26:21 +0000
Subject: [PATCH] [OPENJDK-2414] define name and version labels

These shadow the values from our base image which are otherwise
misleading, and result in the test "Check that common labels are
correctly set" passing.

Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
---
 ubi9-openjdk-11-runtime.yaml | 4 ++++
 ubi9-openjdk-11.yaml         | 4 ++++
 ubi9-openjdk-17-runtime.yaml | 4 ++++
 ubi9-openjdk-17.yaml         | 4 ++++
 ubi9-openjdk-21-runtime.yaml | 4 ++++
 ubi9-openjdk-21.yaml         | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/ubi9-openjdk-11-runtime.yaml b/ubi9-openjdk-11-runtime.yaml
index 4cd7c56c..f219f586 100644
--- a/ubi9-openjdk-11-runtime.yaml
+++ b/ubi9-openjdk-11-runtime.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: "JBOSS_IMAGE_NAME"
diff --git a/ubi9-openjdk-11.yaml b/ubi9-openjdk-11.yaml
index cf356237..002e5c1c 100644
--- a/ubi9-openjdk-11.yaml
+++ b/ubi9-openjdk-11.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: PATH
diff --git a/ubi9-openjdk-17-runtime.yaml b/ubi9-openjdk-17-runtime.yaml
index 9d61772a..672263da 100644
--- a/ubi9-openjdk-17-runtime.yaml
+++ b/ubi9-openjdk-17-runtime.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: "JBOSS_IMAGE_NAME"
diff --git a/ubi9-openjdk-17.yaml b/ubi9-openjdk-17.yaml
index 029e7056..ac7ce7ea 100644
--- a/ubi9-openjdk-17.yaml
+++ b/ubi9-openjdk-17.yaml
@@ -24,6 +24,10 @@ labels:
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
 - name: "org.opencontainers.image.documentation"
   value: *docs
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: PATH
diff --git a/ubi9-openjdk-21-runtime.yaml b/ubi9-openjdk-21-runtime.yaml
index 9e1ed5ac..70394031 100644
--- a/ubi9-openjdk-21-runtime.yaml
+++ b/ubi9-openjdk-21-runtime.yaml
@@ -22,6 +22,10 @@ labels:
   value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
 - name: "com.redhat.license_terms"
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: "JBOSS_IMAGE_NAME"
diff --git a/ubi9-openjdk-21.yaml b/ubi9-openjdk-21.yaml
index 724a6d44..c3a277e6 100644
--- a/ubi9-openjdk-21.yaml
+++ b/ubi9-openjdk-21.yaml
@@ -22,6 +22,10 @@ labels:
   value: "https://access.redhat.com/documentation/en-us/red_hat_jboss_middleware_for_openshift/3/html/red_hat_java_s2i_for_openshift/"
 - name: "com.redhat.license_terms"
   value: "https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI"
+- name: "name"
+  value: *name
+- name: "version"
+  value: *version
 
 envs:
 - name: PATH