-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
neonvm: add arm multus and whereabouts manifests
- Loading branch information
1 parent
8a7a20c
commit bd97eaf
Showing
14 changed files
with
273 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ spec: | |
| operator: In | ||
| values: | ||
| - amd64 | ||
| - arm64 | ||
| - key: kubernetes.io/os | ||
| operator: In | ||
| values: | ||
|
|
||
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| This deployment is supposed to be used only on local cluster. | ||
| It is different from multus-local-amd64 and uses multus 4.X due to image availability for proper architecture. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --- | ||
| apiVersion: rbac.authorization.k8s.io/v1 | ||
| kind: ClusterRole | ||
| metadata: | ||
| name: multus | ||
| rules: | ||
| - apiGroups: | ||
| - k8s.cni.cncf.io | ||
| resources: | ||
| - '*' | ||
| verbs: | ||
| - '*' | ||
| - apiGroups: | ||
| - "" | ||
| resources: | ||
| - pods | ||
| - pods/status | ||
| verbs: | ||
| - get | ||
| - update | ||
| - watch | ||
| - list | ||
| - apiGroups: | ||
| - "" | ||
| - events.k8s.io | ||
| resources: | ||
| - events | ||
| verbs: | ||
| - create | ||
| - patch | ||
| - update |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --- | ||
| kind: ConfigMap | ||
| apiVersion: v1 | ||
| metadata: | ||
| name: multus-daemon-config | ||
| namespace: kube-system | ||
| labels: | ||
| tier: node | ||
| app: multus | ||
| data: | ||
| daemon-config.json: | | ||
| { | ||
| "chrootDir": "/hostroot", | ||
| "cniVersion": "0.3.1", | ||
| "logLevel": "verbose", | ||
| "logToStderr": true, | ||
| "cniConfigDir": "/host/etc/cni/net.d", | ||
| "multusAutoconfigDir": "/host/etc/cni/net.d", | ||
| "multusConfigFile": "auto", | ||
| "socketDir": "/host/run/multus/" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| apiVersion: apps/v1 | ||
| kind: DaemonSet | ||
| metadata: | ||
| labels: | ||
| app: multus | ||
| name: multus | ||
| tier: node | ||
| name: kube-multus-ds | ||
| namespace: kube-system | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| name: multus | ||
| template: | ||
| metadata: | ||
| labels: | ||
| app: multus | ||
| name: multus | ||
| tier: node | ||
| spec: | ||
| affinity: | ||
| nodeAffinity: | ||
| requiredDuringSchedulingIgnoredDuringExecution: | ||
| nodeSelectorTerms: | ||
| - matchExpressions: | ||
| - key: kubernetes.io/arch | ||
| operator: In | ||
| values: | ||
| - arm64 | ||
| - key: kubernetes.io/os | ||
| operator: In | ||
| values: | ||
| - linux | ||
| containers: | ||
| - command: | ||
| - /usr/src/multus-cni/bin/multus-daemon | ||
| image: ghcr.io/k8snetworkplumbingwg/multus-cni:v4.1.3-thick | ||
| name: kube-multus | ||
| resources: | ||
| limits: | ||
| cpu: 100m | ||
| memory: 50Mi | ||
| requests: | ||
| cpu: 100m | ||
| memory: 50Mi | ||
| securityContext: | ||
| privileged: true | ||
| volumeMounts: | ||
| - name: cni | ||
| mountPath: /host/etc/cni/net.d | ||
| # multus-daemon expects that cnibin path must be identical between pod and container host. | ||
| # e.g. if the cni bin is in '/opt/cni/bin' on the container host side, then it should be mount to '/opt/cni/bin' in multus-daemon, | ||
| # not to any other directory, like '/opt/bin' or '/usr/bin'. | ||
| - name: cnibin | ||
| mountPath: /opt/cni/bin | ||
| - name: host-run | ||
| mountPath: /host/run | ||
| - name: host-var-lib-cni-multus | ||
| mountPath: /var/lib/cni/multus | ||
| - name: host-var-lib-kubelet | ||
| mountPath: /var/lib/kubelet | ||
| mountPropagation: HostToContainer | ||
| - name: host-run-k8s-cni-cncf-io | ||
| mountPath: /run/k8s.cni.cncf.io | ||
| - name: host-run-netns | ||
| mountPath: /run/netns | ||
| mountPropagation: HostToContainer | ||
| - name: multus-daemon-config | ||
| mountPath: /etc/cni/net.d/multus.d | ||
| readOnly: true | ||
| - name: hostroot | ||
| mountPath: /hostroot | ||
| mountPropagation: HostToContainer | ||
| env: | ||
| - name: MULTUS_NODE_NAME | ||
| valueFrom: | ||
| fieldRef: | ||
| fieldPath: spec.nodeName | ||
| hostNetwork: true | ||
| hostPID: true | ||
| initContainers: | ||
| - name: install-multus-binary | ||
| image: ghcr.io/k8snetworkplumbingwg/multus-cni:v4.1.3-thick | ||
| command: | ||
| - "cp" | ||
| - "/usr/src/multus-cni/bin/multus-shim" | ||
| - "/host/opt/cni/bin/multus-shim" | ||
| resources: | ||
| requests: | ||
| cpu: "10m" | ||
| memory: "15Mi" | ||
| securityContext: | ||
| privileged: true | ||
| terminationMessagePolicy: FallbackToLogsOnError | ||
| volumeMounts: | ||
| - name: cnibin | ||
| mountPath: /host/opt/cni/bin | ||
| mountPropagation: Bidirectional | ||
| serviceAccountName: multus | ||
| terminationGracePeriodSeconds: 10 | ||
| tolerations: | ||
| - effect: NoSchedule | ||
| operator: Exists | ||
| volumes: | ||
| - hostPath: | ||
| path: /etc/cni/net.d | ||
| name: cni | ||
| - hostPath: | ||
| path: /opt/cni/bin | ||
| name: cnibin | ||
| - name: hostroot | ||
| hostPath: | ||
| path: / | ||
| - name: multus-daemon-config | ||
| configMap: | ||
| name: multus-daemon-config | ||
| items: | ||
| - key: daemon-config.json | ||
| path: daemon-config.json | ||
| - name: host-run | ||
| hostPath: | ||
| path: /run | ||
| - name: host-var-lib-cni-multus | ||
| hostPath: | ||
| path: /var/lib/cni/multus | ||
| - name: host-var-lib-kubelet | ||
| hostPath: | ||
| path: /var/lib/kubelet | ||
| - name: host-run-k8s-cni-cncf-io | ||
| hostPath: | ||
| path: /run/k8s.cni.cncf.io | ||
| - name: host-run-netns | ||
| hostPath: | ||
| path: /run/netns/ | ||
|
|
||
| updateStrategy: | ||
| type: RollingUpdate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| bases: | ||
| - ../multus-common | ||
|
|
||
| images: | ||
| - name: kube-multus | ||
| newName: ghcr.io/k8snetworkplumbingwg/multus-cni | ||
| newTag: v4.1.3-thick | ||
|
|
||
| resources: | ||
| - config_map.yaml | ||
| patchesStrategicMerge: | ||
| - cluster_role.yaml | ||
| - daemonset_patch.yaml | ||
|
|
||
| patches: | ||
| - target: | ||
| kind: DaemonSet | ||
| name: kube-multus-ds | ||
| patch: |- | ||
| - op: replace | ||
| path: /spec/template/spec/containers/0/command | ||
| value: ["/usr/src/multus-cni/bin/multus-daemon"] | ||
| - op: replace | ||
| path: /spec/template/spec/containers/0/args | ||
| value: [] |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # patch the DaemonSet so that it's only running on nodes that we'd support | ||
| # | ||
| # The image we're is a linux amd64 image; it doesn't work on ARM or non-Linux. | ||
| apiVersion: apps/v1 | ||
| kind: DaemonSet | ||
| metadata: | ||
| name: whereabouts | ||
| namespace: kube-system | ||
| spec: | ||
| template: | ||
| spec: | ||
| affinity: | ||
| nodeAffinity: | ||
| requiredDuringSchedulingIgnoredDuringExecution: | ||
| nodeSelectorTerms: | ||
| - matchExpressions: | ||
| - key: kubernetes.io/arch | ||
| operator: In | ||
| values: | ||
| - arm64 | ||
| - key: kubernetes.io/os | ||
| operator: In | ||
| values: | ||
| - linux |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| bases: | ||
| # whereabouts CNI | ||
| - https://raw.githubusercontent.com/k8snetworkplumbingwg/whereabouts/v0.6.2/doc/crds/whereabouts.cni.cncf.io_ippools.yaml | ||
| - https://raw.githubusercontent.com/k8snetworkplumbingwg/whereabouts/v0.6.2/doc/crds/whereabouts.cni.cncf.io_overlappingrangeipreservations.yaml | ||
| - https://raw.githubusercontent.com/k8snetworkplumbingwg/whereabouts/v0.6.2/doc/crds/daemonset-install.yaml | ||
|
|
||
| patchesStrategicMerge: | ||
| - daemonset_patch.yaml | ||
|
|
||
| images: | ||
| - name: ghcr.io/k8snetworkplumbingwg/whereabouts | ||
| newTag: v0.6.2-arm64 |