Skip to content

Commit

Permalink
feat(multus): auto config file
Browse files Browse the repository at this point in the history
  • Loading branch information
buroa committed Dec 29, 2024
1 parent e643dea commit 0221004
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 36 deletions.
18 changes: 3 additions & 15 deletions kubernetes/apps/networking/multus/app/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,11 @@ spec:
controllers:
multus:
type: daemonset
annotations:
reloader.stakater.com/auto: "true"
initContainers:
cni-plugins:
image:
repository: ghcr.io/buroa/cni-plugins
tag: 1.6.1@sha256:b6e77bcf43e6d49a1e73271331380501fda10715df9a266d07cf1ad28805d717
env:
CNI_BIN_DIR: &dir /opt/cni/bin
tag: 1.6.1@sha256:a74f18b40c5c6679cd35cc420c902a1d83ba0e4a4e3e46428fa35e74015b8a6c
containers:
multus:
image:
Expand All @@ -45,30 +41,22 @@ spec:
- --cni-bin-dir=/opt/cni/bin
- --cni-conf-dir=/etc/cni/net.d
- --cleanup-config-on-exit=true
- --multus-conf-file=/config/00-multus.conf
resources:
requests:
cpu: 10m
limits:
memory: 512Mi
memory: 128Mi
securityContext:
privileged: true
defaultPodOptions:
hostNetwork: true
persistence:
config:
type: configMap
name: multus-configmap
globalMounts:
- path: /config/00-multus.conf
subPath: 00-multus.conf
readOnly: true
etc-cni-net-d:
type: hostPath
hostPath: /etc/cni/net.d
opt-cni-bin:
type: hostPath
hostPath: *dir
hostPath: /opt/cni/bin
serviceAccount:
create: true
name: *app
6 changes: 0 additions & 6 deletions kubernetes/apps/networking/multus/app/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ resources:
- https://raw.githubusercontent.com/k8snetworkplumbingwg/network-attachment-definition-client/refs/tags/v1.7.5/artifacts/networks-crd.yaml
- ./helmrelease.yaml
- ./rbac.yaml
configMapGenerator:
- name: multus-configmap
files:
- ./resources/00-multus.conf
generatorOptions:
disableNameSuffixHash: true
15 changes: 0 additions & 15 deletions kubernetes/apps/networking/multus/app/resources/00-multus.conf

This file was deleted.

0 comments on commit 0221004

Please sign in to comment.