Skip to content

Commit 1d2e4f9

Browse files
singhwangjianghang8421
singhwang
authored and
jianghang8421
committed
Update flat-network & macvlan charts to 2.14
1 parent e4b8aae commit 1d2e4f9

38 files changed

Lines changed: 1840 additions & 20 deletions

File tree

‎assets/rancher-flat-network-crd/rancher-flat-network-crd-109.0.0+up0.2.4.tgz‎

1.16 KB
Binary file not shown.

‎assets/rancher-flat-network/rancher-flat-network-109.0.0+up0.2.4.tgz‎

3.79 KB
Binary file not shown.

‎assets/rancher-macvlan/rancher-macvlan-1.0.4.tgz‎

3.65 KB
Binary file not shown.

‎charts/rancher-flat-network-crd/109.0.0+up0.2.4/Chart.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
annotations:
2+
catalog.cattle.io/certified: rancher
3+
catalog.cattle.io/hidden: "true"
4+
catalog.cattle.io/kube-version: '>= 1.33.0-0'
5+
catalog.cattle.io/namespace: cattle-flat-network
6+
catalog.cattle.io/os: linux
7+
catalog.cattle.io/permits-os: linux
8+
catalog.cattle.io/rancher-version: '>= 2.14.0-alpha'
9+
catalog.cattle.io/release-name: rancher-flat-network-crd
10+
apiVersion: v2
11+
appVersion: 0.2.4
12+
description: Rancher FlatNetwork CustomResourceDefinitions
13+
home: https://github.com/cnrancher/rancher-flat-network
14+
maintainers:
15+
- email: xin.wang@suse.com
16+
name: SinghWang
17+
name: rancher-flat-network-crd
18+
sources:
19+
- https://github.com/cnrancher/rancher-flat-network
20+
version: 109.0.0+up0.2.4

