Skip to content

Commit 87e4c84

Browse files
authored
Merge pull request #167 from feiskyer/v1.15-update
Update Kubernetes version to v1.15.0
2 parents a5640a2 + 5615f04 commit 87e4c84

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
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.15.0-rc.1
28+
K8S_VERSION ?= v1.15.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

examples/aks-engine.json

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

examples/az.json

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

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
k8s.io/client-go v0.0.0
4040
k8s.io/component-base v0.0.0
4141
k8s.io/klog v0.3.2
42-
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
42+
k8s.io/kubernetes v1.15.0
4343
k8s.io/legacy-cloud-providers v0.0.0
4444
)
4545

@@ -324,7 +324,7 @@ replace (
324324
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190612200019-4f29960cb205
325325
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190612200019-4f29960cb205
326326
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190612200019-4f29960cb205
327-
k8s.io/kubernetes => k8s.io/kubernetes v1.15.0-rc.1
327+
k8s.io/kubernetes => k8s.io/kubernetes v1.15.0
328328
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190612131456-ca2c1fa39887
329329
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190612200019-4f29960cb205
330330
k8s.io/node-api => k8s.io/kubernetes/staging/src/k8s.io/node-api v0.0.0-20190612200019-4f29960cb205

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ k8s.io/klog v0.2.1-0.20190311220638-291f19f84ceb h1:A9ZNjOQRZrgdg1PPVRlVnnzB2+pm
354354
k8s.io/klog v0.2.1-0.20190311220638-291f19f84ceb/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
355355
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c h1:kJCzg2vGCzah5icgkKR7O1Dzn0NA2iGlym27sb0ZfGE=
356356
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
357-
k8s.io/kubernetes v1.15.0-rc.1 h1:g4AL5/JyMoctFYRj8FE+uSOukHlCWVpNNKGitJipjec=
358-
k8s.io/kubernetes v1.15.0-rc.1/go.mod h1:gHiryyVekxFDzuK//3LKiE8ur1UWjIHJbNRp2r+TcxA=
357+
k8s.io/kubernetes v1.15.0 h1:0P6jAdZ1cF5/wSc14HqHCjWlbnwYzmFJBYeXBezZEE0=
358+
k8s.io/kubernetes v1.15.0/go.mod h1:3RE5ikMc73WK+dSxk4pQuQ6ZaJcPXiZX2dj98RcdCuM=
359359
k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190612200019-4f29960cb205 h1:pK67WasxhXax/4MfNm3BVYm1dIa3mKIXGyHPDu3w9iQ=
360360
k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190612200019-4f29960cb205/go.mod h1:F6Fl77o501YUXNsJfBI+WAoC0ZcVGbw3FWQYig2Eplw=
361361
k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190612200019-4f29960cb205 h1:HojGTx5tztbC0CcqK4IWhCUk6xl6DTsX6I1+9qx7MFA=

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"properties": {
55
"orchestratorProfile": {
66
"orchestratorType": "Kubernetes",
7-
"orchestratorRelease": "1.14",
7+
"orchestratorRelease": "1.15",
88
"kubernetesConfig": {
99
"useCloudControllerManager": true,
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",
10+
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.15.0",
11+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.15.0",
1212
"networkPolicy": "none",
1313
"cloudProviderRateLimitQPS": 6,
1414
"cloudProviderRateLimitBucket": 20,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"properties": {
55
"orchestratorProfile": {
66
"orchestratorType": "Kubernetes",
7-
"orchestratorRelease": "1.14",
7+
"orchestratorRelease": "1.15",
88
"kubernetesConfig": {
9-
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.14.0",
9+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.15.0",
1010
"privateAzureRegistryServer": "gcrio.azureedge.net",
1111
"networkPolicy": "none",
1212
"cloudProviderRateLimitQPS": 6,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"properties": {
55
"orchestratorProfile": {
66
"orchestratorType": "Kubernetes",
7-
"orchestratorRelease": "1.14",
7+
"orchestratorRelease": "1.15",
88
"kubernetesConfig": {
99
"useCloudControllerManager": true,
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",
10+
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.15.0",
11+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.15.0",
1212
"networkPolicy": "none",
1313
"cloudProviderRateLimitQPS": 6,
1414
"cloudProviderRateLimitBucket": 20,

tests/k8s-azure/manifest/linux.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"properties": {
55
"orchestratorProfile": {
66
"orchestratorType": "Kubernetes",
7-
"orchestratorRelease": "1.14",
7+
"orchestratorRelease": "1.15",
88
"kubernetesConfig": {
99
"useCloudControllerManager": true,
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",
10+
"customCcmImage": "gcrio.azureedge.net/google_containers/cloud-controller-manager-amd64:v1.15.0",
11+
"customHyperkubeImage": "gcrio.azureedge.net/google_containers/hyperkube-amd64:v1.15.0",
1212
"networkPolicy": "none",
1313
"cloudProviderRateLimitQPS": 6,
1414
"cloudProviderRateLimitBucket": 20,

0 commit comments

Comments
 (0)