Skip to content

Commit bb80e9b

Browse files
actions-useractions-user
committed
Merge pull request #801 from rancher/updatecli_main-source_8d8baf1cc641b7a3828201c84eb93f9ea50879905387f476e70697546e1a3c66
Bump flannel version to v0.27.4-build20251015 and Calico to v3.30.3-build20251015 on Canal
1 parent 9c6005b commit bb80e9b

35 files changed

+10381
-0
lines changed

‎assets/rke2-canal/rke2-canal-v3.30.3-build2025101500.tgz‎

66.6 KB
Binary file not shown.

‎charts/rke2-canal/rke2-canal/v3.30.3-build2025101500/Chart.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
appVersion: v3.30.3
3+
description: Install Canal Network Plugin.
4+
home: https://www.projectcalico.org/
5+
keywords:
6+
- canal
7+
maintainers:
8+
- email: [email protected]
9+
name: Rancher Labs
10+
name: rke2-canal
11+
sources:
12+
- https://github.com/rancher/rke2-charts
13+
version: v3.30.3-build2025101500

‎charts/rke2-canal/rke2-canal/v3.30.3-build2025101500/templates/NOTES.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Canal network plugin has been installed.
2+
3+
NOTE: It may take few minutes until Canal image install CNI files and node become in ready state.

‎charts/rke2-canal/rke2-canal/v3.30.3-build2025101500/templates/_helpers.tpl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{{- define "system_default_registry" -}}
2+
{{- if .Values.global.systemDefaultRegistry -}}
3+
{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
4+
{{- else -}}
5+
{{- "" -}}
6+
{{- end -}}
7+
{{- end -}}

‎charts/rke2-canal/rke2-canal/v3.30.3-build2025101500/templates/config.yaml‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
---
2+
# Source: calico/templates/calico-config.yaml
3+
# This ConfigMap is used to configure a self-hosted Canal installation.
4+
kind: ConfigMap
5+
apiVersion: v1
6+
metadata:
7+
name: {{ .Release.Name }}-config
8+
namespace: kube-system
9+
data:
10+
# Typha is disabled.
11+
typha_service_name: {{ .Values.calico.typhaServiceName | quote }}
12+
# The interface used by canal for host <-> host communication.
13+
# If left blank, then the interface is chosen using the node's
14+
# default route.
15+
canal_iface: {{ .Values.flannel.iface | quote }}
16+
17+
canal_iface_regex: {{ .Values.flannel.regexIface | quote }}
18+
19+
# Whether or not to masquerade traffic to destinations not within
20+
# the pod network.
21+
masquerade: {{ .Values.calico.masquerade | quote }}
22+
23+
# Configure the MTU to use
24+
veth_mtu: {{ .Values.calico.vethuMTU | quote }}
25+
26+
# The CNI network configuration to install on each node. The special
27+
# values in this config will be automatically populated.
28+
cni_network_config: |-
29+
{
30+
"name": "k8s-pod-network",
31+
"cniVersion": "0.3.1",
32+
"plugins": [
33+
{
34+
"type": "calico",
35+
"log_level": "info",
36+
"datastore_type": "kubernetes",
37+
"nodename": "__KUBERNETES_NODE_NAME__",
38+
"mtu": __CNI_MTU__,
39+
"ipam": {
40+
"type": "host-local",
41+
"ranges": [
42+
{{- if coalesce .Values.global.clusterCIDRv4 .Values.podCidr }}
43+
[
44+
{
45+
"subnet": "usePodCidr"
46+
}
47+
{{- if coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 }}
48+
],
49+
{{- else }}
50+
]
51+
{{- end }}
52+
{{- end }}
53+
{{- if coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 }}
54+
[
55+
{
56+
"subnet": "usePodCidrIPv6"
57+
}
58+
]
59+
{{- end }}
60+
]
61+
},
62+
"policy": {
63+
"type": "k8s"
64+
},
65+
"kubernetes": {
66+
"kubeconfig": "__KUBECONFIG_FILEPATH__"
67+
}
68+
},
69+
{
70+
"type": "portmap",
71+
"snat": true,
72+
"capabilities": {"portMappings": true}
73+
},
74+
{
75+
"type": "bandwidth",
76+
"capabilities": {"bandwidth": true}
77+
}
78+
]
79+
}
80+
81+
# Flannel network configuration. Mounted into the flannel container.
82+
net-conf.json: |
83+
{
84+
{{- if coalesce .Values.global.clusterCIDRv4 .Values.podCidr }}
85+
"Network": {{ coalesce .Values.global.clusterCIDRv4 .Values.podCidr | quote }},
86+
{{- else }}
87+
"EnableIPv4": false,
88+
{{- end }}
89+
{{- if coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 }}
90+
"IPv6Network": {{ coalesce .Values.global.clusterCIDRv6 .Values.podCidrv6 | quote }},
91+
"EnableIPv6": true,
92+
{{- end }}
93+
"Backend": {
94+
{{- if eq .Values.flannel.backend "vxlan" }}
95+
{{- if .Values.flannel.backendPort }}
96+
"Port": {{ .Values.flannel.backendPort }},
97+
{{- end }}
98+
{{- if .Values.flannel.vni }}
99+
"VNI": {{ .Values.flannel.vni }},
100+
{{- end }}
101+
{{- if .Values.flannel.GBP }}
102+
"GBP": {{ .Values.flannel.GBP }},
103+
{{- end }}
104+
{{- if .Values.flannel.directRouting }}
105+
"DirectRouting": {{ .Values.flannel.directRouting }},
106+
{{- end }}
107+
{{- if .Values.flannel.mtu }}
108+
"MTU": {{ .Values.flannel.mtu }},
109+
{{- end }}
110+
{{- if .Values.flannel.macPrefix }}
111+
"MacPrefix": {{ .Values.flannel.macPrefix | quote }},
112+
{{- end }}
113+
"Type": {{ .Values.flannel.backend | quote }}
114+
{{- else if eq .Values.flannel.backend "wireguard" }}
115+
{{- if .Values.flannel.backendPort }}
116+
"ListenPort": {{ .Values.flannel.backendPort }},
117+
{{- end }}
118+
{{- if .Values.flannel.backendPortv6 }}
119+
"ListenPortV6": {{ .Values.flannel.backendPortv6 }},
120+
{{- end }}
121+
{{- if .Values.flannel.psk }}
122+
"PSK": {{ .Values.flannel.psk }},
123+
{{- end }}
124+
{{- if .Values.flannel.mtu }}
125+
"MTU": {{ .Values.flannel.mtu }},
126+
{{- end }}
127+
{{- if .Values.flannel.tunnelMode }}
128+
"Mode": {{ .Values.flannel.tunnelMode | quote }},
129+
{{- end }}
130+
{{- if .Values.flannel.keepaliveInterval }}
131+
"PersistentKeepaliveInterval": {{ .Values.flannel.keepaliveInterval }},
132+
{{- end }}
133+
"Type": {{ .Values.flannel.backend | quote }}
134+
{{- else if eq .Values.flannel.backend "udp" }}
135+
{{- if .Values.flannel.backendPort }}
136+
"Port": {{ .Values.flannel.backendPort }},
137+
{{- end }}
138+
"Type": {{ .Values.flannel.backend | quote }}
139+
{{- else }}
140+
"Type": {{ .Values.flannel.backend | quote }}
141+
{{- end }}
142+
}
143+
}

