From 23d659a029be12ec7ea679372cbcd85cada7aba9 Mon Sep 17 00:00:00 2001 From: Marcin Wielgus Date: Tue, 14 Jul 2015 11:49:34 +0200 Subject: [PATCH] examples/hazelcast - pass namespace, reduce cpu requirements and inc image version --- examples/hazelcast/README.md | 6 +++++- examples/hazelcast/hazelcast-controller.yaml | 6 +++++- examples/hazelcast/hazelcast-service.yaml | 6 +++--- examples/hazelcast/{ => image}/Dockerfile | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) rename examples/hazelcast/{ => image}/Dockerfile (73%) diff --git a/examples/hazelcast/README.md b/examples/hazelcast/README.md index d677cf279d..76e629ba89 100644 --- a/examples/hazelcast/README.md +++ b/examples/hazelcast/README.md @@ -90,12 +90,16 @@ spec: containers: - resources: limits: - cpu: 1 + cpu: 0.1 image: quay.io/pires/hazelcast-kubernetes:0.5 name: hazelcast env: - name: "DNS_DOMAIN" value: "cluster.local" + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace ports: - containerPort: 5701 name: hazelcast diff --git a/examples/hazelcast/hazelcast-controller.yaml b/examples/hazelcast/hazelcast-controller.yaml index 46e05506a2..34954d0a6b 100644 --- a/examples/hazelcast/hazelcast-controller.yaml +++ b/examples/hazelcast/hazelcast-controller.yaml @@ -16,12 +16,16 @@ spec: containers: - resources: limits: - cpu: 1 + cpu: 0.1 image: quay.io/pires/hazelcast-kubernetes:0.5 name: hazelcast env: - name: "DNS_DOMAIN" value: "cluster.local" + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace ports: - containerPort: 5701 name: hazelcast diff --git a/examples/hazelcast/hazelcast-service.yaml b/examples/hazelcast/hazelcast-service.yaml index 7b43e3c487..0c9dc55da5 100644 --- a/examples/hazelcast/hazelcast-service.yaml +++ b/examples/hazelcast/hazelcast-service.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: Service -metadata: - labels: +metadata: + labels: name: hazelcast name: hazelcast spec: ports: - port: 5701 - selector: + selector: name: hazelcast diff --git a/examples/hazelcast/Dockerfile b/examples/hazelcast/image/Dockerfile similarity index 73% rename from examples/hazelcast/Dockerfile rename to examples/hazelcast/image/Dockerfile index 55963290c1..bbb094a131 100644 --- a/examples/hazelcast/Dockerfile +++ b/examples/hazelcast/image/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Paulo Pires EXPOSE 5701 RUN \ - curl -Lskj https://github.com/pires/hazelcast-kubernetes-bootstrapper/releases/download/0.3.1/hazelcast-kubernetes-bootstrapper-0.3.1.jar \ + curl -Lskj https://github.com/pires/hazelcast-kubernetes-bootstrapper/releases/download/0.5/hazelcast-kubernetes-bootstrapper-0.5.jar \ -o /bootstrapper.jar CMD java -jar /bootstrapper.jar