Skip to content

Commit

Permalink
Update to Zookeeper version 3.5.7 and use kubernetes 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
engapa committed Feb 29, 2020
1 parent 1442037 commit fb3d6a6
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER Enrique Garcia <[email protected]>
ARG ZOO_HOME=/opt/zookeeper
ARG ZOO_USER=zookeeper
ARG ZOO_GROUP=zookeeper
ARG ZOO_VERSION="3.5.6"
ARG ZOO_VERSION="3.5.7"

ENV ZOO_HOME=$ZOO_HOME \
ZOO_VERSION=$ZOO_VERSION \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
DOCKER_ORG ?= engapa
DOCKER_IMAGE ?= zookeeper

ZK_VERSION ?= 3.5.6
ZK_VERSION ?= 3.5.7

.PHONY: help
help: ## Show this help
Expand Down
2 changes: 1 addition & 1 deletion k8s/helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
description: Apache ZooKeeper enables highly reliable distributed coordination system.
name: zookeeper
version: "3.5.6
version: "3.5.7
keywords:
- zookeeper
home: https://zookeeper.apache.org/
Expand Down
8 changes: 4 additions & 4 deletions k8s/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ namespace:

```bash
$ helm repo add engapa http://storage.googleapis.com/kubernetes-charts-incubator
$ helm install --name zookeeper-"3.5.6 engapa/zookeeper
$ helm install --name zookeeper-"3.5.7 engapa/zookeeper
```
If you're using a dedicated namespace (recommended) then make sure the namespace
exists:
```bash
$ kubectl create ns zookeeper
$ helm install --name zookeeper-"3.5.6 --set global.namespace=zookeeper engapa/zookeeper
$ helm install --name zookeeper-"3.5.7 --set global.namespace=zookeeper engapa/zookeeper
```
The chart can be customized using the
Expand All @@ -31,7 +31,7 @@ following configurable parameters:
| ----------------------- | ----------------------------------- | ---------------------------------------------------------- |
| `Name` | Zookeeper resource names | `zk` |
| `Image` | Zookeeper container image name | `engapa/zookeeper` |
| `ImageTag` | Zookeeper container image tag | `"3.5.6` |
| `ImageTag` | Zookeeper container image tag | `3.5.7` |
| `ImagePullPolicy` | Zookeeper container pull policy | `IfNotPresent` |
| `Replicas` | Zookeeper replicas | `3` |
| `Component` | Zookeeper k8s selector key | `zk` |
Expand All @@ -45,6 +45,6 @@ Specify parameters using `--set key=value[,key=value]` argument to `helm install
Alternatively a YAML file that specifies the values for the parameters can be provided like this:
```bash
$ helm install --name zookeeper-"3.5.6 -f values.yaml engapa/zookeeper
$ helm install --name zookeeper-"3.5.7 -f values.yaml engapa/zookeeper
```
2 changes: 1 addition & 1 deletion k8s/helm/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: "zk"
Replicas: 1
Image: "engapa/zookeeper"
ImageTag: "3.5.6"
ImageTag: "3.5.7"
ImagePullPolicy: "IfNotPresent"
Cpu: "1"
Memory: "512M"
Expand Down
4 changes: 2 additions & 2 deletions k8s/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -e

MINIKUBE_VERSION=${MINIKUBE_VERSION:-"v1.2.0"}
KUBE_VERSION=${KUBE_VERSION:-"v1.15.1"}
MINIKUBE_VERSION=${MINIKUBE_VERSION:-"v1.7.3"}
KUBE_VERSION=${KUBE_VERSION:-"v1.17.3"}

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

Expand Down
2 changes: 1 addition & 1 deletion k8s/zk-persistent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
containers:
- name: zk-persistent
imagePullPolicy: IfNotPresent
image: engapa/zookeeper:"3.5.6
image: engapa/zookeeper:3.5.7
resources:
requests:
memory: 512M
Expand Down
2 changes: 1 addition & 1 deletion k8s/zk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
containers:
- name: zk
imagePullPolicy: IfNotPresent
image: engapa/zookeeper:"3.5.6
image: engapa/zookeeper:3.5.7
resources:
requests:
memory: 512M
Expand Down
6 changes: 3 additions & 3 deletions openshift/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ To build local docker images of zookeeper in your private Openshift registry jus

```bash
$ oc create -f buildconfig.yaml
$ oc new-app zk-builder -p GITHUB_REF="v"3.5.6" -p IMAGE_STREAM_VERSION="v"3.5.6"
$ oc new-app zk-builder -p GITHUB_REF="v"3.5.7" -p IMAGE_STREAM_VERSION="v"3.5.7"
```

If you want to get an image from another git commit:
Expand All @@ -85,15 +85,15 @@ Or build a local docker image from source directly:
$ ./main build_local_image
```

**NOTE**: If you want to use this local/private image from containers on other projects then use the "\<project\>/NAME" value as `SOURCE_IMAGE` parameter value, and use one value of "TAGS" as `ZOO_VERSION` parameter value (e.g: test/zookeeper:"3.5.6).
**NOTE**: If you want to use this local/private image from containers on other projects then use the "\<project\>/NAME" value as `SOURCE_IMAGE` parameter value, and use one value of "TAGS" as `ZOO_VERSION` parameter value (e.g: test/zookeeper:3.5.7).

## Deploying zookeeper cluster

Just type next command to create a zookeeper cluster by using a statefulset on Openshift:

```bash
$ oc create -f zk[-persistent].yaml
$ oc new-app zk -p ZOO_REPLICAS=1 -p SOURCE_IMAGE="172.30.1.1:5000/myproject/zookeeper" -p ZOO_VERSION="3.5.6"
$ oc new-app zk -p ZOO_REPLICAS=1 -p SOURCE_IMAGE="172.30.1.1:5000/myproject/zookeeper" -p ZOO_VERSION="3.5.7"
```
> NOTE: select zk.yaml or zk-persistence.yaml, and set parameter values
Expand Down
2 changes: 1 addition & 1 deletion openshift/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

ZK_VERSION=${ZK_VERSION:-"3.5.6"}
ZK_VERSION=${ZK_VERSION:-"3.5.7"}
ZK_IMAGE="engapa/zookeeper:${ZK_VERSION}"

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down
2 changes: 1 addition & 1 deletion openshift/zk-persistent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parameters:
required: true
- name: ZOO_VERSION
description: Version
value: "3.5.6"
value: "3.5.7"
required: true
- name: ZOO_REPLICAS
description: Number of nodes
Expand Down
2 changes: 1 addition & 1 deletion openshift/zk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parameters:
required: true
- name: ZOO_VERSION
description: Version
value: "3.5.6"
value: "3.5.7"
required: true
- name: ZOO_REPLICAS
description: Number of nodes
Expand Down

0 comments on commit fb3d6a6

Please sign in to comment.