update to 3.6.2, k8s to 1.20

engapa · Dec 15, 2020 · 70a2c8c · 70a2c8c
1 parent d7f8349
commit 70a2c8c
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -74,7 +74,7 @@ jobs:
           command: make oc-cluster-clean
   gh-tag-release:
     docker:
-      - image: cibuilds/github:0.12.2
+      - image: cibuilds/github:0.13
     steps:
       - checkout
       - run:

diff --git a/Dockerfile b/Dockerfile
@@ -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.6.1"
+ARG ZOO_VERSION="3.6.2"
 
 ENV ZOO_HOME=$ZOO_HOME \
     ZOO_VERSION=$ZOO_VERSION \

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 DOCKER_ORG           ?= engapa
 DOCKER_IMAGE         ?= zookeeper
 
-ZK_VERSION           ?= 3.6.1
+ZK_VERSION           ?= 3.6.2
 
 .PHONY: help
 help: ## Show this help

diff --git a/k8s/helm/Chart.yaml b/k8s/helm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Apache ZooKeeper enables highly reliable distributed coordination system.
 name: zookeeper
-version: 3.6.1
+version: 3.6.2
 keywords:
   - zookeeper
 home: https://zookeeper.apache.org/

diff --git a/k8s/helm/README.md b/k8s/helm/README.md
@@ -2,9 +2,9 @@
 
 ## Pre Requisites:
 
-* Kubernetes 1.10
+* Kubernetes 1.20 (this is version we've tested it)
 
-* More than 1 node (if replicas is upper than 1) because of an antiaffinity scheduler policy
+* More than 1 node (if replicas is upper than 1) because of an anti-affinity scheduler policy
 
 ### Installing the Chart
 
@@ -13,15 +13,15 @@ namespace:
 
 ```bash
 $ helm repo add engapa http://storage.googleapis.com/kubernetes-charts-incubator
-$ helm install --name zookeeper-3.6.1 engapa/zookeeper
+$ helm install --name zookeeper-3.6.2 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.6.1 --set global.namespace=zookeeper engapa/zookeeper
+$ helm install --name zookeeper-3.6.2 --set global.namespace=zookeeper engapa/zookeeper
 ```
 
 The chart can be customized using the
@@ -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.6.1`                                                 |
+| `ImageTag`              | Zookeeper container image tag       | `3.6.2`                                                 |
 | `ImagePullPolicy`       | Zookeeper container pull policy     | `IfNotPresent`                                                   |
 | `Replicas`              | Zookeeper replicas                  | `3`                                                        |
 | `Component`             | Zookeeper k8s selector key          | `zk`                                                    |
@@ -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.6.1 -f values.yaml engapa/zookeeper
+$ helm install --name zookeeper-3.6.2 -f values.yaml engapa/zookeeper
 ```
 
diff --git a/k8s/helm/values.yaml b/k8s/helm/values.yaml
@@ -1,7 +1,7 @@
 Name: "zk"
 Replicas: 1
 Image: "engapa/zookeeper"
-ImageTag: "3.6.1"
+ImageTag: "3.6.2"
 ImagePullPolicy: "IfNotPresent"
 Cpu: "1"
 Memory: "512M"

diff --git a/k8s/main.sh b/k8s/main.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-MINIKUBE_VERSION=${MINIKUBE_VERSION:-"v1.10.1"}
-KUBE_VERSION=${KUBE_VERSION:-"v1.18.2"}
+MINIKUBE_VERSION=${MINIKUBE_VERSION:-"v1.15.1"}
+KUBE_VERSION=${KUBE_VERSION:-"v1.20.0"}
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 

diff --git a/k8s/zk-persistent.yaml b/k8s/zk-persistent.yaml
@@ -64,7 +64,7 @@ spec:
       containers:
       - name: zk-persistent
         imagePullPolicy: IfNotPresent
-        image: engapa/zookeeper:3.6.1
+        image: engapa/zookeeper:3.6.2
         resources:
           requests:
             memory: 512M

diff --git a/k8s/zk.yaml b/k8s/zk.yaml
@@ -46,7 +46,7 @@ spec:
       containers:
       - name: zk
         imagePullPolicy: IfNotPresent
-        image: engapa/zookeeper:3.6.1
+        image: engapa/zookeeper:3.6.2
         resources:
           requests:
             memory: 512M

diff --git a/openshift/README.md b/openshift/README.md
@@ -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="v3.6.1" -p IMAGE_STREAM_VERSION="v3.6.1"
+$ oc new-app zk-builder -p GITHUB_REF="v3.6.2" -p IMAGE_STREAM_VERSION="v3.6.2"
 ```
 
 If you want to get an image from another git commit:
@@ -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.6.1).
+**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.6.2).
 
 ## 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.6.1"
+$ oc new-app zk -p ZOO_REPLICAS=1 -p SOURCE_IMAGE="172.30.1.1:5000/myproject/zookeeper" -p ZOO_VERSION="3.6.2"
 ```
 > NOTE: select zk.yaml or zk-persistence.yaml, and set parameter values
 

diff --git a/openshift/main.sh b/openshift/main.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-ZK_VERSION=${ZK_VERSION:-"3.6.1"}
+ZK_VERSION=${ZK_VERSION:-"3.6.2"}
 ZK_IMAGE="engapa/zookeeper:${ZK_VERSION}"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

diff --git a/openshift/zk-persistent.yaml b/openshift/zk-persistent.yaml
@@ -20,7 +20,7 @@ parameters:
   required: true
 - name: ZOO_VERSION
   description: Version
-  value: "3.6.1"
+  value: "3.6.2"
   required: true
 - name: ZOO_REPLICAS
   description: Number of nodes

diff --git a/openshift/zk.yaml b/openshift/zk.yaml
@@ -20,7 +20,7 @@ parameters:
   required: true
 - name: ZOO_VERSION
   description: Version
-  value: "3.6.1"
+  value: "3.6.2"
   required: true
 - name: ZOO_REPLICAS
   description: Number of nodes