Skip to content

Commit

Permalink
Revert "chore: upgrade multus to v4.1.3-thick and migrate config (#104)"
Browse files Browse the repository at this point in the history
This reverts commit a479045.
  • Loading branch information
chomatdam committed Oct 25, 2024
1 parent eac4368 commit c04d9d3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
30 changes: 8 additions & 22 deletions gitops/components/multus/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

resources:
- https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v4.1.3/deployments/multus-daemonset-thick.yml
- https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/v3.9.3/deployments/multus-daemonset.yml

images:
- name: ghcr.io/k8snetworkplumbingwg/multus-cni
newTag: v4.1.3-thick
newTag: v3.9.3

patches:
- target:
Expand All @@ -21,26 +21,12 @@ patches:
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-readiness.yaml
- patch: |-
apiVersion: v1
kind: ConfigMap
metadata:
name: multus-daemon-config
namespace: kube-system
data:
daemon-config.json: |
{
"chrootDir": "/hostroot",
"cniVersion": "0.4.0",
"logFile": "/var/log/aws-routed-eni/multus.log",
"logLevel": "error",
"logToStderr": true,
"cniConfigDir": "/host/etc/cni/net.d",
"multusAutoconfigDir": "/host/etc/cni/net.d",
"multusMasterCNI": "10-aws.conflist",
"multusConfigFile": "auto",
"socketDir": "/host/run/multus/"
}
- target:
group: apps
version: v1
kind: DaemonSet
name: kube-multus-ds
path: ./overlays/multus-daemonset-container-args.yaml
- target:
group: argoproj.io
version: v1alpha1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kube-multus-ds
spec:
template:
spec:
containers:
- name: kube-multus
args:
- "--multus-conf-file=auto"
- "--cni-version=0.4.0"
- "--multus-master-cni-file-name=10-aws.conflist"
- "--multus-log-level=error"
- "--multus-log-file=/var/log/aws-routed-eni/multus.log"

0 comments on commit c04d9d3

Please sign in to comment.