‎charts/rke2-canal/rke2-canal/v3.30.3-build2025101500/templates/crds/crd.projectcalico.org_bgpconfigurations.yaml‎

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
controller-gen.kubebuilder.io/version: v0.17.3
6+
name: bgpconfigurations.crd.projectcalico.org
7+
spec:
8+
group: crd.projectcalico.org
9+
names:
10+
kind: BGPConfiguration
11+
listKind: BGPConfigurationList
12+
plural: bgpconfigurations
13+
singular: bgpconfiguration
14+
preserveUnknownFields: false
15+
scope: Cluster
16+
versions:
17+
- name: v1
18+
schema:
19+
openAPIV3Schema:
20+
description: BGPConfiguration contains the configuration for any BGP routing.
21+
properties:
22+
apiVersion:
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
28+
type: string
29+
kind:
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
36+
type: string
37+
metadata:
38+
type: object
39+
spec:
40+
description: BGPConfigurationSpec contains the values of the BGP configuration.
41+
properties:
42+
asNumber:
43+
description: 'ASNumber is the default AS number used by a node. [Default:
44+
64512]'
45+
format: int32
46+
type: integer
47+
bindMode:
48+
description: |-
49+
BindMode indicates whether to listen for BGP connections on all addresses (None)
50+
or only on the node's canonical IP address Node.Spec.BGP.IPvXAddress (NodeIP).
51+
Default behaviour is to listen for BGP connections on all addresses.
52+
type: string
53+
communities:
54+
description: Communities is a list of BGP community values and their
55+
arbitrary names for tagging routes.
56+
items:
57+
description: Community contains standard or large community value
58+
and its name.
59+
properties:
60+
name:
61+
description: Name given to community value.
62+
type: string
63+
value:
64+
description: |-
65+
Value must be of format `aa:nn` or `aa:nn:mm`.
66+
For standard community use `aa:nn` format, where `aa` and `nn` are 16 bit number.
67+
For large community use `aa:nn:mm` format, where `aa`, `nn` and `mm` are 32 bit number.
68+
Where, `aa` is an AS Number, `nn` and `mm` are per-AS identifier.
69+
pattern: ^(\d+):(\d+)$|^(\d+):(\d+):(\d+)$
70+
type: string
71+
type: object
72+
type: array
73+
ignoredInterfaces:
74+
description: IgnoredInterfaces indicates the network interfaces that
75+
needs to be excluded when reading device routes.
76+
items:
77+
type: string
78+
type: array
79+
listenPort:
80+
description: ListenPort is the port where BGP protocol should listen.
81+
Defaults to 179
82+
maximum: 65535
83+
minimum: 1
84+
type: integer
85+
localWorkloadPeeringIPV4:
86+
description: |-
87+
The virtual IPv4 address of the node with which its local workload is expected to peer.
88+
It is recommended to use a link-local address.
89+
type: string
90+
localWorkloadPeeringIPV6:
91+
description: |-
92+
The virtual IPv6 address of the node with which its local workload is expected to peer.
93+
It is recommended to use a link-local address.
94+
type: string
95+
logSeverityScreen:
96+
description: 'LogSeverityScreen is the log severity above which logs
97+
are sent to the stdout. [Default: INFO]'
98+
type: string
99+
nodeMeshMaxRestartTime:
100+
description: |-
101+
Time to allow for software restart for node-to-mesh peerings. When specified, this is configured
102+
as the graceful restart timeout. When not specified, the BIRD default of 120s is used.
103+
This field can only be set on the default BGPConfiguration instance and requires that NodeMesh is enabled
104+
type: string
105+
nodeMeshPassword:
106+
description: |-
107+
Optional BGP password for full node-to-mesh peerings.
108+
This field can only be set on the default BGPConfiguration instance and requires that NodeMesh is enabled
109+
properties:
110+
secretKeyRef:
111+
description: Selects a key of a secret in the node pod's namespace.
112+
properties:
113+
key:
114+
description: The key of the secret to select from. Must be
115+
a valid secret key.
116+
type: string
117+
name:
118+
default: ""
119+
description: |-
120+
Name of the referent.
121+
This field is effectively required, but due to backwards compatibility is
122+
allowed to be empty. Instances of this type with an empty value here are
123+
almost certainly wrong.
124+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
125+
type: string
126+
optional:
127+
description: Specify whether the Secret or its key must be
128+
defined
129+
type: boolean
130+
required:
131+
- key
132+
type: object
133+
x-kubernetes-map-type: atomic
134+
type: object
135+
nodeToNodeMeshEnabled:
136+
description: 'NodeToNodeMeshEnabled sets whether full node to node
137+
BGP mesh is enabled. [Default: true]'
138+
type: boolean
139+
prefixAdvertisements:
140+
description: PrefixAdvertisements contains per-prefix advertisement
141+
configuration.
142+
items:
143+
description: PrefixAdvertisement configures advertisement properties
144+
for the specified CIDR.
145+
properties:
146+
cidr:
147+
description: CIDR for which properties should be advertised.
148+
type: string
149+
communities:
150+
description: |-
151+
Communities can be list of either community names already defined in `Specs.Communities` or community value of format `aa:nn` or `aa:nn:mm`.
152+
For standard community use `aa:nn` format, where `aa` and `nn` are 16 bit number.
153+
For large community use `aa:nn:mm` format, where `aa`, `nn` and `mm` are 32 bit number.
154+
Where,`aa` is an AS Number, `nn` and `mm` are per-AS identifier.
155+
items:
156+
type: string
157+
type: array
158+
type: object
159+
type: array
160+
serviceClusterIPs:
161+
description: |-
162+
ServiceClusterIPs are the CIDR blocks from which service cluster IPs are allocated.
163+
If specified, Calico will advertise these blocks, as well as any cluster IPs within them.
164+
items:
165+
description: ServiceClusterIPBlock represents a single allowed ClusterIP
166+
CIDR block.
167+
properties:
168+
cidr:
169+
type: string
170+
type: object
171+
type: array
172+
serviceExternalIPs:
173+
description: |-
174+
ServiceExternalIPs are the CIDR blocks for Kubernetes Service External IPs.
175+
Kubernetes Service ExternalIPs will only be advertised if they are within one of these blocks.
176+
items:
177+
description: ServiceExternalIPBlock represents a single allowed
178+
External IP CIDR block.
179+
properties:
180+
cidr:
181+
type: string
182+
type: object
183+
type: array
184+
serviceLoadBalancerIPs:
185+
description: |-
186+
ServiceLoadBalancerIPs are the CIDR blocks for Kubernetes Service LoadBalancer IPs.
187+
Kubernetes Service status.LoadBalancer.Ingress IPs will only be advertised if they are within one of these blocks.
188+
items:
189+
description: ServiceLoadBalancerIPBlock represents a single allowed
190+
LoadBalancer IP CIDR block.
191+
properties:
192+
cidr:
193+
type: string
194+
type: object
195+
type: array
196+
type: object
197+
type: object
198+
served: true
199+
storage: true

0 commit comments

Comments
 (0)