Skip to content

Commit 12112ad

Browse files
authored
*: updating k8s version references, follow-up from #2083 (#2109)
* *: updating k8s version references, follow-up from #2083 * test/e2e/_incluster-test-code/memcached_test.go: metrics check won't fully pass until k8s 1.16+
1 parent 041ec54 commit 12112ad

File tree

10 files changed

+13
-14
lines changed

10 files changed

+13
-14
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
- **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))
1111
- Upgrade Kubernetes version from `kubernetes-1.14.1` to `kubernetes-1.15.4`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
1212
- Upgrade Helm version from `v2.14.1` to `v2.15.0`. ([#2083](https://github.com/operator-framework/operator-sdk/pull/2083))
13-
- 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))
14-
- 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))
13+
- 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))
14+
- 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))
1515

1616
### Deprecated
1717

ci/tests/e2e-ansible.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mkdir -p $ROOTDIR/bin
1616
export PATH=$ROOTDIR/bin:$PATH
1717

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

2222
if ! [ -x "$(command -v oc)" ]; then

ci/tests/e2e-helm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mkdir -p $ROOTDIR/bin
1616
export PATH=$ROOTDIR/bin:$PATH
1717

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

2222
if ! [ -x "$(command -v oc)" ]; then

ci/tests/subcommand.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ mkdir -p $ROOTDIR/bin
88
export PATH=$ROOTDIR/bin:$PATH
99

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

1414
if ! [ -x "$(command -v oc)" ]; then

hack/ci/setup-k8s.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eux
55
# This image tag corresponds to a Kubernetes version that kind installs using
66
# images at:
77
# https://hub.docker.com/r/kindest/node/tags
8-
K8S_VERSION="v1.14.6"
8+
K8S_VERSION="v1.15.4"
99
KIND_IMAGE="quay.io/estroz/node:${K8S_VERSION}"
1010
# TODO: use the below image once it is rebuilt with the following base image:
1111
# kindest/base:v20190926-e6b6f7f0@sha256:1ec92b2910f2bfb8a4814cc90e15974a499f0c93d203b879277fa4bdb3762ce2

internal/scaffold/ansible/molecule_default_molecule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ platforms:
4848
- name: kind-default
4949
groups:
5050
- k8s
51-
image: bsycorp/kind:latest-1.14
51+
image: bsycorp/kind:latest-1.15
5252
privileged: True
5353
override_command: no
5454
exposed_ports:

internal/scaffold/ansible/molecule_test_local_molecule.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ platforms:
4848
- name: kind-test-local
4949
groups:
5050
- k8s
51-
image: bsycorp/kind:latest-1.14
51+
image: bsycorp/kind:latest-1.15
5252
privileged: True
5353
override_command: no
5454
exposed_ports:

test/ansible-inventory/molecule/test-local/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ platforms:
1010
- name: kind-test-local
1111
groups:
1212
- k8s
13-
image: bsycorp/kind:latest-1.14
13+
image: bsycorp/kind:latest-1.15
1414
privileged: True
1515
override_command: no
1616
exposed_ports:

test/ansible-memcached/molecule.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ platforms:
1010
- name: kind-test-local
1111
groups:
1212
- k8s
13-
image: bsycorp/kind:latest-1.14
13+
image: bsycorp/kind:latest-1.15
1414
privileged: True
1515
override_command: no
1616
exposed_ports:

test/e2e/_incluster-test-code/memcached_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,10 +335,9 @@ func memcachedMetricsTest(t *testing.T, f *framework.Framework, ctx *framework.T
335335
if err != nil {
336336
return fmt.Errorf("failed to lint metrics: %v", err)
337337
}
338-
// TODO(lili): Change to 0, when we upgrade to 1.14.
339-
// currently there is a problem with one of the metrics in upstream Kubernetes:
340-
// `workqueue_longest_running_processor_microseconds`.
341-
// This has been fixed in 1.14 release.
338+
339+
// TODO(joelanford): Change to 0, when we upgrade from kubernetes-1.15.
340+
// This is fixed in kubernetes-1.16+.
342341
if len(problems) > 1 {
343342
return fmt.Errorf("found problems with metrics: %#+v", problems)
344343
}

0 commit comments

Comments
 (0)