From f854f3ee70040b02e33c93c42520ec2b6c77640d Mon Sep 17 00:00:00 2001
From: Manuel Aude Morales <maudemor@redhat.com>
Date: Tue, 25 May 2021 06:48:02 -0500
Subject: [PATCH] Removed configuration to be added by student during the
 activity.

---
 micro-java/pom.xml                       |  5 ----
 micro-java/src/main/jkube/cm.yml         |  1 -
 micro-java/src/main/jkube/deployment.yml | 35 ++++++++++++++++--------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/micro-java/pom.xml b/micro-java/pom.xml
index 4958b1c..92d220b 100644
--- a/micro-java/pom.xml
+++ b/micro-java/pom.xml
@@ -104,11 +104,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.eclipse.jkube</groupId>
-        <artifactId>openshift-maven-plugin</artifactId>
-        <version>1.2.0</version>
-      </plugin>
     </plugins>
   </build>
   <profiles>
diff --git a/micro-java/src/main/jkube/cm.yml b/micro-java/src/main/jkube/cm.yml
index 3aadd12..3565c20 100644
--- a/micro-java/src/main/jkube/cm.yml
+++ b/micro-java/src/main/jkube/cm.yml
@@ -3,4 +3,3 @@ 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 88c6d1b..6398686 100644
--- a/micro-java/src/main/jkube/deployment.yml
+++ b/micro-java/src/main/jkube/deployment.yml
@@ -1,20 +1,26 @@
-spec:
-  replicas: 1
-  revisionHistoryLimit: 2
-  selector:
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
     app: micro-java
     provider: jkube
+    version: "1.0"
     group: com.redhat.training.openshift.hello
-  strategy:
-    rollingParams:
-      timeoutSeconds: 3600
-    type: Rolling
+  name: micro-java
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: micro-java
+      provider: jkube
+      group: com.redhat.training.openshift.hello
   template:
     metadata:
       labels:
         app: micro-java
         provider: jkube
-        version: 1.0
+        version: "1.0"
         group: com.redhat.training.openshift.hello
     spec:
       containers:
@@ -23,9 +29,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        envFrom:
-          - configMapRef:
-              name: configmap-hello
         image: micro-java:1.0
         imagePullPolicy: IfNotPresent
         name: quarkus
@@ -33,3 +36,11 @@ spec:
         - containerPort: 8080
           name: http
           protocol: TCP
+        - containerPort: 9779
+          name: prometheus
+          protocol: TCP
+        - containerPort: 8778
+          name: jolokia
+          protocol: TCP
+        securityContext:
+          privileged: false
\ No newline at end of file