From 6f13751c6e7256a774bd78785f9394ea940cf2e7 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Mon, 11 Oct 2021 09:52:34 -0700 Subject: [PATCH 1/8] [feat] making azure-cns-windows yaml --- cns/azure-cns-windows.yaml | 98 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 cns/azure-cns-windows.yaml diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml new file mode 100644 index 0000000000..727beeca8c --- /dev/null +++ b/cns/azure-cns-windows.yaml @@ -0,0 +1,98 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: windows-daemonset +spec: + selector: + matchLabels: + app: windows-pod + template: + metadata: + labels: + app: windows-pod + spec: + securityContext: + windowsOptions: + hostProcess: true + runAsUserName: "NT AUTHORITY\\SYSTEM" + hostNetwork: true + containers: + - name: win-container + image: acnpublic.azurecr.io/azure-cns-win:v1.4.12-43-g21f203db8-dirty + imagePullPolicy: Always # Change to IfNotPresent after development + command: + ["%CONTAINER_SANDBOX_MOUNT_POINT%/usr/local/bin/azure-cns.exe"] + args: + [ + "-cns-url", + "tcp://$(CNSIpAddress):$(CNSPort)", + "-log-target", + "$(CNSLogTarget)", + "-log-location", + "$(CNSLogDirectory)", + "-store-file-path", + "$(CNSStoreFilePath)", + "-config-path", + "%CONTAINER_SANDBOX_MOUNT_POINT%$(CNS_CONFIGURATION_PATH)", + ] + volumeMounts: + - name: log + mountPath: /k + - name: cns-config + mountPath: etc/azure-cns + ports: + - containerPort: 10090 + env: + - name: CNSIpAddress + value: "127.0.0.1" + - name: CNSPort + value: "10090" + - name: CNSLogTarget + value: "stdoutfile" # Change to stdoutfile once hostProcess works + - name: CNSLogDirectory + value: "C:\\k" + - name: CNSStoreFilePath + value: "C:\\k\\" + - name: CNS_CONFIGURATION_PATH + value: "etc\\azure-cns\\cns_config.json" + - name: NODENAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + volumes: + - name: log + hostPath: + path: /k + type: Directory + - name: cns-config + configMap: + name: cns-config + nodeSelector: + kubernetes.io/os: windows +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: cns-config +data: + cns_config.json: | + { + "TelemetrySettings": { + "TelemetryBatchSizeBytes": 16384, + "TelemetryBatchIntervalInSecs": 15, + "RefreshIntervalInSecs": 15, + "DisableAll": false, + "HeartBeatIntervalInMins": 30, + "DebugMode": false, + "SnapshotIntervalInMins": 60 + }, + "ManagedSettings": { + "PrivateEndpoint": "", + "InfrastructureNetworkID": "", + "NodeID": "", + "NodeSyncIntervalInSeconds": 30 + }, + "ChannelMode": "CRD", + "InitializeFromCNI": true + } From 552806306daf72d4ecef006c0ea29194dbe5f436 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 13 Oct 2021 12:04:34 -0700 Subject: [PATCH 2/8] making progress --- cns/azure-cns-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml index 727beeca8c..681feef18c 100644 --- a/cns/azure-cns-windows.yaml +++ b/cns/azure-cns-windows.yaml @@ -48,7 +48,7 @@ spec: - name: CNSPort value: "10090" - name: CNSLogTarget - value: "stdoutfile" # Change to stdoutfile once hostProcess works + value: "stdoutfile" - name: CNSLogDirectory value: "C:\\k" - name: CNSStoreFilePath From 120a3eb96a35e016175ec5ef0e1caecd22ee7863 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 13 Oct 2021 14:07:14 -0700 Subject: [PATCH 3/8] Rename to azure-cns --- cns/azure-cns-windows.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml index 681feef18c..183004764d 100644 --- a/cns/azure-cns-windows.yaml +++ b/cns/azure-cns-windows.yaml @@ -1,15 +1,17 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - name: windows-daemonset + name: azure-cns + labels: + app: azure-cns spec: selector: matchLabels: - app: windows-pod + k8s-app: azure-cns template: metadata: labels: - app: windows-pod + k8s-app: azure-cns spec: securityContext: windowsOptions: @@ -17,7 +19,7 @@ spec: runAsUserName: "NT AUTHORITY\\SYSTEM" hostNetwork: true containers: - - name: win-container + - name: cns-container image: acnpublic.azurecr.io/azure-cns-win:v1.4.12-43-g21f203db8-dirty imagePullPolicy: Always # Change to IfNotPresent after development command: From b7701cfcaeb01b8e75f25fd91487982ff30b67da Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Fri, 15 Oct 2021 15:34:38 -0700 Subject: [PATCH 4/8] kubeconfig var --- cns/azure-cns-windows.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml index 183004764d..9cdb9abd45 100644 --- a/cns/azure-cns-windows.yaml +++ b/cns/azure-cns-windows.yaml @@ -20,7 +20,7 @@ spec: hostNetwork: true containers: - name: cns-container - image: acnpublic.azurecr.io/azure-cns-win:v1.4.12-43-g21f203db8-dirty + image: acnpublic.azurecr.io/azure-cns-win:v1.4.13-13-gd5039ff8e-dirty imagePullPolicy: Always # Change to IfNotPresent after development command: ["%CONTAINER_SANDBOX_MOUNT_POINT%/usr/local/bin/azure-cns.exe"] @@ -62,6 +62,8 @@ spec: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + - name: KUBECONFIG + value: "C:\\k\\config" volumes: - name: log hostPath: From 6b1b2554c6f2ca07bb45799d03d1e172a91c9afe Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 20 Oct 2021 14:00:56 -0700 Subject: [PATCH 5/8] with spacer --- cns/azure-cns-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml index 9cdb9abd45..d462c2d00c 100644 --- a/cns/azure-cns-windows.yaml +++ b/cns/azure-cns-windows.yaml @@ -35,7 +35,7 @@ spec: "-store-file-path", "$(CNSStoreFilePath)", "-config-path", - "%CONTAINER_SANDBOX_MOUNT_POINT%$(CNS_CONFIGURATION_PATH)", + "%CONTAINER_SANDBOX_MOUNT_POINT%\\$(CNS_CONFIGURATION_PATH)", ] volumeMounts: - name: log From 582cd014fac50914aed1639938ef4ba9dc6d5cf9 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 20 Oct 2021 14:05:16 -0700 Subject: [PATCH 6/8] Swift manager only on linux for right now --- tools/acncli/deployment/manager_swift.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/acncli/deployment/manager_swift.yaml b/tools/acncli/deployment/manager_swift.yaml index 817f5bdabe..edbdfb1423 100644 --- a/tools/acncli/deployment/manager_swift.yaml +++ b/tools/acncli/deployment/manager_swift.yaml @@ -12,6 +12,8 @@ spec: labels: acn: azure-cni-manager spec: + nodeSelector: + "beta.kubernetes.io/os": linux tolerations: - effect: NoSchedule key: node-role.kubernetes.io/master From c0d001ea592a9de3dc0b8e4f37171a1c0827cd44 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Mon, 25 Oct 2021 12:11:38 -0700 Subject: [PATCH 7/8] azure-cns name --- cns/azure-cns-windows.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml index d462c2d00c..39beda5d4c 100644 --- a/cns/azure-cns-windows.yaml +++ b/cns/azure-cns-windows.yaml @@ -1,17 +1,17 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - name: azure-cns + name: azure-cns-win labels: - app: azure-cns + app: azure-cns-win spec: selector: matchLabels: - k8s-app: azure-cns + k8s-app: azure-cns-win template: metadata: labels: - k8s-app: azure-cns + k8s-app: azure-cns-win spec: securityContext: windowsOptions: From 3761bd927d690e4b4f62a8240e5a115f51f1b1d2 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Wed, 17 Nov 2021 12:43:09 -0800 Subject: [PATCH 8/8] Final touches on Azure cns yaml --- cns/azure-cns-windows.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cns/azure-cns-windows.yaml b/cns/azure-cns-windows.yaml index 39beda5d4c..f156eef142 100644 --- a/cns/azure-cns-windows.yaml +++ b/cns/azure-cns-windows.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: DaemonSet metadata: name: azure-cns-win + namespace: kube-system labels: app: azure-cns-win spec: @@ -20,8 +21,8 @@ spec: hostNetwork: true containers: - name: cns-container - image: acnpublic.azurecr.io/azure-cns-win:v1.4.13-13-gd5039ff8e-dirty - imagePullPolicy: Always # Change to IfNotPresent after development + image: acnpublic.azurecr.io/azure-cns-win:v1.4.15-1-g1b238a3f9 + imagePullPolicy: IfNotPresent command: ["%CONTAINER_SANDBOX_MOUNT_POINT%/usr/local/bin/azure-cns.exe"] args: @@ -79,6 +80,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: cns-config + namespace: kube-system data: cns_config.json: | {