Add rancher-macvlan v0.10.3

charts/rancher-macvlan/0.10.3/Chart.yaml

@@ -0,0 +1,24 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: Rancher Macvlan
+  catalog.cattle.io/kube-version: '>=1.27.0-0'
+  catalog.cattle.io/namespace: kube-system
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux
+  catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0'
+  catalog.cattle.io/release-name: rancher-macvlan
+  catalog.cattle.io/type: cluster-tool
+apiVersion: v2
+appVersion: 0.10.0
+description: The Macvlan Networking For Rancher2.x
+home: https://github.com/cnrancher
+keywords:
+- networking
+kubeVersion: '>=1.27.0-0'
+maintainers:
+- email: [email protected]
+  name: StarryWang
+name: rancher-macvlan
+sources:
+- https://github.com/cnrancher
+version: 0.10.3

packages/rancher-macvlan/0.10.0/templates/_helpers.tpl → charts/rancher-macvlan/0.10.3/templates/_helpers.tpl

@@ -38,7 +38,7 @@ Expand the name of the chart.
 
 {{- define "multus_cnibin_host_path" -}}
 {{- if eq .Values.clusterType "K3s" -}}
-/var/lib/rancher/k3s/data/current/bin
+/var/lib/rancher/k3s/data/cni
 {{- else -}}
 /opt/cni/bin
 {{- end -}}

packages/rancher-macvlan/0.10.0/templates/multus-macvlan.yml → charts/rancher-macvlan/0.10.3/templates/multus-macvlan.yml

@@ -111,14 +111,14 @@ spec:
         lifecycle:
           preStop:
             exec:
-              command: ["/bin/sh", "-c", "rm -f /host/etc/cni/net.d/00-multus.conf"]
+              command: ["/bin/sh", "-c", "rm -f /host/etc/cni/net.d/00-multus.con*"]
         resources:
           requests:
             cpu: "100m"
-            memory: "50Mi"
+            memory: "64Mi"
           limits:
             cpu: "100m"
-            memory: "50Mi"
+            memory: "64Mi"
         securityContext:
           privileged: true
         volumeMounts:
@@ -168,10 +168,10 @@ spec:
         resources:
           requests:
             cpu: "100m"
-            memory: "50Mi"
+            memory: "64Mi"
           limits:
             cpu: "100m"
-            memory: "50Mi"
+            memory: "64Mi"
         securityContext:
           privileged: true
         volumeMounts:

packages/rancher-macvlan/0.10.0/values.yaml → charts/rancher-macvlan/0.10.3/values.yaml

@@ -21,13 +21,13 @@ nadcResources:
 image:
   multus:
     repository: cnrancher/hardened-multus-cni
-    tag: v4.1.0
+    tag: v4.1.3
   networkController:
     repository: cnrancher/network-controller
-    tag: v0.10.0
+    tag: v0.10.3
   admission:
     repository: cnrancher/network-admission-deploy
-    tag: v0.10.0
+    tag: v0.10.3
   nadController:
     repository: cnrancher/k8s-net-attach-def-controller
     tag: v0.5.1

index.yaml

@@ -1231,6 +1231,34 @@ entries:
     - assets/rancher-k8s-auditlog-collector/rancher-k8s-auditlog-collector-0.0.1.tgz
     version: 0.0.1
   rancher-macvlan:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/display-name: Rancher Macvlan
+      catalog.cattle.io/kube-version: '>=1.27.0-0'
+      catalog.cattle.io/namespace: kube-system
+      catalog.cattle.io/os: linux
+      catalog.cattle.io/permits-os: linux
+      catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0'
+      catalog.cattle.io/release-name: rancher-macvlan
+      catalog.cattle.io/type: cluster-tool
+    apiVersion: v2
+    appVersion: 0.10.0
+    created: "2025-01-17T17:49:39.294065468+08:00"
+    description: The Macvlan Networking For Rancher2.x
+    digest: 7a26ac8b742d1b15414ce6062b9aaa2c48c296af039a74e8fd0d316b0472e6f2
+    home: https://github.com/cnrancher
+    keywords:
+    - networking
+    kubeVersion: '>=1.27.0-0'
+    maintainers:
+    - email: [email protected]
+      name: StarryWang
+    name: rancher-macvlan
+    sources:
+    - https://github.com/cnrancher
+    urls:
+    - assets/rancher-macvlan/rancher-macvlan-0.10.3.tgz
+    version: 0.10.3
   - annotations:
       catalog.cattle.io/certified: rancher
       catalog.cattle.io/display-name: Rancher Macvlan

packages/rancher-macvlan/0.10.3/.helmignore

@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj

packages/rancher-macvlan/0.10.3/README.md

@@ -0,0 +1,3 @@
+# rancher-macvlan
+
+> **Important**: Please install the chart in the `kube-system` namespace only.

packages/rancher-macvlan/0.10.3/questions.yaml

@@ -0,0 +1,69 @@
+rancher_min_version: 2.9.0-0
+categories:
+- Networking
+namespace: kube-system
+questions:
+- variable: privateRegistry.registryUrl
+  label: Private registry URL
+  description: "URL of private registry. Leave blank to apply system default registry."
+  group: "Basic Setup"
+  type: string
+  default: ""
+- variable: clusterType
+  description: "Please choose K3s when using K3s built-in flannel"
+  default: "Default"
+  type: enum
+  label: "Cluster Type"
+  group: "Basic Setup"
+  options:
+  - "Default"
+  - "K3s"
+- variable: multus.cniVersion
+  description: "CNI Version for multus"
+  default: "0.3.1"
+  type: enum
+  label: "CNI Version"
+  group: "CNI Plugin"
+  options:
+  - "1.0.0"
+  - "0.4.0"
+  - "0.3.1"
+- variable: iface
+  description: "Automatic detection by default"
+  default: ""
+  type: string
+  label: "Networking Iface"
+  group: "CNI Plugin"
+- variable: podCIDR
+  default: "10.42.0.0/16"
+  description: "Same value with the Kubernetes config"
+  type: string
+  label: "Pod Networking CIDR"
+  group: "CNI Plugin"
+- variable: arpPolicy
+  default: "arping"
+  description: "The policy of sending Gratuitous ARP"
+  type: enum
+  label: "ARP Refresh Policy"
+  group: "CNI Plugin"
+  options:
+  - "arping"
+  - "arp_notify"
+- variable: proxyARP
+  default: "false"
+  description: "Enable or disable Proxy ARP on Pod nic"
+  type: boolean
+  label: "Proxy ARP"
+  group: "CNI Plugin"
+- variable: ncResources.limits.memory
+  default: "512Mi"
+  description: "Maximum amount of memory to allocate per network-controller pod"
+  type: string
+  label: Network Controller
+  group: "Resource Limits"
+- variable: nadcResources.limits.memory
+  default: "512Mi"
+  description: "Maximum amount of memory to allocate per kube-net-attach-def-controller pod"
+  type: string
+  label: Kube-net-attach-def Controller
+  group: "Resource Limits"

packages/rancher-macvlan/0.10.3/templates/_helpers.tpl

@@ -0,0 +1,45 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "registry_url" -}}
+{{- if .Values.privateRegistry.registryUrl -}}
+{{- printf "%s/" .Values.privateRegistry.registryUrl -}}
+{{- else -}}
+{{ include "system_default_registry" . }}
+{{- end -}}
+{{- end -}}
+
+{{- define "multus_cniconf_kubeconfig" -}}
+{{- if eq .Values.clusterType "K3s" -}}
+/var/lib/rancher/k3s/agent/etc/cni/net.d/multus.d/multus.kubeconfig
+{{- else -}}
+/etc/cni/net.d/multus.d/multus.kubeconfig
+{{- end -}}
+{{- end -}}
+
+{{- define "multus_cniconf_host_path" -}}
+{{- if eq .Values.clusterType "K3s" -}}
+/var/lib/rancher/k3s/agent/etc/cni/net.d
+{{- else -}}
+/etc/cni/net.d
+{{- end -}}
+{{- end -}}
+
+
+{{- define "multus_cnibin_host_path" -}}
+{{- if eq .Values.clusterType "K3s" -}}
+/var/lib/rancher/k3s/data/cni
+{{- else -}}
+/opt/cni/bin
+{{- end -}}
+{{- end -}}