‎charts/rancher-flat-network-crd/109.0.0+up0.2.4/templates/crds.yaml‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
---
2+
apiVersion: apiextensions.k8s.io/v1
3+
kind: CustomResourceDefinition
4+
metadata:
5+
annotations:
6+
helm.sh/resource-policy: keep
7+
name: flatnetworkips.flatnetwork.pandaria.io
8+
spec:
9+
group: flatnetwork.pandaria.io
10+
names:
11+
kind: FlatNetworkIP
12+
plural: flatnetworkips
13+
shortNames:
14+
- flatnetworkip
15+
- flip
16+
- flips
17+
singular: flatnetworkip
18+
preserveUnknownFields: false
19+
scope: Namespaced
20+
versions:
21+
- name: v1
22+
schema:
23+
openAPIV3Schema:
24+
properties:
25+
spec:
26+
properties:
27+
addrs:
28+
items:
29+
nullable: true
30+
type: string
31+
nullable: true
32+
type: array
33+
macs:
34+
items:
35+
nullable: true
36+
type: string
37+
nullable: true
38+
type: array
39+
podId:
40+
nullable: true
41+
type: string
42+
subnet:
43+
nullable: true
44+
type: string
45+
type: object
46+
status:
47+
properties:
48+
addr:
49+
nullable: true
50+
type: string
51+
allocatedTimeStamp:
52+
nullable: true
53+
type: string
54+
failureMessage:
55+
nullable: true
56+
type: string
57+
mac:
58+
nullable: true
59+
type: string
60+
phase:
61+
nullable: true
62+
type: string
63+
type: object
64+
type: object
65+
served: true
66+
storage: true
67+
subresources:
68+
status: {}
69+
---
70+
apiVersion: apiextensions.k8s.io/v1
71+
kind: CustomResourceDefinition
72+
metadata:
73+
annotations:
74+
helm.sh/resource-policy: keep
75+
name: flatnetworksubnets.flatnetwork.pandaria.io
76+
spec:
77+
group: flatnetwork.pandaria.io
78+
names:
79+
kind: FlatNetworkSubnet
80+
plural: flatnetworksubnets
81+
shortNames:
82+
- flatnetworksubnet
83+
- flsubnet
84+
- flsubnets
85+
singular: flatnetworksubnet
86+
preserveUnknownFields: false
87+
scope: Namespaced
88+
versions:
89+
- name: v1
90+
schema:
91+
openAPIV3Schema:
92+
properties:
93+
spec:
94+
properties:
95+
cidr:
96+
nullable: true
97+
type: string
98+
flatMode:
99+
nullable: true
100+
type: string
101+
gateway:
102+
nullable: true
103+
type: string
104+
ipvlanFlag:
105+
nullable: true
106+
type: string
107+
master:
108+
nullable: true
109+
type: string
110+
mode:
111+
nullable: true
112+
type: string
113+
ranges:
114+
items:
115+
properties:
116+
from:
117+
nullable: true
118+
type: string
119+
to:
120+
nullable: true
121+
type: string
122+
type: object
123+
nullable: true
124+
type: array
125+
routeSettings:
126+
properties:
127+
addClusterCIDR:
128+
type: boolean
129+
addNodeCIDR:
130+
type: boolean
131+
addPodIPToHost:
132+
type: boolean
133+
addServiceCIDR:
134+
type: boolean
135+
flatNetworkDefaultGateway:
136+
type: boolean
137+
type: object
138+
routes:
139+
items:
140+
properties:
141+
dev:
142+
nullable: true
143+
type: string
144+
dst:
145+
nullable: true
146+
type: string
147+
priority:
148+
type: integer
149+
src:
150+
nullable: true
151+
type: string
152+
via:
153+
nullable: true
154+
type: string
155+
type: object
156+
nullable: true
157+
type: array
158+
vlan:
159+
type: integer
160+
type: object
161+
status:
162+
properties:
163+
failureMessage:
164+
nullable: true
165+
type: string
166+
gateway:
167+
nullable: true
168+
type: string
169+
phase:
170+
nullable: true
171+
type: string
172+
reservedIP:
173+
additionalProperties:
174+
items:
175+
properties:
176+
from:
177+
nullable: true
178+
type: string
179+
to:
180+
nullable: true
181+
type: string
182+
type: object
183+
nullable: true
184+
type: array
185+
nullable: true
186+
type: object
187+
usedIP:
188+
items:
189+
properties:
190+
from:
191+
nullable: true
192+
type: string
193+
to:
194+
nullable: true
195+
type: string
196+
type: object
197+
nullable: true
198+
type: array
199+
usedIPCount:
200+
type: integer
201+
usedMac:
202+
items:
203+
nullable: true
204+
type: string
205+
nullable: true
206+
type: array
207+
type: object
208+
type: object
209+
served: true
210+
storage: true
211+
subresources:
212+
status: {}

‎charts/rancher-flat-network/109.0.0+up0.2.4/Chart.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
annotations:
2+
catalog.cattle.io/auto-install: rancher-flat-network-crd=match
3+
catalog.cattle.io/certified: rancher
4+
catalog.cattle.io/display-name: Rancher FlatNetwork V2
5+
catalog.cattle.io/kube-version: '>= 1.33.0-0'
6+
catalog.cattle.io/namespace: cattle-flat-network
7+
catalog.cattle.io/os: linux
8+
catalog.cattle.io/permits-os: linux
9+
catalog.cattle.io/rancher-version: '>= 2.14.0-alpha'
10+
catalog.cattle.io/release-name: rancher-flat-network
11+
catalog.cattle.io/type: cluster-tool
12+
apiVersion: v2
13+
appVersion: 0.2.4
14+
description: Helm chart for managing rancher flat-network pods
15+
home: https://github.com/cnrancher/rancher-flat-network
16+
maintainers:
17+
- email: xin.wang@suse.com
18+
name: SinghWang
19+
name: rancher-flat-network
20+
sources:
21+
- https://github.com/cnrancher/rancher-flat-network
22+
version: 109.0.0+up0.2.4

‎charts/rancher-flat-network/109.0.0+up0.2.4/README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Rancher FlatNetwork V2
2+
3+
Manage flat network (Macvlan & IPvlan) workloads in Rancher.
4+
5+
Multus CNI version: `v4.2.4`
6+
7+
It is recommended to install this chart in `System` project.
8+
9+
----
10+
11+
<https://github.com/cnrancher/rancher-flat-network>

