Fix windows cni-plugin fv to use correct apiserver port number (#8955)

projectcalico · Jun 28, 2024 · e592387 · e592387
1 parent 122aca9
commit e592387
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/process/testing/winfv-cni-plugin/aso/config-minikube b/process/testing/winfv-cni-plugin/aso/config-minikube
@@ -2,7 +2,7 @@ apiVersion: v1
 clusters:
 - cluster:
     certificate-authority: c:\k\minikube\ca.crt
-    server: https://{{.Env.LINUX_PIP}}:32769
+    server: https://{{.Env.LINUX_PIP}}:{{.Env.APISERVER_PORT}}
   name: minikube
 contexts:
 - context:

diff --git a/process/testing/winfv-cni-plugin/aso/create-minikube-cluster.sh b/process/testing/winfv-cni-plugin/aso/create-minikube-cluster.sh
@@ -20,9 +20,13 @@ set -x
 
 LINUX_PIP=$1
 
-curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
+curl -LO https://github.com/kubernetes/minikube/releases/download/v1.33.0/minikube-linux-amd64
 sudo install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-amd64
 
 minikube start  --listen-address=0.0.0.0 --apiserver-ips=$LINUX_PIP
 
-docker port minikube | grep 8443
+PORT_INFO=$(docker port minikube | grep 8443)
+
+port=$(echo $PORT_INFO | grep -oE '[0-9]{5}' | tail -1)
+echo "apiserver listening at port $port"
+echo $port > $HOME/port_info
diff --git a/process/testing/winfv-cni-plugin/aso/run-fv-cni-plugin.ps1 b/process/testing/winfv-cni-plugin/aso/run-fv-cni-plugin.ps1
@@ -1,11 +1,12 @@
 Param(
   [parameter(Mandatory = $true)] $Backend,
-  [parameter(Mandatory = $false)] $LinuxPIP="{{.Env.LINUX_PIP}}"
+  [parameter(Mandatory = $false)] $LinuxPIP="{{.Env.LINUX_PIP}}",
+  [parameter(Mandatory = $false)] $LinuxAPIServerPort="{{.Env.APISERVER_PORT}}"
 )
 
 #Setting up Environment Variable
 Set-Item -Path env:KUBECONFIG -Value "C:\\k\\config"
-Set-Item -Path env:KUBERNETES_MASTER -Value "https://${LinuxPIP}:32769"
+Set-Item -Path env:KUBERNETES_MASTER -Value "https://${LinuxPIP}:${LinuxAPIServerPort}"
 Set-Item -Path env:ETCD_ENDPOINTS -Value "http://${LinuxPIP}:2389"
 Set-Item -Path env:BIN -Value "C:\\k"
 Set-Item -Path env:PLUGIN -Value "calico"

diff --git a/process/testing/winfv-cni-plugin/aso/setup-fv.sh b/process/testing/winfv-cni-plugin/aso/setup-fv.sh
@@ -29,6 +29,9 @@ function setup_minikube_cluster() {
   ${MASTER_CONNECT_COMMAND} sudo chmod +x /home/winfv/create-minikube-cluster.sh
   ${MASTER_CONNECT_COMMAND} bash /home/winfv/create-minikube-cluster.sh ${LINUX_PIP}
 
+  APISERVER_PORT=$(${MASTER_CONNECT_COMMAND} cat /home/winfv/port_info)
+  export APISERVER_PORT
+
     #create etcd manually with http protocol
   LOCAL_IP_ENV=${LINUX_PIP}
   ETCD_CONTAINER=quay.io/coreos/etcd:v3.4.6