From 698457ac05ca34aff02b1e7fc83c542540e3f9f2 Mon Sep 17 00:00:00 2001
From: Dan K <dk14142@gmail.com>
Date: Tue, 16 Jul 2019 20:31:01 +0200
Subject: [PATCH] WIP(ch9s6): update current code
---
micro-java/pom.xml | 3 +
micro-java/src/main/fabric8/route.yml | 19 +++++++++
micro-java/src/main/fabric8/deployment.yml | 61 ++++++++++++++++++++++++++++++
micro-java/src/main/fabric8/svc.yml | 26 +++++++++++++
4 files changed, 108 insertions(+), 1 deletions(-)
diff --git a/micro-java/pom.xml b/micro-java/pom.xml
index 79154c6..edaa9bf 100644
--- a/micro-java/pom.xml
+++ b/micro-java/pom.xml
@@ -28,10 +28,11 @@
<version.war.plugin>2.5</version.war.plugin>
<!--
<version.fabric8.plugin>3.1.80.redhat-000019</version.fabric8.plugin>
+ -->
+ <!--
<version.fabric8.plugin>3.5.38</version.fabric8.plugin>
-->
<version.fabric8.plugin>4.1.0</version.fabric8.plugin>
-
<!-- maven-compiler-plugin -->
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
diff --git a/micro-java/src/main/fabric8/deployment.yml b/micro-java/src/main/fabric8/deployment.yml
new file mode 100644
index 0000000..57d2f01
--- /dev/null
+++ b/micro-java/src/main/fabric8/deployment.yml
@@ -0,0 +1,61 @@
+---
+apiVersion: "v1"
+kind: "DeploymentConfig"
+metadata:
+ annotations:
+ fabric8.io/iconUrl: "img/icons/camel.svg"
+ labels:
+ provider: "fabric8"
+ project: "${env.RHT_OCP4_DEV_USER}-${project.artifactId}"
+ version: "1.0"
+ group: "com.redhat.training"
+ name: "${project.artifactId}"
+spec:
+ replicas: 1
+ selector:
+ project: "${env.RHT_OCP4_DEV_USER}-${project.artifactId}"
+ provider: "fabric8"
+ group: "com.redhat.training"
+ strategy:
+ rollingParams:
+ timeoutSeconds: 10800
+ type: "Rolling"
+ template:
+ metadata:
+ annotations:
+ fabric8.io/iconUrl: "img/icons/camel.svg"
+ labels:
+ provider: "fabric8"
+ project: "${env.RHT_OCP4_DEV_USER}-${project.artifactId}"
+ version: "1.0"
+ group: "com.redhat.training"
+ spec:
+ containers:
+ - image: "${project.artifactId}:1.0"
+ imagePullPolicy: "IfNotPresent"
+ name: "spring-boot"
+ ports:
+ - containerPort: 8080
+ name: "http"
+ protocol: "TCP"
+ #- containerPort: 9081
+ # name: "rest"
+ # protocol: "TCP"
+ securityContext:
+ privileged: false
+ #readinessProbe:
+ # httpGet:
+ # path: "/hello/health"
+ # port: 9081
+ # initialDelaySeconds: 20
+ triggers:
+ - type: "ConfigChange"
+ - imageChangeParams:
+ automatic: true
+ containerNames:
+ - "spring-boot"
+ from:
+ kind: "ImageStreamTag"
+ name: "${project.artifactId}:1.0"
+ type: "ImageChange"
+
diff --git a/micro-java/src/main/fabric8/route.yml b/micro-java/src/main/fabric8/route.yml
new file mode 100644
index 0000000..1861f0e
--- /dev/null
+++ b/micro-java/src/main/fabric8/route.yml
@@ -0,0 +1,19 @@
+---
+apiVersion: v1
+kind: Route
+metadata:
+ labels:
+ expose: "true"
+ app: ${project.artifactId}
+ provider: fabric8
+ version: "1.0"
+ group: com.redhat.training
+ name: ${project.artifactId}
+spec:
+# host: ${hostname}
+ port:
+ targetPort: 8080
+ to:
+ kind: Service
+ name: ${project.artifactId}
+
diff --git a/micro-java/src/main/fabric8/svc.yml b/micro-java/src/main/fabric8/svc.yml
new file mode 100644
index 0000000..8dbcfce
--- /dev/null
+++ b/micro-java/src/main/fabric8/svc.yml
@@ -0,0 +1,26 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+# annotations:
+# fabric8.io/iconUrl: img/icons/camel.svg
+ labels:
+ expose: "true"
+ app: ${project.artifactId}
+ provider: fabric8
+ version: "1.0"
+ group: com.redhat.training
+ name: ${project.artifactId}
+spec:
+ ports:
+ - name: http-tomcat
+ port: 8080
+ protocol: TCP
+ targetPort: 8080
+# - name: rest
+# port: ${rest-port}
+# protocol: TCP
+# targetPort: ${rest-port}
+ selector:
+ deploymentconfig: ${project.artifactId}
+
--
Gitblit v1.9.3