diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54ec0f757..00f8dec80 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -111,7 +111,7 @@ This gem uses subclasses of `KubernetesResource` to implement custom success/fai If you work for Shopify, just run `dev up`, but otherwise: -1. [Install kubectl version 1.10.0 or higher](https://kubernetes.io/docs/user-guide/prereqs/) and make sure it is in your path +1. [Install kubectl version 1.11.0 or higher](https://kubernetes.io/docs/user-guide/prereqs/) and make sure it is in your path 2. [Install minikube](https://kubernetes.io/docs/getting-started-guides/minikube/#installation) (required to run the test suite) 3. [Install any required minikube drivers](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md) (on OS X, you may need the [hyperkit driver](https://github.com/kubernetes/minikube/blob/master/docs/drivers.md#hyperkit-driver) 4. Check out the repo diff --git a/README.md b/README.md index a4fce9f56..3e4a82894 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ This repo also includes related tools for [running tasks](#kubernetes-run) and [ ## Prerequisites * Ruby 2.3+ -* Your cluster must be running Kubernetes v1.10.0 or higher1 +* Your cluster must be running Kubernetes v1.11.0 or higher1 * Each app must have a deploy directory containing its Kubernetes templates (see [Templates](#using-templates-and-variables)) 1 We run integration tests against these Kubernetes versions. You can find our @@ -83,7 +83,7 @@ offical compatibility chart below. ## Installation -1. [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl-binary-via-curl) (requires v1.10.0 or higher) and make sure it is available in your $PATH +1. [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/#install-kubectl-binary-via-curl) (requires v1.11.0 or higher) and make sure it is available in your $PATH 2. Set up your [kubeconfig file](https://kubernetes.io/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/) for access to your cluster(s). 3. `gem install kubernetes-deploy` @@ -455,7 +455,7 @@ Refer to `kubernetes-restart --help` for the authoritative set of options. ## Prerequisites -* You've already deployed a [`PodTemplate`](https://v1-10.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.10/#podtemplate-v1-core) object with field `template` containing a `Pod` specification that does not include the `apiVersion` or `kind` parameters. An example is provided in this repo in `test/fixtures/hello-cloud/template-runner.yml`. +* You've already deployed a [`PodTemplate`](https://v1-11.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#podtemplate-v1-core) object with field `template` containing a `Pod` specification that does not include the `apiVersion` or `kind` parameters. An example is provided in this repo in `test/fixtures/hello-cloud/template-runner.yml`. * The `Pod` specification in that template has a container named `task-runner`. Based on this specification `kubernetes-run` will create a new pod with the entrypoint of the `task-runner ` container overridden with the supplied arguments. diff --git a/bin/setup b/bin/setup index 34748887e..860215c0b 100755 --- a/bin/setup +++ b/bin/setup @@ -9,8 +9,8 @@ if [ ! -x "$(which minikube)" ]; then fi if [ ! -x "$(which kubectl)" ]; then - echo -e "\n\033[0;33mPlease install kubectl version 1.10.0 or higher:\nhttps://kubernetes.io/docs/user-guide/prereqs/\033[0m" + echo -e "\n\033[0;33mPlease install kubectl version 1.11.0 or higher:\nhttps://kubernetes.io/docs/user-guide/prereqs/\033[0m" else KUBECTL_VERSION=$(kubectl version --short --client | grep -oe "v[[:digit:]\.]\+") - echo -e "\n\033[0;32mKubectl version $KUBECTL_VERSION is already installed. This gem requires version v1.10.0 or greater.\033[0m" + echo -e "\n\033[0;32mKubectl version $KUBECTL_VERSION is already installed. This gem requires version v1.11.0 or greater.\033[0m" fi diff --git a/lib/kubernetes-deploy.rb b/lib/kubernetes-deploy.rb index 055739d3d..2bd8a3ecd 100644 --- a/lib/kubernetes-deploy.rb +++ b/lib/kubernetes-deploy.rb @@ -24,6 +24,6 @@ require 'kubernetes-deploy/label_selector' module KubernetesDeploy - MIN_KUBE_VERSION = '1.10.0' + MIN_KUBE_VERSION = '1.11.0' StatsD.build end