‎charts/rancher-flat-network/109.0.0+up0.2.4/questions.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
categories:
2+
- Networking
3+
namespace: cattle-flat-network
4+
questions:
5+
- variable: clusterType
6+
description: "Set to 'K3s' if using K3s Cluster"
7+
default: "Default"
8+
type: enum
9+
label: "Cluster Type"
10+
group: "CNI Plugin"
11+
options:
12+
- "Default"
13+
- "K3s"
14+
- variable: multus.cni.version
15+
description: "CNI Version (K3s is '1.0.0', RKE2 is '0.3.1')"
16+
default: "1.0.0"
17+
type: enum
18+
label: "CNI Version"
19+
group: "CNI Plugin"
20+
options:
21+
- "1.0.0"
22+
- "0.4.0"
23+
- "0.3.1"
24+
- variable: arpPolicy
25+
default: "arp_notify"
26+
description: "The policy of sending Gratuitous ARP"
27+
type: enum
28+
label: "ARP Refresh Policy"
29+
group: "CNI Plugin"
30+
options:
31+
- "arp_notify"
32+
- "arping"
33+
- variable: proxyARP
34+
default: "false"
35+
description: "Enable or disable Proxy ARP on Pod nic"
36+
type: boolean
37+
label: "Proxy ARP"
38+
group: "CNI Plugin"
39+
- variable: clusterCIDR
40+
default: "10.42.0.0/16"
41+
description: "Kubernetes config Cluster CIDR"
42+
type: string
43+
label: "Cluster CIDR"
44+
group: "CNI Plugin"
45+
- variable: serviceCIDR
46+
default: "10.43.0.0/16"
47+
description: "Kubernetes config Service CIDR"
48+
type: string
49+
label: "Service CIDR"
50+
group: "CNI Plugin"
51+
- variable: flatNetworkOperator.limits.memory
52+
default: "512Mi"
53+
description: "Memory limit for Operator pod"
54+
type: string
55+
label: FlatNetwork Operator Memory Limit
56+
group: "Others"
57+
- variable: flatNetworkOperator.limits.cpu
58+
default: "100m"
59+
description: "CPU limit for Operator pod"
60+
type: string
61+
label: FlatNetwork Operator CPU Limit
62+
group: "Others"
63+
- variable: deploy.rolloutSchedule
64+
default: "0 0 1 * *"
65+
description: "Rollout webhook tls secret every month: '0 0 1 * *'"
66+
type: string
67+
label: Webhook TLS Rollout Schedule
68+
group: "Others"

‎charts/rancher-flat-network/109.0.0+up0.2.4/templates/NOTES.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
successfully installed the Rancher FlatNetwork Operator
2+
Version: {{ .Chart.AppVersion }}
3+
Description: Helm chart for managing Rancher flat-network (Macvlan/IPvlan) pods.

‎charts/rancher-flat-network/109.0.0+up0.2.4/templates/_helpers.tpl‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{{/* vim: set filetype=mustache: */}}
2+
{{/*
3+
Expand the name of the chart.
4+
*/}}
5+
6+
{{- define "system_default_registry" -}}
7+
{{- if .Values.global.cattle.systemDefaultRegistry -}}
8+
{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
9+
{{- else -}}
10+
{{- "" -}}
11+
{{- end -}}
12+
{{- end -}}
13+
14+
{{- define "multus_cniconf_kubeconfig" -}}
15+
{{- if eq .Values.clusterType "K3s" -}}
16+
/var/lib/rancher/k3s/agent/etc/cni/net.d/multus.d/multus.kubeconfig
17+
{{- else -}}
18+
/etc/cni/net.d/multus.d/multus.kubeconfig
19+
{{- end -}}
20+
{{- end -}}
21+
22+
{{- define "multus_cniconf_host_path" -}}
23+
{{- if eq .Values.clusterType "K3s" -}}
24+
/var/lib/rancher/k3s/agent/etc/cni/net.d
25+
{{- else -}}
26+
/etc/cni/net.d
27+
{{- end -}}
28+
{{- end -}}
29+
30+
31+
{{- define "multus_cnibin_host_path" -}}
32+
{{- if eq .Values.clusterType "K3s" -}}
33+
/var/lib/rancher/k3s/data/cni
34+
{{- else -}}
35+
/opt/cni/bin
36+
{{- end -}}
37+
{{- end -}}

0 commit comments

Comments
 (0)