From c88c5d1cbf029f91375d7794e9fa7890363076a3 Mon Sep 17 00:00:00 2001 From: Andrea Tarocchi Date: Sun, 13 May 2018 22:32:23 +0200 Subject: [PATCH 1/3] Fixed typo in image name. --- .openshiftio/application.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.openshiftio/application.yaml b/.openshiftio/application.yaml index 5e247ae..c1fa499 100644 --- a/.openshiftio/application.yaml +++ b/.openshiftio/application.yaml @@ -35,11 +35,16 @@ parameters: description: Maven Nexus Repository to be used during build phase displayName: required: false +- name: BUILDER_IMAGE_NAME + description: Name of the image to use as a builder image + displayName: Builder Image Name + value: 'fabric8/s2i-java:latest' + required: true objects: - apiVersion: v1 kind: ImageStream metadata: - name: fabric8-s2i-java + name: fuse-java-openshift spec: tags: - name: "latest" @@ -51,7 +56,7 @@ objects: version: '1.0' from: kind: DockerImage - name: 'fabric8-s2i-java:latest' + name: ${BUILDER_IMAGE_NAME} - apiVersion: v1 kind: ImageStream metadata: @@ -95,7 +100,7 @@ objects: forcePull: true from: kind: ImageStreamTag - name: fabric8-s2i-java:latest + name: fuse-java-openshift:latest incremental: true type: Source triggers: From 01882e16e42d57522aa4ee85512be362d74cb10d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= Date: Mon, 14 May 2018 15:11:54 +0200 Subject: [PATCH 2/3] Fix layout of the readme for bullet points MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Pupier --- README.adoc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 08fcf0c..88e307b 100644 --- a/README.adoc +++ b/README.adoc @@ -7,8 +7,9 @@ The REST API Level 0 mission shows how to map business operations to a remote pr Creating an HTTP endpoint using REST and its underlying principles to define your API lets you quickly prototype and design the API flexibly. This booster introduces the mechanics of interacting with a remote (exposed by Apache Camel) service using the HTTP protocol. It allows you to: -. Execute an HTTP GET request on `api/greetings/{name}`` endpoint; using the url parameter `{name}` and producing a response in JSON format with a payload of Hello, $name! with $name replaced by the value of the url parameter used into the request. -. Browse the api's Swagger page. + +* Execute an HTTP GET request on `api/greetings/{name}`` endpoint; using the url parameter `{name}` and producing a response in JSON format with a payload of Hello, $name! with $name replaced by the value of the url parameter used into the request. +* Browse the api's Swagger page. == Deployment options From 021dade826ba61fda5d9e6514a41ed2f2587516c Mon Sep 17 00:00:00 2001 From: Andrea Tarocchi Date: Mon, 28 May 2018 17:46:10 +0200 Subject: [PATCH 3/3] Added resource limits for fmp delployments. --- src/main/fabric8/deployment.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/fabric8/deployment.yml diff --git a/src/main/fabric8/deployment.yml b/src/main/fabric8/deployment.yml new file mode 100644 index 0000000..8fb37e2 --- /dev/null +++ b/src/main/fabric8/deployment.yml @@ -0,0 +1,16 @@ +spec: + template: + spec: + serviceAccountName: "qs-camel-config" + containers: + - + resources: + requests: + cpu: "0.2" + memory: 256Mi + limits: + cpu: "1.0" + memory: 256Mi + env: + - name: SPRING_APPLICATION_JSON + value: '{"server":{"undertow":{"io-threads":1, "worker-threads":2 }}}'