From e35b2e1622f3039a70956d4173faaceb067bc613 Mon Sep 17 00:00:00 2001 From: Zhecheng Li Date: Thu, 24 Aug 2023 04:11:57 +0800 Subject: [PATCH] Fix kube-proxy start.ps1 (#342) To avoid ConfigMap mount reset, a copy of kubeconfig.conf should be used as kube-proxy.exe's arg. Signed-off-by: Zhecheng Li --- hostprocess/calico/kube-proxy/start.ps1 | 6 +++--- hostprocess/flannel/kube-proxy/start.ps1 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hostprocess/calico/kube-proxy/start.ps1 b/hostprocess/calico/kube-proxy/start.ps1 index 46dffbfe..a44c3c65 100644 --- a/hostprocess/calico/kube-proxy/start.ps1 +++ b/hostprocess/calico/kube-proxy/start.ps1 @@ -53,15 +53,15 @@ $PlatformSupportDSR = $true # https://github.com/kubernetes/kubernetes/blob/9f0f14952c51e7a5622eac05c541ba20b5821627/cmd/kubeadm/app/phases/addons/proxy/manifests.go Write-Host "Write files so the kubeconfig points to correct locations" mkdir -force /var/lib/kube-proxy/ -((Get-Content -path $env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig.conf -Raw) -replace '/var',"$($env:CONTAINER_SANDBOX_MOUNT_POINT)/var") | Set-Content -Path $env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig.conf -cp $env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig.conf /var/lib/kube-proxy/kubeconfig.conf +((Get-Content -path $env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig.conf -Raw) -replace '/var',"$($env:CONTAINER_SANDBOX_MOUNT_POINT)/var") | Set-Content -Path $env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig-win.conf +cp $env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig-win.conf /var/lib/kube-proxy/kubeconfig.conf # Build up the arguments for starting kube-proxy. $argList = @(` "--hostname-override=$env:NODENAME", ` "--v=4",` "--proxy-mode=kernelspace",` - "--kubeconfig=$env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig.conf"` + "--kubeconfig=$env:CONTAINER_SANDBOX_MOUNT_POINT/var/lib/kube-proxy/kubeconfig-win.conf"` ) $extraFeatures = @() diff --git a/hostprocess/flannel/kube-proxy/start.ps1 b/hostprocess/flannel/kube-proxy/start.ps1 index 99f4ec54..aed558bf 100644 --- a/hostprocess/flannel/kube-proxy/start.ps1 +++ b/hostprocess/flannel/kube-proxy/start.ps1 @@ -52,8 +52,8 @@ function GetSourceVip($NetworkName) # https://github.com/kubernetes/kubernetes/blob/9f0f14952c51e7a5622eac05c541ba20b5821627/cmd/kubeadm/app/phases/addons/proxy/manifests.go Write-Host "Write files so the kubeconfig points to correct locations" mkdir -force /var/lib/kube-proxy/ -((Get-Content -path $env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig.conf -Raw) -replace '/var',"$($env:CONTAINER_SANDBOX_MOUNT_POINT)/var") | Set-Content -Path $env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig.conf -cp $env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig.conf /var/lib/kube-proxy/kubeconfig.conf +((Get-Content -path $env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig.conf -Raw) -replace '/var',"$($env:CONTAINER_SANDBOX_MOUNT_POINT)/var") | Set-Content -Path $env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig-win.conf +cp $env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig-win.conf /var/lib/kube-proxy/kubeconfig.conf Write-Host "Finding sourcevip" $vip = GetSourceVip -NetworkName $env:KUBE_NETWORK @@ -64,7 +64,7 @@ $arguements = "--v=6", "--feature-gates=WinOverlay=true", "--proxy-mode=kernelspace", "--source-vip=$vip", - "--kubeconfig=$env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig.conf" + "--kubeconfig=$env:CONTAINER_SANDBOX_MOUNT_POINT/mounts/var/lib/kube-proxy/kubeconfig-win.conf" $exe = "$env:CONTAINER_SANDBOX_MOUNT_POINT/kube-proxy/kube-proxy.exe " + ($arguements -join " ")