File tree 9 files changed +20
-20
lines changed 9 files changed +20
-20
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ TEST_RESULTS_DIR=testResults
25
25
GOMETALINTER_OPTION =--tests --disable-all -E gofmt -E vet -E golint
26
26
27
27
IMAGE_REGISTRY ?= local
28
- K8S_VERSION ?= v1.15.0-rc.1
28
+ K8S_VERSION ?= v1.15.0
29
29
AKSENGINE_VERSION ?= master
30
30
HYPERKUBE_IMAGE ?= gcrio.azureedge.net/google_containers/hyperkube-amd64:$(K8S_VERSION )
31
31
# manifest name under tests/e2e/k8s-azure/manifest
Original file line number Diff line number Diff line change 7
7
"orchestratorRelease" : " 1.15" ,
8
8
"kubernetesConfig" : {
9
9
"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" ,
12
12
"networkPolicy" : " none" ,
13
13
"cloudProviderRateLimitQPS" : 6 ,
14
14
"cloudProviderRateLimitBucket" : 20 ,
Original file line number Diff line number Diff line change 7
7
"orchestratorRelease" : " 1.15" ,
8
8
"kubernetesConfig" : {
9
9
"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" ,
12
12
"networkPolicy" : " none" ,
13
13
"cloudProviderRateLimitQPS" : 6 ,
14
14
"cloudProviderRateLimitBucket" : 20 ,
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ require (
39
39
k8s.io/client-go v0.0.0
40
40
k8s.io/component-base v0.0.0
41
41
k8s.io/klog v0.3.2
42
- k8s.io/kubernetes v0.0.0-00010101000000-000000000000
42
+ k8s.io/kubernetes v1.15.0
43
43
k8s.io/legacy-cloud-providers v0.0.0
44
44
)
45
45
@@ -324,7 +324,7 @@ replace (
324
324
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190612200019-4f29960cb205
325
325
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190612200019-4f29960cb205
326
326
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
328
328
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190612131456-ca2c1fa39887
329
329
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190612200019-4f29960cb205
330
330
k8s.io/node-api => k8s.io/kubernetes/staging/src/k8s.io/node-api v0.0.0-20190612200019-4f29960cb205
Original file line number Diff line number Diff line change @@ -354,8 +354,8 @@ k8s.io/klog v0.2.1-0.20190311220638-291f19f84ceb h1:A9ZNjOQRZrgdg1PPVRlVnnzB2+pm
354
354
k8s.io/klog v0.2.1-0.20190311220638-291f19f84ceb /go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk =
355
355
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c h1:kJCzg2vGCzah5icgkKR7O1Dzn0NA2iGlym27sb0ZfGE =
356
356
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 =
359
359
k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190612200019-4f29960cb205 h1:pK67WasxhXax/4MfNm3BVYm1dIa3mKIXGyHPDu3w9iQ =
360
360
k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190612200019-4f29960cb205 /go.mod h1:F6Fl77o501YUXNsJfBI+WAoC0ZcVGbw3FWQYig2Eplw =
361
361
k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190612200019-4f29960cb205 h1:HojGTx5tztbC0CcqK4IWhCUk6xl6DTsX6I1+9qx7MFA =
Original file line number Diff line number Diff line change 4
4
"properties" : {
5
5
"orchestratorProfile" : {
6
6
"orchestratorType" : " Kubernetes" ,
7
- "orchestratorRelease" : " 1.14 " ,
7
+ "orchestratorRelease" : " 1.15 " ,
8
8
"kubernetesConfig" : {
9
9
"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" ,
12
12
"networkPolicy" : " none" ,
13
13
"cloudProviderRateLimitQPS" : 6 ,
14
14
"cloudProviderRateLimitBucket" : 20 ,
Original file line number Diff line number Diff line change 4
4
"properties" : {
5
5
"orchestratorProfile" : {
6
6
"orchestratorType" : " Kubernetes" ,
7
- "orchestratorRelease" : " 1.14 " ,
7
+ "orchestratorRelease" : " 1.15 " ,
8
8
"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" ,
10
10
"privateAzureRegistryServer" : " gcrio.azureedge.net" ,
11
11
"networkPolicy" : " none" ,
12
12
"cloudProviderRateLimitQPS" : 6 ,
Original file line number Diff line number Diff line change 4
4
"properties" : {
5
5
"orchestratorProfile" : {
6
6
"orchestratorType" : " Kubernetes" ,
7
- "orchestratorRelease" : " 1.14 " ,
7
+ "orchestratorRelease" : " 1.15 " ,
8
8
"kubernetesConfig" : {
9
9
"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" ,
12
12
"networkPolicy" : " none" ,
13
13
"cloudProviderRateLimitQPS" : 6 ,
14
14
"cloudProviderRateLimitBucket" : 20 ,
Original file line number Diff line number Diff line change 4
4
"properties" : {
5
5
"orchestratorProfile" : {
6
6
"orchestratorType" : " Kubernetes" ,
7
- "orchestratorRelease" : " 1.14 " ,
7
+ "orchestratorRelease" : " 1.15 " ,
8
8
"kubernetesConfig" : {
9
9
"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" ,
12
12
"networkPolicy" : " none" ,
13
13
"cloudProviderRateLimitQPS" : 6 ,
14
14
"cloudProviderRateLimitBucket" : 20 ,
You can’t perform that action at this time.
0 commit comments