Created
June 7, 2021 19:44
-
-
Save jayunit100/541fb941db0bfbb1c517536ee8bb8045 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.gitignore b/.gitignore | |
| index 1434883..a064268 100644 | |
| --- a/.gitignore | |
| +++ b/.gitignore | |
| @@ -1,3 +1,4 @@ | |
| sync/config | |
| sync/bin | |
| +sync/kubejoin.ps1 | |
| .vagrant/ | |
| diff --git a/Vagrantfile b/Vagrantfile | |
| index 5ce8c6f..339475f 100644 | |
| --- a/Vagrantfile | |
| +++ b/Vagrantfile | |
| @@ -29,7 +29,7 @@ Vagrant.configure(2) do |config| | |
| master.vm.network :private_network, ip:"10.20.30.10" | |
| master.vm.provider :virtualbox do |vb| | |
| master.vm.synced_folder "./sync", "/var/sync" | |
| - vb.memory = 2048 | |
| + vb.memory = 4096 | |
| vb.cpus = 2 | |
| end | |
| master.vm.provision :shell, privileged: false, path: "sync/master.sh" | |
| @@ -46,6 +46,7 @@ Vagrant.configure(2) do |config| | |
| vb.gui = false | |
| end | |
| winw1.vm.network :private_network, ip:"10.20.30.11" | |
| + winw1.vm.synced_folder ".", "/vagrant", disabled:true | |
| winw1.vm.synced_folder "./sync", "c:\\sync" | |
| ## Copy exe files into windows node | |
| @@ -59,8 +60,8 @@ Vagrant.configure(2) do |config| | |
| winw1.vm.provision :reload | |
| winw1.vm.provision "shell", path: "sync/containerd2.ps1", privileged: true | |
| - winw1.vm.provision "shell", path: "https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/PrepareNode.ps1", privileged: true, args: "-KubernetesVersion v1.21.0 -ContainerRuntime containerD" | |
| - #winw1.vm.provision "shell", path: "sync/prepjoin.ps1", privileged: true | |
| + winw1.vm.provision "shell", path: "forked/PrepareNode.ps1", privileged: true, args: "-KubernetesVersion v1.21.0 -ContainerRuntime containerD" | |
| + # winw1.vm.provision "shell", path: "sync/prepjoin.ps1", privileged: true | |
| winw1.vm.provision "shell", path: "sync/kubejoin.ps1", privileged: true | |
| # winw1.vm.provision "shell", path: "sync/docker.ps1", privileged: true | |
| diff --git a/build.sh b/build.sh | |
| index e70452d..69ed543 100755 | |
| --- a/build.sh | |
| +++ b/build.sh | |
| @@ -29,7 +29,7 @@ build_binaries () { | |
| ./build/run.sh make kubelet KUBE_BUILD_PLATFORMS=windows/amd64 | |
| ./build/run.sh make kube-proxy KUBE_BUILD_PLATFORMS=windows/amd64 | |
| echo "Copying files to sync" | |
| - cp -ar ./_output/dockerized/bin/windows/amd64/ ../sync/bin | |
| + cp -r ./_output/dockerized/bin/windows/amd64/ ../sync/bin | |
| } | |
| cleanup () { | |
| diff --git a/forked/PrepareNode.ps1 b/forked/PrepareNode.ps1 | |
| index 5c86337..b6d7b35 100644 | |
| --- a/forked/PrepareNode.ps1 | |
| +++ b/forked/PrepareNode.ps1 | |
| @@ -30,7 +30,7 @@ $ErrorActionPreference = 'Stop' | |
| function DownloadFile($destination, $source) { | |
| if (Test-Path -Path $destination) { | |
| - Write-Error("Skipping download to avoid overwriting, already found on disk..." | |
| + Write-Host("Skipping download to avoid overwriting, already found on disk...") | |
| return | |
| } | |
| Write-Host("Downloading $source to $destination") | |
| @@ -93,7 +93,7 @@ start-service rancher-wins | |
| mkdir -force C:\var\log\kubelet | |
| mkdir -force C:\var\lib\kubelet\etc\kubernetes | |
| mkdir -force C:\etc\kubernetes\pki | |
| -New-Item -path C:\var\lib\kubelet\etc\kubernetes\pki -type SymbolicLink -value C:\etc\kubernetes\pki\ | |
| +New-Item -force -path C:\var\lib\kubelet\etc\kubernetes\pki -type SymbolicLink -value C:\etc\kubernetes\pki\ | |
| $StartKubeletFileContent = '$FileContent = Get-Content -Path "/var/lib/kubelet/kubeadm-flags.env" | |
| $global:KubeletArgs = $FileContent.TrimStart(''KUBELET_KUBEADM_ARGS='').Trim(''"'') | |
| diff --git a/makefile b/makefile | |
| index e85d3d6..1243b4b 100644 | |
| --- a/makefile | |
| +++ b/makefile | |
| @@ -14,10 +14,12 @@ | |
| all: build-binaries vagrant-up | |
| -build-binaries: | |
| +1-build-binaries: | |
| chmod +x build.sh | |
| ./build.sh $(path) | |
| -vagrant-up: | |
| +2-vagrant-up: | |
| vagrant destroy -f && vagrant up | |
| - | |
| \ No newline at end of file | |
| + | |
| +3-e2e-test: | |
| + sonobuoy run --e2e-focus=... | |
| diff --git a/sync/config b/sync/config | |
| index 73f91b1..093f37c 100644 | |
| --- a/sync/config | |
| +++ b/sync/config | |
| @@ -1,7 +1,7 @@ | |
| apiVersion: v1 | |
| clusters: | |
| - cluster: | |
| - certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeE1EWXdOakF3TVRFMU1Gb1hEVE14TURZd05EQXdNVEUxTUZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBS2d0Ci9lalR6UXFxR3B0NzlGeG9kTkVSTkthODlqRDFoZ0ZuUGhDN1ZlRkI4dWJTK2d1eDJlN3hvSEt1dEV1WU1mRHYKbStmeENaeC9CWVZlazU3dTliMEVVaEJjTDQyWm9BTFl4eWhNVFB4cW0ydWRyeWNVV3Q4VHJHdTQxMS9LeEdVZApLNHNrbm9uZk1GMkJVVTJFRmhqU2FNVzdDNXBIRFpScUJlamsvV29VSFJpVzRsZkdjZ3UzdC9JQXgvQUJlNnFaCldRTnU5c0FrWmEvbjB5NXQrZXlKaFNZdlQ2T1RoYVhnbHhTYytQaC9TNkd6R21LRjFFa3h5L1FZVzgxYm12OG0KaFJoZGFFNGZaMS9LaStoaGc4Yk0zR0JCd3cybjRITVpwZEpOMEQrM2JzalFtTjl3Z3FuMklwTzJ5TldORTJWTwp4RzV5VkxSOEtKb0RnVFdnVGRjQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZIUTloemd0NWV2UkdNbWUzdnBXallEbC9zLy9NQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFCUTduQkhUMlg4dDhnLzBlRXRibFB2L3hXR2xPMkVSOGNGSFFRNmp2SmRwMmk0QVQveQpqcG90SjJTOC9HNkN4bzJUM3BsVUkrc0tQVVB1WmtTSGg5RFp2RWJmNC9FbmxOcThuSndLUHBHNWF0b1NGUGhVCk5Ta1Q2Mnc1U2VOdFE0bEZUcVBEM3hzdzJsQ1JpcVkxTEdpeER1Y3h1ekJXNy9MK0V6Tk9SckgvZ3NuSDZCV0kKVlh5a3ZTY2FNQnNsWFpyTmRJb3V3L2xKNjFQWEF5amxNdVZ0MHdSL3cwWU8zMk4zSVhpU0sxVmdpZW9CQ25LNwpidm8xUGlLbHB0NGNVYkozeDE5OWgxSDErbndjdDNRMEZjUmRUNjZaM0tJOVc0ZnpUWVFvQ21mWm5HbmZYOGNICldaMVAwQTFTSzRQcXJxanppS2JtOUpYK3ZMSVJOelQ0aEYrMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== | |
| + certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJeE1EWXdOekU0TXpreE5Gb1hEVE14TURZd05URTRNemt4TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTnhPCkNDemhib3o1NW5HY2FJYmlDNXpnMDBTdmwzWGxCVUo5eEdlV00yeXl5MVRnamhTbEhMTkhudERlK3FxanB5TTEKYk9NY2dkRHE0M0VzUzFtM0dvMWVmd1p4b2JGMlhsaWNwUHNvYWJtM2FLRDVsci9XSG8wemIyQ3dNOFNUeVhMTQpsZ3owYmtiZ1c2WnRBSmd4LytQYzRnVitJb3RNMnk3ekIxTVB3UVkxTWNPTVVRS1UrczhXWFp2eDVjcXl5VmVXCnZDWFhkbnFFWUFCeG5zRWdiaDhDdmZwSDRVNnozVWdYSy9HNGY1TmpuRk5FNVNYUVlQMk85MHJPbDJGbzU0SHgKWFR0RFZlUy8vS0ZGcXVqYXlRb1plVEw1YVRWMjVOOVNBbWpqbTFaSVpjbldEMm5aUnlHYUtJNGkxWmc0Rmx0LwpjWDlONzgxc0I4aXlIYWZNT2pzQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZQbHZ6N1dTOWI3RDNRcXhlSDVldTdWZU02QVJNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFDSlFiZzl6cTUrbGdhWElhaGNvbDBxNE9KMGhhck40Zkc5T1c5U3FORTRobm9EUnF0UApmQ3lQbkxuSkVoa3oxUG1iaXBFMGhCUUYzNUY5Q2E0RmJaNHBQWmo0R3dYWjBtQ2xWWUx3Rm5aZ3ROTUJiMHZiCnJRY2FpaU5lZ0Z3dDlyRGdXYVJuVGdrODd6R1JaSXhLODhsVDM3SmVPTVRUUHdrQ0xvTk5RdWJPb0MvdWZTVWQKdWRPeDV2bjlIQ1Jaa0M3U0VsS1Vvc1daN1hPb3lVZTNRbVh5c2J3WlhTclJ5WGFkNTFqQWpWbE5CQXRlN0dsSQpVcGF3NDErQXo5K0pFTERZaVhMMDhVT1JyeURWMnNyU0ZtenlEa1A0OXkvSUE1SDJIaGxIbTUyV09WY2ZUZ2lvCjczb2tYUDRqcDJ5QXhONjlNWHpLdENSdzROdmYzTVE5bCtoNgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== | |
| server: https://10.0.2.15:6443 | |
| name: kubernetes | |
| contexts: | |
| @@ -15,5 +15,5 @@ preferences: {} | |
| users: | |
| - name: kubernetes-admin | |
| user: | |
| - client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lJTDQreGFFOVdhRzh3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TVRBMk1EWXdNREV4TlRCYUZ3MHlNakEyTURZd01ERXhOVFZhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXp5QTdiUUxsNUo3UzFQMCsKOEI0VkM5YjBJWWtXY0tUejhjUU9mS084bmlITWVteVYxcDRUVU9QUC9FNEpDZmhWUjJuQlMrTFBlVHc5a2IycgoyWG1CcGpMblFXcEFsdDZSRnphZzRLUSs3QWVVbzkvWXI3ekVPaDZhS2xNQlNPdmYydFZVSjhPRGt5cHBTeEU3CnFnSVlIa2NkQjhtQ1BmVmxYRXJoTWRkUFBoUG9JMWI2ZURPS3VuUHFFYzhGT2pnRU1LOUlPbCtMWTVHMTBQb3gKOENsRkp2VmE2WkNsUDg1Q0REekVYV3ZYRTF1TGRUUXJNbHFGeFpYc1ZqcGFHc1RBcEtrclBIZ21ZSU43eVJNUQo3dXVLTi9ocE85MGE5M1BPU2UvTmJMM0tTcWlybVZVUVYyNjRCQUd2czh6dWwzcFc5TnlVQndHZDViNmVLY3g5CjZzd2pwd0lEQVFBQm8wZ3dSakFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0h3WURWUjBqQkJnd0ZvQVVkRDJIT0MzbDY5RVl5WjdlK2xhTmdPWCt6Lzh3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFCV3hHZWdxNkV1eVovbVV6WVZQeXM3Z1lkcE9zNWExZlhvSCt6dzd6aGZNYmJ1VWp6NHpyWFRvClZoZEtmQVk1OGswaEw5M1U2OHBOOEgrNWpEMVN0UDJuL0c5TE5ibmxSNU5zME5FWWt2K3hvREwvbzRiS1VmZkwKakNYenJ4VXRtcll0ZzI0Rmd1eFVMVWR0UGRJcHA0b2EzRXhmOXd2dGNjUnh1OXlFY1JNaUw2dXRkMFJnd0tVYQpnbUhEanY1Q1MxRGZFazJhM3VTdTJQRmxnNXc3QWo5OEN3cWJsUjBDV29hV1R2VHhDT3VHMUJITWRzVUsxenJKCnNhVDRjaVZYSlVOY3R4UytzeUdhM1pBcWZyVm9sL1NxK2RmUTlZdnlEc1BEalJoN0xaS1ptQ05QNXVQbXc4UjIKVzdKRkEyMHlNRlJicHZRNUdLRlM2MzNPWjFPNE9SST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= | |
| - client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBenlBN2JRTGw1SjdTMVAwKzhCNFZDOWIwSVlrV2NLVHo4Y1FPZktPOG5pSE1lbXlWCjFwNFRVT1BQL0U0SkNmaFZSMm5CUytMUGVUdzlrYjJyMlhtQnBqTG5RV3BBbHQ2UkZ6YWc0S1ErN0FlVW85L1kKcjd6RU9oNmFLbE1CU092ZjJ0VlVKOE9Ea3lwcFN4RTdxZ0lZSGtjZEI4bUNQZlZsWEVyaE1kZFBQaFBvSTFiNgplRE9LdW5QcUVjOEZPamdFTUs5SU9sK0xZNUcxMFBveDhDbEZKdlZhNlpDbFA4NUNERHpFWFd2WEUxdUxkVFFyCk1scUZ4WlhzVmpwYUdzVEFwS2tyUEhnbVlJTjd5Uk1RN3V1S04vaHBPOTBhOTNQT1NlL05iTDNLU3Fpcm1WVVEKVjI2NEJBR3ZzOHp1bDNwVzlOeVVCd0dkNWI2ZUtjeDk2c3dqcHdJREFRQUJBb0lCQUN2STVvY08yOFpPaE1jZAptZFpzcFlwUk1GNStlazNwc04vazBDTXRBY3h6M0tQc25HZzRGbUU5SjFSd3NweDI4S0FlRFF5YnI3d3pMZGpIClBiTEZhdERWWmVtQUtwTTZEWFhZeUgxMGV4Q3VNWS9LM0NXYVErajlXeDJqV2x3dDhLNXo5a3hKbW1EYjBGSmMKSEQ2K0hwY1g5VjBXRGdCSEJkeFN2L1FuVGNzVFRHNUNQZldSRUg4aHhsbnZEeVNLUTM1OXVnVTgveS8xcGxuRgpOOU1ldU5WbzBtNTdxZmF0Y0NCMEYveXZvdjhhMnZPM2VpTDJMYldacC9RWmNkM0l2ck9yWXp2SVZ5c0R6M3U2CkFCejhQSWJVZ08vc3VjaWJ6d05NaGNMNmJiYzdFN1Z5R1lWQWQ1dXkwY25FVENyV1hRaDVDZnpaT3ZJcHNVOWUKUFpEU21BRUNnWUVBMFhPWi9KMysxVm55d3MxeUhZN0ZWQ1JsS2g0eTMxKzB0Y2g1TzI2RUZ5alVQSzBmbUROawp3YXZnQXNkZWFHayttVVU1NDNrVnlnKzU3Qk1xVVlqeEp2cnJYeW5UTU43WGhRQXJucUU0QmhRZHgzbEh0cndCCjhpMXN0VWdtMmY4S2ZRakx0RFlHNzdXT2JEc2o5TjM4cVorUzNlYU11QStsZE5wazFtV2tIZ0VDZ1lFQS9TaFEKNDRycUlPRjZsYW1aUEU3clJ2YzlEL21HOHhvMDZpcGRPNjd4dDliWndlVFFyOSsrQ3ptcUdVVXlwMWV6dXBnQQowd0dEWms2bWtkYm1yZTNEalUvUzRnRHB0OVpsU3hlRlZEMUpNMHUySDNFL2IzRkM3bjdUYXpzcXJlUG5BYWNDCmhnTzZzcHdXc2poYWhIQ0hRRlQ5cnNaQ2F5YWRqTzBicDJPK2thY0NnWUJqSU13clEvZDhzREoxd2RnVlp5RzcKUGZKbktaMjRIRXFoa2p6V1JPcmRMeVNyaHVBaUg0aTdKSVpEcW1uakRwUmk0K0dPNkJySTVBS0JXVnk0OUEvMQorK0Z6eTQ2NVhXNHc4ekN4eGVtRzd2UmRHT2c0OHVnVTN5ekk2MW4vNkhYbFVVbGZoQVpxWXNvQ0xVZEtOOW5CCnlkVXZrbExkTmdKL3VIRHJDM1hPQVFLQmdIQXhFY2dGcEVUMktGRnpYQW15SCtyUFh5eFpOVWsvYi92bTBuTEUKMFRMYjhKMVJQbnJ5K1ZJWU9CNEM0TFB3MWlIM2cwWUFBYSt4WTNoMmVMelVCam4yQ2t0R2hFMklvbE5wRlJtRQpINUN3R1FKT09nSzFleWdlNUtzOUNXa08reTFzU2w0Q0FSZHV2VkEyVVVjb1o0aEhJalgyZnpEbGFDVXdYM1VMCmEwVTVBb0dBZjBSamx4WURHRHJ4bWdGbWZvaTVJTkd3N0VsV2IrYmxYbnBUUjQwZU1LUGlkdjQ5YnpOd0lNdW4KditkbldxaEdrK2dRaGNvR2gvQ3Vka1EwUGFLcWNrOG5MQjdYazBnNXJsUXlyNHRjdW0veXVIYldHZ3JxSy9ybAowc25VVk1hSVUycXNEM2NiUUtEdEF4aVUybC9wak9UUEZyWWVHSFNaUWt6K2NIZDc0ek09Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== | |
| + client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lJY0JVeVdlbjJvaEF3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TVRBMk1EY3hPRE01TVRSYUZ3MHlNakEyTURjeE9ETTVNVGRhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXY3RitCNjlRTVd0QkhJblcKb0xxcU0ySGJSMC90YTdLcTNTYlYyeGw1Ukg4VjVpOElKaUZURzBYV3AxSG1ES3VJTE1jNHVoM2pIdlVtQ0FVRAo3Q0hvS1lNZlVaeTluVlZlT3pXTHRnbTQ2OENCb1JvM3A0M0RFSEZtb0NpQ0piM3oyak9NZEo1a0ZSYTFZTzVFCllTUytWWHNqcWMvdkdUS1Bld2gvK1lWY28zcm1OUEZRalAwbmZ0MHd0WU91bFBFSC93MGJEb3VWRTV0S3BMS0cKZGt4SE1OYW1KU0h4S0NuS04zamdCYW9pZmJYSXp1SlN4UUZzaFB2MkRSNTVXOG9WcE9Ba2JGMTdaNzgzcGFnLwpYQVdVaHNldzVQSUJaQUFEczJpeVdsOWdUKzJ5VlI3cWRkK0dPcnE1bmFOWHh2emRNM2ljRDZVUnUvVkVreUJpCnd1ZTlxd0lEQVFBQm8wZ3dSakFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0h3WURWUjBqQkJnd0ZvQVUrVy9QdFpMMXZzUGRDckY0Zmw2N3RWNHpvQkV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFNUWcxbE1iUzlKenNVZlRSOGRDTm44Wm9VTGVsWDUyR2JOSTg1Smg0S3BRQjlqRldWTGY0L0RvClVmdkF6MENxNWVoeGlkRzZueW43bzBOVTA4ekFnV1FtYnVmZktUbmphVERpUlhtWnhnSURJN3B1NXVQVDNvTDAKNXU4RS9YaXFwY3VuUXp0cEZvcXQ2NkhnQlBHeTh3NE5rOUFiSjVsZnU3K21NQzdaR0dFZEdqcVY3enRCNzc0Ywpha0Q3QWpRUWhCdCtiQTA5LzZGNUxkZTZMZEExcHdEdUdpUVkrb3ZyZURXdWlyT0kyNDFKeEJIVHJnWVNWbDlOCnhUbk5NRVFzSHJrQnBPc25VaVZSWm9DVHlpWU05eU1zVmt5eFpmTE8xdGNOZW9DcnlGMkdVMXdDZXF0VzV6ZW8KMGU3aTh2M3pqUkNYWTJYcyt4c0dnQUJSVjVubkZvcz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= | |
| + client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdjdGK0I2OVFNV3RCSEluV29McXFNMkhiUjAvdGE3S3EzU2JWMnhsNVJIOFY1aThJCkppRlRHMFhXcDFIbURLdUlMTWM0dWgzakh2VW1DQVVEN0NIb0tZTWZVWnk5blZWZU96V0x0Z200NjhDQm9SbzMKcDQzREVIRm1vQ2lDSmIzejJqT01kSjVrRlJhMVlPNUVZU1MrVlhzanFjL3ZHVEtQZXdoLytZVmNvM3JtTlBGUQpqUDBuZnQwd3RZT3VsUEVIL3cwYkRvdVZFNXRLcExLR2RreEhNTmFtSlNIeEtDbktOM2pnQmFvaWZiWEl6dUpTCnhRRnNoUHYyRFI1NVc4b1ZwT0FrYkYxN1o3ODNwYWcvWEFXVWhzZXc1UElCWkFBRHMyaXlXbDlnVCsyeVZSN3EKZGQrR09ycTVuYU5YeHZ6ZE0zaWNENlVSdS9WRWt5Qml3dWU5cXdJREFRQUJBb0lCQUhUWXNFWG02eTcwZmIvegpsVXhyL0F0Ti91ZTlKSytkUE9HSkpwcGpNTFE3OHhGWVlkTThSUGcrM2RVbjZ0NldRRzlyRUgwQ2Nzc1FDNXFmCjFBQS91dEJ6Q01ncWpybzBxemZVTDlGS285bXdnbE85TTJlQzFnQlQzNGFJcXF4dTJSR01rblVUaDFZRGZaUVUKS01JK0wzYlRsSzJSL2VDU0hUdVZ0c3hXS2wzTEllYmUzWnAxVzEwTGxkcXJJMEo2b3hTRVQ2N29hNS81S2NMWgphMmZ3U1dxaDRPb3dpc1Myd3VZWG1BUGpCdVVDUC9VWG1scFFzRXREM3lQNzdVSXRiZzh5cmh3TXoyY3NzN3MxCmZqdTN1NG5PMlFvcHB0VmdxU1R6akxMZms3UGJpQllmS21UQjhvSWFSVVJNTDRKY0ZQRnBHS0tMOGw1VzFVcGwKYkoxaWpDRUNnWUVBNStVN1dWL2Rva3JxMk9tc010d2Z2VzFSNmkwN2hUTkVVV0czRGx2TGdScXNueU9pRmc5UAprNDNSZFY1MWJ4dGVrbGVFcUN5emhoYU1XK1UrYzNpVjErUzRsYU14WmZmK0J2Mzl5R0dqdVB3UDZ6U1B3dmlVCldXWDdSekhqdml2d2pDcTEyZWFDM0UrWkJCZXFMTE5YSDNxNEUyRlI1UHBYRHZRTHlLdUFXMzhDZ1lFQTA1NTYKSW1LMEZGTHhydnlEVjZVL1JoMU8vY3hFWWZPaTl5Sk9HTGFXRjQ1ams3dDhTV09rQUdRNUU4ai9LUmVXS1hseAo2NWE0bnQwSzdMaThKMjJVeGxpNEpaN1ZOMFhLenorM0JBNWRHRFRCQ0lJemJsV2lydzlXektiYWZGeFYrQXBzCndLbFRpd0VldlZuRnJCS3REUktwSktsNStsSW9GKzRkd21VRzQ5VUNnWUFSUnlnajRadXU0dXdhbTFhRU41aDUKMGJKZncxMEM4SzN2Ymx0b1MzaWZOdkNUcnVEOXljaEJFemovQ0xteFBKWFFTNHNMeU1EYmhjU1JlRVF0OEZjaAp6ZDNlOEZqVzR5SmZQUDl5dGF1d05iK3Q0NjJ1ZGp6L2FEVFB1aXpnMTM5Rndrem9YbDl6c002UzJueUlkaGhRCnRTRVArSmxVZVQ2UlU2ZXBIUFlrV3dLQmdGWDB2UzlTWUVzUkZkSTZCeStHazVqck5yYW9UZTVyZy9wV0dOcTQKNzJaS0UvQmg2eTMwSngxeG1DMk5LdmVKK1JpSGw5cFZzay8xQVFiK1VvN0JWL2pvK0lOdmJMT3l5Wm85Q3gyKwpwOW01TTk4ODQ1OGhjWjhoMytQb3NqNXBVeElaU2V0SDNBTk9SU29zV0xwNEs0cHYxZnhxU24xKytZSWUyaituCndaQ3hBb0dBVThZTmpsR2VWbGN1SDIraUFNZ3Q4TlZSL0xucC9NTjVSbkpQN3dISFVSbXNXMnBLMzRQRzRuVDcKZVFtSlNEc2Zrd2c4Z3JMNWVMNklIM09KYTMxYUJZR2dwR2tJaldqSDhnWklJZVBrQUQxUHJQWjhpVThGcWZISwpwcGNXM0NZTlZTMUhUcjI0OFByV0RscFFNbUExZTZRYzR3VFhlRkpiM2FPa1Y3QUU2ZEE9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== | |
| diff --git a/sync/containerd1.ps1 b/sync/containerd1.ps1 | |
| index 2a1b937..e225c45 100644 | |
| --- a/sync/containerd1.ps1 | |
| +++ b/sync/containerd1.ps1 | |
| @@ -33,4 +33,8 @@ Write-Output "### Running 'Install-Containerd.ps1'" | |
| PowerShell "C:\k\Install-Containerd.ps1" | |
| -Write-Output "### DONE with 'containerd1.ps1'" | |
| \ No newline at end of file | |
| +Write-Output "### DONE with 'containerd1.ps1'" | |
| + | |
| +# To avoid the "crictl.exe not on the path error, we add containerd permanantly to the pathhhhh" | |
| +$env:path += ";C:\Program Files\containerd" | |
| +[Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine) | |
| \ No newline at end of file | |
| diff --git a/sync/kubejoin.ps1 b/sync/kubejoin.ps1 | |
| index 8afb806..32634f3 100644 | |
| --- a/sync/kubejoin.ps1 | |
| +++ b/sync/kubejoin.ps1 | |
| @@ -1 +1,5 @@ | |
| -kubeadm join 10.0.2.15:6443 --cri-socket "npipe:////./pipe/containerd-containerd" --token f9iru4.3mms9vf9e4ojp4h3 --discovery-token-ca-cert-hash sha256:24af11aa5bba5660305f6f47f0c360c3babdd4dcd102f20ad56b00b8a2185b7e | |
| +# To avoid the "crictl.exe not on the path error, we add containerd permanantly to the pathhhhh" | |
| +$env:path += ";C:\Program Files\containerd" | |
| +[Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine) | |
| + | |
| +kubeadm join 10.0.2.15:6443 --cri-socket "npipe:////./pipe/containerd-containerd" --token x3sloc.76v9vmngy4iqqbae --discovery-token-ca-cert-hash sha256:ab028a3edaf4df32d47fff414bf5a534bb3c53288ba3f6f86b61b6342df34aa8 | |
| diff --git a/sync/master.sh b/sync/master.sh | |
| index da14895..1977a91 100644 | |
| --- a/sync/master.sh | |
| +++ b/sync/master.sh | |
| @@ -95,6 +95,12 @@ kubectl apply -f /tmp/kube-flannel.yml | |
| curl -s -L https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/kube-proxy.yml | sed 's/VERSION/v1.21.0/g' | kubectl apply -f - | |
| kubectl apply -f https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-overlay.yml | |
| +######## MAKE THE JOIN FILE FOR WINDOWS ########## | |
| rm -f /var/sync/kubejoin.ps1 | |
| -kubeadm token create --print-join-command > /var/sync/kubejoin.ps1 | |
| +cat << EOF > /var/sync/kubejoin.ps1 | |
| +$env:path += ";C:\Program Files\containerd" | |
| +[Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine) | |
| +EOF | |
| +kubeadm token create --print-join-command >> /var/sync/kubejoin.ps1 | |
| + | |
| sed -i 's#--token#--cri-socket "npipe:////./pipe/containerd-containerd" --token#g' /var/sync/kubejoin.ps1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment