From d2920712bd03d2249452924f46b158d4b10201f4 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Tue, 1 Nov 2022 22:05:10 +0000 Subject: [PATCH 1/3] cut down cni installer for v1 Signed-off-by: Evan Baker --- hack/manifests/cni-installer-v1.yaml | 76 ++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 hack/manifests/cni-installer-v1.yaml diff --git a/hack/manifests/cni-installer-v1.yaml b/hack/manifests/cni-installer-v1.yaml new file mode 100644 index 0000000000..b6a26606db --- /dev/null +++ b/hack/manifests/cni-installer-v1.yaml @@ -0,0 +1,76 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: azure-cni + namespace: kube-system + labels: + app: azure-cni +spec: + selector: + matchLabels: + k8s-app: azure-cni + template: + metadata: + labels: + k8s-app: azure-cni + annotations: + cluster-autoscaler.kubernetes.io/daemonset-pod: "true" + spec: + affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: kubernetes.azure.com/cluster + operator: Exists + - key: type + operator: NotIn + values: + - virtual-kubelet + - key: beta.kubernetes.io/os + operator: In + values: + - linux + priorityClassName: system-node-critical + tolerations: + - key: CriticalAddonsOnly + operator: Exists + - operator: "Exists" + effect: NoExecute + - operator: "Exists" + effect: NoSchedule + initContainers: + - name: azure-cni + image: mcr.microsoft.com/containernetworking/cni-dropgz:v0.0.4 + imagePullPolicy: Always + command: ["/dropgz"] + args: + - deploy + - azure-vnet + - -o + - /opt/cni/bin/azure-vnet + - azure-vnet-ipam + - -o + - /opt/cni/bin/azure-vnet-ipam + - azure-vnet-telemetry + - -o + - /opt/cni/bin/azure-vnet-telemetry + - azure.conflist + - -o + - /etc/cni/net.d/10-azure.conflist + volumeMounts: + - name: cni-bin + mountPath: /opt/cni/bin + containers: + - name: pause + image: k8s.gcr.io/pause:2.0 + hostNetwork: true + volumes: + - name: cni-conflist + hostPath: + path: /etc/cni/net.d + type: Directory + - name: cni-bin + hostPath: + path: /opt/cni/bin + type: Directory From 9b7eab91ae297abdf26b80fea9389cd9f45aa4a0 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Mon, 30 Jan 2023 16:41:46 -0600 Subject: [PATCH 2/3] add conflist volume mount Signed-off-by: Evan Baker --- hack/manifests/cni-installer-v1.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hack/manifests/cni-installer-v1.yaml b/hack/manifests/cni-installer-v1.yaml index b6a26606db..5bef524ca2 100644 --- a/hack/manifests/cni-installer-v1.yaml +++ b/hack/manifests/cni-installer-v1.yaml @@ -61,6 +61,8 @@ spec: volumeMounts: - name: cni-bin mountPath: /opt/cni/bin + - name: cni-conflist + mountPath: /etc/cni/net.d containers: - name: pause image: k8s.gcr.io/pause:2.0 From 2697fdbd169b73a7b77100a8020b4dbb5c4addf2 Mon Sep 17 00:00:00 2001 From: Evan Baker Date: Mon, 30 Jan 2023 17:15:26 -0600 Subject: [PATCH 3/3] Update hack/manifests/cni-installer-v1.yaml Co-authored-by: Cecile Robert-Michon --- hack/manifests/cni-installer-v1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/manifests/cni-installer-v1.yaml b/hack/manifests/cni-installer-v1.yaml index 5bef524ca2..cb2d0daaa4 100644 --- a/hack/manifests/cni-installer-v1.yaml +++ b/hack/manifests/cni-installer-v1.yaml @@ -65,7 +65,7 @@ spec: mountPath: /etc/cni/net.d containers: - name: pause - image: k8s.gcr.io/pause:2.0 + image: mcr.microsoft.com/oss/kubernetes/pause:3.6 hostNetwork: true volumes: - name: cni-conflist