From dbc0d2d8ef9eded76dcbc78435172f075dd05c60 Mon Sep 17 00:00:00 2001
From: Manuel Aude Morales <maudemor@redhat.com>
Date: Fri, 7 May 2021 07:28:19 -0500
Subject: [PATCH] Change to use YAML file for the ConfigMap.

---
 micro-java/pom.xml                       | 13 -------------
 micro-java/src/main/jkube/cm.yml         |  6 ++++++
 micro-java/src/main/jkube/deployment.yml | 14 ++++----------
 3 files changed, 10 insertions(+), 23 deletions(-)
 create mode 100644 micro-java/src/main/jkube/cm.yml

diff --git a/micro-java/pom.xml b/micro-java/pom.xml
index 8c59632..28554ef 100644
--- a/micro-java/pom.xml
+++ b/micro-java/pom.xml
@@ -108,19 +108,6 @@
         <groupId>org.eclipse.jkube</groupId>
         <artifactId>openshift-maven-plugin</artifactId>
         <version>1.2.0</version>
-        <configuration>
-          <resources>
-            <configMap>
-              <name>configmap-hello</name>
-              <entries>
-                <entry>
-                  <name>APP_MSG</name>
-                  <value>My custom application message.</value>
-                </entry>
-              </entries>
-            </configMap>
-          </resources>
-        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/micro-java/src/main/jkube/cm.yml b/micro-java/src/main/jkube/cm.yml
new file mode 100644
index 0000000..3aadd12
--- /dev/null
+++ b/micro-java/src/main/jkube/cm.yml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: configmap-hello
+data:
+  APP_MSG: sample external configuration
diff --git a/micro-java/src/main/jkube/deployment.yml b/micro-java/src/main/jkube/deployment.yml
index ad926ba..7d0355e 100644
--- a/micro-java/src/main/jkube/deployment.yml
+++ b/micro-java/src/main/jkube/deployment.yml
@@ -11,12 +11,6 @@ spec:
     type: Rolling
   template:
     metadata:
-      annotations:
-        app.openshift.io/vcs-ref: master
-        jkube.io/git-url: git@github.com:maudemor/DO288-apps.git
-        app.openshift.io/vcs-uri: git@github.com:maudemor/DO288-apps.git
-        jkube.io/git-commit: 3bffad109a77ebd72831d8f791c38df68db28e60
-        jkube.io/git-branch: master
       labels:
         app: micro-java
         provider: jkube
@@ -24,14 +18,14 @@ spec:
         group: com.redhat.training.openshift.hello
     spec:
       containers:
-      - envFrom:
-          - configMapRef:
-              name: configmap-hello
-        env:
+      - env:
         - name: KUBERNETES_NAMESPACE
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        envFrom:
+          - configMapRef:
+              name: configmap-hello
         image: micro-java:latest
         imagePullPolicy: IfNotPresent
         name: quarkus