Skip to content

Commit

Permalink
Merge pull request #19886 from nilo19/bug/bump-k8s-version
Browse files Browse the repository at this point in the history
Azure: bump k8s version to 1.20 for azure pre-submit tests
  • Loading branch information
k8s-ci-robot authored Nov 9, 2020
2 parents bf4faea + d6fee62 commit 43e3ada
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ presubmits:
- --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH)
- --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH)
- --aksengine-winZipBuildScript=$(WIN_BUILD)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_release_staging.json
- --aksengine-win-binaries
- --aksengine-deploy-custom-k8s
Expand Down Expand Up @@ -120,7 +120,7 @@ presubmits:
- --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH)
- --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH)
- --aksengine-winZipBuildScript=$(WIN_BUILD)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_in_tree_volume_plugins.json
- --aksengine-win-binaries
- --aksengine-deploy-custom-k8s
Expand Down Expand Up @@ -183,7 +183,7 @@ presubmits:
- --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH)
- --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH)
- --aksengine-winZipBuildScript=$(WIN_BUILD)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_in_tree_volume_plugins.json
- --aksengine-win-binaries
- --aksengine-deploy-custom-k8s
Expand Down Expand Up @@ -240,7 +240,7 @@ presubmits:
- --aksengine-public-key=$(K8S_SSH_PUBLIC_KEY_PATH)
- --aksengine-private-key=$(K8S_SSH_PRIVATE_KEY_PATH)
- --aksengine-winZipBuildScript=$(WIN_BUILD)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-template-url=https://raw.githubusercontent.com/kubernetes-sigs/windows-testing/master/job-templates/kubernetes_docker_gpu_master.json
- --aksengine-win-binaries
- --aksengine-deploy-custom-k8s
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ presubmits:
- --aksengine-agentpoolcount=2
- --aksengine-admin-username=azureuser
- --aksengine-creds=$(AZURE_CREDENTIALS)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-mastervmsize=Standard_DS2_v2
- --aksengine-agentvmsize=Standard_DS2_v2
- --aksengine-deploy-custom-k8s
Expand Down Expand Up @@ -85,7 +85,7 @@ presubmits:
- --deployment=aksengine
- --aksengine-admin-username=azureuser
- --aksengine-creds=$(AZURE_CREDENTIALS)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-deploy-custom-k8s
- --aksengine-location=westus2
- --aksengine-public-key=$(AZURE_SSH_PUBLIC_KEY_FILE)
Expand Down Expand Up @@ -140,7 +140,7 @@ presubmits:
- --deployment=aksengine
- --aksengine-admin-username=azureuser
- --aksengine-creds=$(AZURE_CREDENTIALS)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-deploy-custom-k8s
- --aksengine-location=westus2
- --aksengine-public-key=$(AZURE_SSH_PUBLIC_KEY_FILE)
Expand Down Expand Up @@ -198,7 +198,7 @@ presubmits:
- --aksengine-agentpoolcount=2
- --aksengine-admin-username=azureuser
- --aksengine-creds=$(AZURE_CREDENTIALS)
- --aksengine-orchestratorRelease=1.19
- --aksengine-orchestratorRelease=1.20
- --aksengine-mastervmsize=Standard_DS2_v2
- --aksengine-agentvmsize=Standard_DS2_v2
- --aksengine-deploy-custom-k8s
Expand Down

0 comments on commit 43e3ada

Please sign in to comment.