Skip to content

Commit 6b4fee5

Browse files
authored
Merge pull request #132 from feiskyer/1.14-update
Update kubernetes version to 1.14.0
2 parents ff0c8cf + 8f4ab21 commit 6b4fee5

File tree

10 files changed

+36
-25
lines changed

10 files changed

+36
-25
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TEST_RESULTS_DIR=testResults
2525
GOMETALINTER_OPTION=--tests --disable-all -E gofmt -E vet -E golint
2626

2727
IMAGE_REGISTRY ?= local
28-
K8S_VERSION ?= v1.14.0-rc.1
28+
K8S_VERSION ?= v1.14.0
2929
AKSENGINE_VERSION ?= master
3030
HYPERKUBE_IMAGE ?= "gcrio.azureedge.net/google_containers/hyperkube-amd64:$(K8S_VERSION)"
3131
# manifest name under tests/e2e/k8s-azure/manifest

glide.lock

+12-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package: k8s.io/cloud-provider-azure
22
import:
33
- package: k8s.io/kubernetes
4-
version: v1.14.0-rc.1
4+
version: v1.14.0
55
- package: github.com/Azure/azure-sdk-for-go
66
version: v21.3.0
77
testImport:

tests/k8s-azure/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
FROM golang:1.12.1-stretch AS build_kubernetes
1616
# rsync: building k8s
1717
RUN apt update && apt install -y --no-install-recommends rsync
18-
ARG K8S_VERSION=v1.14.0-rc.1
18+
ARG K8S_VERSION=v1.14.0
1919
WORKDIR /go/src/k8s.io/kubernetes
2020
RUN git clone https://github.com/kubernetes/kubernetes . \
2121
&& git checkout -b temp $K8S_VERSION \

tests/k8s-azure/manifest/linux-autoscaler.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"orchestratorRelease": "1.14",
88
"kubernetesConfig": {
99
"useCloudControllerManager": true,
10-
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.14.0-rc.1",
11-
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0-rc.1",
10+
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.14.0",
11+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0",
1212
"networkPolicy": "none",
1313
"cloudProviderRateLimitQPS": 6,
1414
"cloudProviderRateLimitBucket": 20,

tests/k8s-azure/manifest/linux-kcm.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"orchestratorType": "Kubernetes",
77
"orchestratorRelease": "1.14",
88
"kubernetesConfig": {
9-
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0-rc.1",
9+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0",
1010
"privateAzureRegistryServer": "gcrio.azureedge.net",
1111
"networkPolicy": "none",
1212
"cloudProviderRateLimitQPS": 6,

tests/k8s-azure/manifest/linux.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"orchestratorRelease": "1.14",
88
"kubernetesConfig": {
99
"useCloudControllerManager": true,
10-
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.14.0-rc.1",
11-
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0-rc.1",
10+
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.14.0",
11+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0",
1212
"networkPolicy": "none",
1313
"cloudProviderRateLimitQPS": 6,
1414
"cloudProviderRateLimitBucket": 20,

vendor/github.com/spf13/cobra/cobra.go

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/spf13/cobra/command.go

+2-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/spf13/cobra/command_win.go

+7-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)