Skip to content

*: updating k8s version references, follow-up from #2083 #2109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
- **Breaking change:** Changed required Go version from `1.12` to `1.13`. This change applies to the SDK project itself and Go projects scaffolded by the SDK. Projects that import this version of the SDK require Go 1.13 to compile. ([#1949](https://github.com/operator-framework/operator-sdk/pull/1949))
- Upgrade Kubernetes version from `kubernetes-1.14.1` to `kubernetes-1.15.4`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
- Upgrade Helm version from `v2.14.1` to `v2.15.0`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
- Upgrade [`controller-runtime`](https://github.com/kubernetes-sigs/controller-runtime) version from `v0.2.0` to `v0.3.0`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
- Upgrade [`controller-tools`](https://github.com/kubernetes-sigs/controller-tools) version from `v0.2.1+git` to `v0.2.2`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
- Upgrade [`controller-runtime`](https://github.com/kubernetes-sigs/controller-runtime) version from `v0.2.0` to [`v0.3.0`](https://github.com/kubernetes-sigs/controller-runtime/releases/tag/v0.3.0). ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
- Upgrade [`controller-tools`](https://github.com/kubernetes-sigs/controller-tools) version from `v0.2.1+git` to [`v0.2.2`](https://github.com/kubernetes-sigs/controller-tools/releases/tag/v0.2.2). ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))

### Deprecated

Expand Down
2 changes: 1 addition & 1 deletion ci/tests/e2e-ansible.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mkdir -p $ROOTDIR/bin
export PATH=$ROOTDIR/bin:$PATH

if ! [ -x "$(command -v kubectl)" ]; then
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.2/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.15.4/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
fi

if ! [ -x "$(command -v oc)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/tests/e2e-helm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mkdir -p $ROOTDIR/bin
export PATH=$ROOTDIR/bin:$PATH

if ! [ -x "$(command -v kubectl)" ]; then
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.2/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.15.4/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
fi

if ! [ -x "$(command -v oc)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/tests/subcommand.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mkdir -p $ROOTDIR/bin
export PATH=$ROOTDIR/bin:$PATH

if ! [ -x "$(command -v kubectl)" ]; then
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.2/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.15.4/bin/linux/amd64/kubectl && chmod +x kubectl && mv kubectl bin/
fi

if ! [ -x "$(command -v oc)" ]; then
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/setup-k8s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -eux
# This image tag corresponds to a Kubernetes version that kind installs using
# images at:
# https://hub.docker.com/r/kindest/node/tags
K8S_VERSION="v1.14.6"
K8S_VERSION="v1.15.4"
KIND_IMAGE="quay.io/estroz/node:${K8S_VERSION}"
# TODO: use the below image once it is rebuilt with the following base image:
# kindest/base:v20190926-e6b6f7f0@sha256:1ec92b2910f2bfb8a4814cc90e15974a499f0c93d203b879277fa4bdb3762ce2
Expand Down
2 changes: 1 addition & 1 deletion internal/scaffold/ansible/molecule_default_molecule.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ platforms:
- name: kind-default
groups:
- k8s
image: bsycorp/kind:latest-1.14
image: bsycorp/kind:latest-1.15
privileged: True
override_command: no
exposed_ports:
Expand Down
2 changes: 1 addition & 1 deletion internal/scaffold/ansible/molecule_test_local_molecule.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ platforms:
- name: kind-test-local
groups:
- k8s
image: bsycorp/kind:latest-1.14
image: bsycorp/kind:latest-1.15
privileged: True
override_command: no
exposed_ports:
Expand Down
2 changes: 1 addition & 1 deletion test/ansible-inventory/molecule/test-local/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ platforms:
- name: kind-test-local
groups:
- k8s
image: bsycorp/kind:latest-1.14
image: bsycorp/kind:latest-1.15
privileged: True
override_command: no
exposed_ports:
Expand Down
2 changes: 1 addition & 1 deletion test/ansible-memcached/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ platforms:
- name: kind-test-local
groups:
- k8s
image: bsycorp/kind:latest-1.14
image: bsycorp/kind:latest-1.15
privileged: True
override_command: no
exposed_ports:
Expand Down
7 changes: 3 additions & 4 deletions test/e2e/_incluster-test-code/memcached_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,10 +335,9 @@ func memcachedMetricsTest(t *testing.T, f *framework.Framework, ctx *framework.T
if err != nil {
return fmt.Errorf("failed to lint metrics: %v", err)
}
// TODO(lili): Change to 0, when we upgrade to 1.14.
// currently there is a problem with one of the metrics in upstream Kubernetes:
// `workqueue_longest_running_processor_microseconds`.
// This has been fixed in 1.14 release.

// TODO(joelanford): Change to 0, when we upgrade from kubernetes-1.15.
// This is fixed in kubernetes-1.16+.
if len(problems) > 1 {
return fmt.Errorf("found problems with metrics: %#+v", problems)
}
Expand Down