diff --git a/sync/shared/kubejoin.ps1 b/sync/shared/kubejoin.ps1 index 5ce663f..3889e41 100644 --- a/sync/shared/kubejoin.ps1 +++ b/sync/shared/kubejoin.ps1 @@ -1,3 +1,3 @@ $env:path += ";C:\Program Files\containerd" [Environment]::SetEnvironmentVariable("Path", $env:Path, [System.EnvironmentVariableTarget]::Machine) -kubeadm join 10.20.30.10:6443 --cri-socket "npipe:////./pipe/containerd-containerd" --token fewn1r.evy8krm0f4xvqcac --discovery-token-ca-cert-hash sha256:f87ed7d225085d86c5b93b7dce2dc20d38aacea803d7af3f158ddf7804720dec +kubeadm join 10.20.30.10:6443 --cri-socket "npipe:////./pipe/containerd-containerd" --token 08c8xy.6o8do67wikgtl0ew --discovery-token-ca-cert-hash sha256:6f5e08f8c38f688f78845108a59a5e5fb96ebbdc5b135e2bd93c7e4dfe9fe410 diff --git a/sync/windows/containerd1.ps1 b/sync/windows/containerd1.ps1 index 20876aa..509a0a8 100644 --- a/sync/windows/containerd1.ps1 +++ b/sync/windows/containerd1.ps1 @@ -27,7 +27,7 @@ $ProgressPreference = 'SilentlyContinue' Set-Location 'C:\k' -Write-Output "# Running 'Install-Containerd.ps1'" +Write-Output "### Running 'forked/Install-Containerd.ps1' ~ note we'll have to re run this again after reboot !!!" # Our own version of install-containerd that omits the weird nat cni network thing PowerShell "C:/forked/Install-Containerd.ps1" diff --git a/sync/windows/containerd2.ps1 b/sync/windows/containerd2.ps1 index 4f29b88..6d01d5b 100644 --- a/sync/windows/containerd2.ps1 +++ b/sync/windows/containerd2.ps1 @@ -13,6 +13,10 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. #> + +Write-Output "Rerunning containerd installation..." +PowerShell "C:/forked/Install-Containerd.ps1" + Write-Output "###############################" Write-Output "STARTING with 'containerd2.ps1'"