remove windows 2025 build from PR

.pipelines/pipeline.yaml

@@ -208,11 +208,6 @@ stages:
  name: azure-ipam
  os: windows
  os_version: ltsc2022
- cni_dropgz_windows2025_amd64:
- arch: amd64
- name: cni-dropgz
- os: windows
- os_version: ltsc2022-KB5035857
  cni_linux_amd64:
  arch: amd64
  name: cni
@@ -255,11 +250,6 @@ stages:
  name: cns
  os: windows
  os_version: ltsc2022
- cns_windows2025_amd64:
- arch: amd64
- name: cns
- os: windows
- os_version: win2025
  ipv6_hp_bpf_linux_amd64:
  arch: amd64
  name: ipv6-hp-bpf
@@ -375,11 +365,11 @@ stages:
  platforms: linux/amd64 linux/arm64 windows/amd64
  cni_dropgz:
  name: cni-dropgz
- os_versions: ltsc2019 ltsc2022 ltsc2022-KB5035857
+ os_versions: ltsc2019 ltsc2022
  platforms: linux/amd64 linux/arm64 windows/amd64
  cns:
  name: cns
- os_versions: ltsc2019 ltsc2022 win2025
+ os_versions: ltsc2019 ltsc2022
  platforms: linux/amd64 linux/arm64 windows/amd64
  ipv6_hp_bpf:
  name: ipv6-hp-bpf

Makefile

@@ -22,8 +22,6 @@ GOOSES ?= "linux windows" # To override at the cli do: GOOSES="\"darwin bsd\""
 GOARCHES ?= "amd64 arm64" # To override at the cli do: GOARCHES="\"ppc64 mips\""
 ltsc2019 = "10.0.17763.4010"
 ltsc2022 = "10.0.20348.643"
-ltsc2022-KB5035857 = "10.0.26100.1"
-win2025 = "10.0.26100.1"
 
 # Windows specific extensions
 # set these based on the GOOS, not the OS

cni/network/invoker_cns.go

@@ -173,9 +173,9 @@ func (invoker *CNSIPAMInvoker) Add(addConfig IPAMAddConfig) (IPAMAddResult, erro
  }
 
  // Add secondary interface info from podIPInfo to ipamAddResult
+ info.hostSubnet = response.PodIPInfo[i].HostPrimaryIPInfo.Subnet
  info.hostPrimaryIP = response.PodIPInfo[i].HostPrimaryIPInfo.PrimaryIP
  info.hostGateway = response.PodIPInfo[i].HostPrimaryIPInfo.Gateway
- logger.Info("vnet ip and gateway", zap.String("vnet ip", info.hostPrimaryIP), zap.String("vnet gateway", info.hostGateway))
 
  if err := configureSecondaryAddResult(&info, &addResult, &response.PodIPInfo[i].PodIPConfig, key); err != nil {
  return IPAMAddResult{}, err

cns/Dockerfile

@@ -28,9 +28,6 @@ FROM mcr.microsoft.com/windows/servercore@sha256:6fdf140282a2f809dae9b13fe441635
 # intermediate for win-ltsc2022
 FROM mcr.microsoft.com/windows/servercore@sha256:45952938708fbde6ec0b5b94de68bcdec3f8c838be018536b1e9e5bd95e6b943 as ltsc2022
 
-# intermediate for win2025
-FROM mcr.microsoft.com/windows/servercore:ltsc2022-KB5035857-amd64 as win2025
-
 FROM ${OS_VERSION} as windows
 COPY --from=builder /azure-container-networking/cns/kubeconfigtemplate.yaml kubeconfigtemplate.yaml
 COPY --from=builder /azure-container-networking/npm/examples/windows/setkubeconfigpath.ps1 setkubeconfigpath.ps1

cns/middlewares/k8sSwiftV2.go

@@ -204,8 +204,7 @@ func (k *K8sSWIFTv2Middleware) getIPConfig(ctx context.Context, podInfo cns.PodI
  NICType: nicType,
  SkipDefaultRoutes: false,
  HostPrimaryIPInfo: cns.HostIPInfo{
- Gateway: interfaceInfo.GatewayIP,
- PrimaryIP: interfaceInfo.PrimaryIP,
+ Gateway: interfaceInfo.GatewayIP,
  },
  }
  }

network/network_windows.go

@@ -304,7 +304,6 @@ func (nm *networkManager) configureHcnNetwork(nwInfo *EndpointInfo, extIf *exter
 
  // Populate subnets.
  for _, subnet := range nwInfo.Subnets {
- logger.Info("NextHop is", zap.String("NextHop", subnet.Gateway.String()))
  hnsSubnet := hcn.Subnet{
  IpAddressPrefix: subnet.Prefix.String(),
  // Set the Gateway route