Skip to content

Commit 7a83e93

Browse files
committed
remove k8s version windows
1 parent a6ea56a commit 7a83e93

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

Vagrantfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,8 @@ settings = YAML.load_file settingsFile
88
k8s_linux_registry=settings['k8s_linux_registry']
99
k8s_linux_kubelet_deb=settings['k8s_linux_kubelet_deb']
1010
k8s_linux_apiserver=settings['k8s_linux_apiserver']
11-
kubernetes_version_windows=settings['kubernetes_version_windows']
1211
kubernetes_compatibility=settings['kubernetes_compatibility']
1312

14-
# sanity checks
15-
if settings['kubernetes_version_windows'] and settings['kubernetes_sha']
16-
raise("Cant have both kubernetes_version_windows and kubernetes_sha ! pick one. sleeping 10 seconds so you see this error...")
17-
sleep(10)
18-
exit(1)
19-
end
20-
2113
overwrite_linux_bins = settings['overwrite_linux_bins']
2214
overwrite_windows_bins = settings['overwrite_windows_bins'] ? "-OverwriteBins" : ""
2315

sync/shared/kubejoin.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
$env:path += ";C:\Program Files\containerd"
22
[Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine)
3-
kubeadm join 10.20.30.10:6443 --cri-socket "npipe:////./pipe/containerd-containerd" --token 19f1py.onamsn7i80hphxmh --discovery-token-ca-cert-hash sha256:be279c00a53961ee091d10fbc2a33ba09f850b08fe06ba313ddb03302be26d59
4-
3+
kubeadm join 10.20.30.10:6443 --cri-socket "npipe:////./pipe/containerd-containerd" --token 9n3umk.o2iqrho7rjakrqps --discovery-token-ca-cert-hash sha256:045241bfcea2c884eceef830db4dcf9432c5f0aa8d00fbe2f54710f4bc284cdb

0 commit comments

Comments
 (0)