Skip to content

Commit

Permalink
Drop k8s 1.10 support and add 1.15 (#546)
Browse files Browse the repository at this point in the history
* Drop k8s 1.10 support and add 1.15

* Add PR number
  • Loading branch information
dturn committed Sep 12, 2019
1 parent 41a9704 commit c5e04ec
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 21 deletions.
14 changes: 7 additions & 7 deletions .buildkite/pipeline.nightly.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
steps:
- name: 'Run Test Suite (:kubernetes: 1.15-latest)'
command: bin/ci
agents:
queue: k8s-ci
env:
LOGGING_LEVEL: 4
KUBERNETES_VERSION: v1.15-latest
- name: 'Run Test Suite (:kubernetes: 1.14-latest)'
command: bin/ci
agents:
Expand Down Expand Up @@ -27,10 +34,3 @@ steps:
env:
LOGGING_LEVEL: 4
KUBERNETES_VERSION: v1.11-latest
- name: 'Run Test Suite (:kubernetes: 1.10-latest)'
command: bin/ci
agents:
queue: minikube-ci
env:
LOGGING_LEVEL: 4
KUBERNETES_VERSION: v1.10-latest
14 changes: 7 additions & 7 deletions .shopify-build/kubernetes-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ steps:
- bundle exec rubocop
dependencies:
- bundler
- label: 'Run Test Suite (:kubernetes: 1.15-latest)'
command: bin/ci
agents:
queue: k8s-ci
env:
LOGGING_LEVEL: "4"
KUBERNETES_VERSION: v1.15-latest
- label: 'Run Test Suite (:kubernetes: 1.14-latest)'
command: bin/ci
agents:
Expand Down Expand Up @@ -37,10 +44,3 @@ steps:
env:
LOGGING_LEVEL: "4"
KUBERNETES_VERSION: v1.11-latest
- label: 'Run Test Suite (:kubernetes: 1.10-latest)'
command: bin/ci
agents:
queue: minikube-ci
env:
LOGGING_LEVEL: "4"
KUBERNETES_VERSION: v1.10-latest
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
## next

*Enhancements*
- Officially support Kubernetes 1.15 ([#546](https://github.com/Shopify/kubernetes-deploy/pull/546))
- Make sure that we only declare a Service of type LoadBalancer as deployed after its IP address is published. [#547](https://github.com/Shopify/kubernetes-deploy/pull/547)

*Other*

*Other*
- Kubernetes 1.10 is no longer officially supported as of this version ([#546](https://github.com/Shopify/kubernetes-deploy/pull/546))
- We've added a new Krane cli. This code is in alpha. We are providing
no warranty at this time and reserve the right to make major breaking changes including
removing it entirely at any time. ([#256](https://github.com/Shopify/kubernetes-deploy/issues/256))
- Deprecate `kubernetes-deploy.shopify.io` annotations in favour of `krane.shopify.io`.


## 0.27.0
*Enhancements*
- (alpha) Introduce a new `-f` flag for `kubernetes-deploy`. Allows passing in of multiple directories and/or filenames. Currently only usable by `kubernetes-deploy`, not `kubernetes-render`. [#514](https://github.com/Shopify/kubernetes-deploy/pull/514)
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,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 higher<sup>1</sup>
* Your cluster must be running Kubernetes v1.11.0 or higher<sup>1</sup>
* Each app must have a deploy directory containing its Kubernetes templates (see [Templates](#using-templates-and-variables))

<sup>1</sup> We run integration tests against these Kubernetes versions. You can find our
Expand All @@ -85,10 +85,11 @@ official compatibility chart below.
| 1.7 | 0.20.6 |
| 1.8 | 0.21.1 |
| 1.9 | 0.24.0 |
| 1.10 | 0.27.0 |

## 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`

Expand Down Expand Up @@ -466,7 +467,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-10.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.
Expand Down
4 changes: 2 additions & 2 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/kubernetes-deploy/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
require 'kubernetes-deploy/task_config_validator'

module KubernetesDeploy
MIN_KUBE_VERSION = '1.10.0'
MIN_KUBE_VERSION = '1.11.0'
StatsD.build
end

0 comments on commit c5e04ec

Please sign in to comment.