Skip to content

Commit

Permalink
🚀 Upgrade tests to minikube version 1.9 and kubernetes 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
engapa committed Apr 28, 2020
1 parent d4d86a3 commit 48b122d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
7 changes: 5 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ jobs:
fi
k8s:
machine:
image: circleci/classic:201808-01
image: ubuntu-1604:201903-01
steps:
- checkout
- run:
name: update pkgs
command: sudo apt-get update && sudo apt-get install -f -y conntrack
- run:
name: install minikube and kubectl
command: make minikube-install
Expand All @@ -48,7 +51,7 @@ jobs:
command: make minikube-delete
openshift:
machine:
image: circleci/classic:201808-01
image: ubuntu-1604:201903-01
steps:
- checkout
- run:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![Docker image version](https://images.microbadger.com/badges/version/engapa/zookeeper.svg)](https://microbadger.com/images/engapa/zookeeper)
![OSS](https://badges.frapsoft.com/os/v1/open-source.svg?v=103 "We love OpenSource")

This project aims to provide zookeeper docker images and prepare them to be deployed as 'statefulsets' on kubernetes.
This project aims to provide zookeeper docker images and prepare them to be deployed as 'statefulsets' on kubernetes (openshift).

These scripts are used to build/run the docker image/container:

Expand All @@ -14,7 +14,7 @@ These scripts are used to build/run the docker image/container:

## Build and push the docker image

Set env variables DOCKER_ORG (defaults to engapa), DOCKER_IMAGE (defaults to zookeeper) and ZOO_VERSION (the real zookeeper version that will be downloaded into the docker image)
Set env variables DOCKER_ORG (defaults to `engapa`), DOCKER_IMAGE (defaults to `zookeeper`) and ZOO_VERSION (the real zookeeper version that will be downloaded into the docker image)
to tag docker image as you wish and then build, test and push:

```bash
Expand Down
1 change: 0 additions & 1 deletion _config.yml

This file was deleted.

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.7.3"}
KUBE_VERSION=${KUBE_VERSION:-"v1.17.3"}
MINIKUBE_VERSION=${MINIKUBE_VERSION:-"v1.9.2"}
KUBE_VERSION=${KUBE_VERSION:-"v1.18.2"}

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

Expand Down

0 comments on commit 48b122d

Please sign in to comment.