From f6499ebb00657aae0650590f83014e5c4c169074 Mon Sep 17 00:00:00 2001 From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com> Date: Mon, 11 Jul 2022 13:13:11 -0700 Subject: [PATCH 1/3] update npm win yaml --- npm/examples/windows/azure-npm.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/npm/examples/windows/azure-npm.yaml b/npm/examples/windows/azure-npm.yaml index d892e95bb8..458dc22734 100644 --- a/npm/examples/windows/azure-npm.yaml +++ b/npm/examples/windows/azure-npm.yaml @@ -52,7 +52,7 @@ roleRef: apiVersion: apps/v1 kind: DaemonSet metadata: - name: azure-npm + name: azure-npm-win namespace: kube-system labels: app: azure-npm @@ -83,7 +83,7 @@ spec: hostNetwork: true containers: - name: azure-npm - image: acnpublic.azurecr.io/azure-npm:v26-windows-amd64 + image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.29 command: ["powershell.exe"] args: ['.\setkubeconfigpath.ps1', ';', 'powershell.exe', '.\npm.exe', "start", '--kubeconfig=.\kubeconfig'] resources: @@ -141,7 +141,7 @@ data: "EnablePprof": true, "EnableHTTPDebugAPI": true, "EnableV2NPM": true, - "PlaceAzureChainFirst": false, + "PlaceAzureChainFirst": true, "ApplyIPSetsOnNeed": false }, "Transport": { @@ -150,5 +150,3 @@ data: "ServicePort": 9001 } } - - From ee3452f94914549e04f3c04077fcd7744779ffd0 Mon Sep 17 00:00:00 2001 From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com> Date: Mon, 11 Jul 2022 13:15:07 -0700 Subject: [PATCH 2/3] bump linux image --- npm/azure-npm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/azure-npm.yaml b/npm/azure-npm.yaml index ad3efae8d8..1f40364905 100644 --- a/npm/azure-npm.yaml +++ b/npm/azure-npm.yaml @@ -79,7 +79,7 @@ spec: operator: Exists containers: - name: azure-npm - image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.28 + image: mcr.microsoft.com/containernetworking/azure-npm:v1.4.29 resources: limits: cpu: 250m From 2d3315fc799bed58fb8f51e4896a86ab313ac9b1 Mon Sep 17 00:00:00 2001 From: Hunter Gregory <42728408+huntergregory@users.noreply.github.com> Date: Mon, 11 Jul 2022 15:16:58 -0700 Subject: [PATCH 3/3] add node selector for linux npm yaml --- npm/azure-npm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/npm/azure-npm.yaml b/npm/azure-npm.yaml index 1f40364905..59efff67ce 100644 --- a/npm/azure-npm.yaml +++ b/npm/azure-npm.yaml @@ -106,6 +106,8 @@ spec: - name: azure-npm-config mountPath: /etc/azure-npm hostNetwork: true + nodeSelector: + kubernetes.io/os: linux volumes: - name: log hostPath: