mirror of https://git.rancher.io/rke2-charts
Roberto Bonafiglia
GitHub
commit
b26649a8a9
|
|
@ -1,263 +0,0 @@
|
||||||
|
|
||||||
---
|
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
annotations:
|
|
||||||
controller-gen.kubebuilder.io/version: (devel)
|
|
||||||
creationTimestamp: null
|
|
||||||
name: caliconodestatuses.crd.projectcalico.org
|
|
||||||
spec:
|
|
||||||
group: crd.projectcalico.org
|
|
||||||
names:
|
|
||||||
kind: CalicoNodeStatus
|
|
||||||
listKind: CalicoNodeStatusList
|
|
||||||
plural: caliconodestatuses
|
|
||||||
singular: caliconodestatus
|
|
||||||
scope: Cluster
|
|
||||||
versions:
|
|
||||||
- name: v1
|
|
||||||
schema:
|
|
||||||
openAPIV3Schema:
|
|
||||||
properties:
|
|
||||||
apiVersion:
|
|
||||||
description: 'APIVersion defines the versioned schema of this representation
|
|
||||||
of an object. Servers should convert recognized schemas to the latest
|
|
||||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
|
||||||
type: string
|
|
||||||
kind:
|
|
||||||
description: 'Kind is a string value representing the REST resource this
|
|
||||||
object represents. Servers may infer this from the endpoint the client
|
|
||||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|
||||||
type: string
|
|
||||||
metadata:
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: CalicoNodeStatusSpec contains the specification for a CalicoNodeStatus
|
|
||||||
resource.
|
|
||||||
properties:
|
|
||||||
classes:
|
|
||||||
description: Classes declares the types of information to monitor
|
|
||||||
for this calico/node, and allows for selective status reporting
|
|
||||||
about certain subsets of information.
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
type: array
|
|
||||||
node:
|
|
||||||
description: The node name identifies the Calico node instance for
|
|
||||||
node status.
|
|
||||||
type: string
|
|
||||||
updatePeriodSeconds:
|
|
||||||
description: UpdatePeriodSeconds is the period at which CalicoNodeStatus
|
|
||||||
should be updated. Set to 0 to disable CalicoNodeStatus refresh.
|
|
||||||
Maximum update period is one day.
|
|
||||||
format: int32
|
|
||||||
type: integer
|
|
||||||
type: object
|
|
||||||
status:
|
|
||||||
description: CalicoNodeStatusStatus defines the observed state of CalicoNodeStatus.
|
|
||||||
No validation needed for status since it is updated by Calico.
|
|
||||||
properties:
|
|
||||||
agent:
|
|
||||||
description: Agent holds agent status on the node.
|
|
||||||
properties:
|
|
||||||
birdV4:
|
|
||||||
description: BIRDV4 represents the latest observed status of bird4.
|
|
||||||
properties:
|
|
||||||
lastBootTime:
|
|
||||||
description: LastBootTime holds the value of lastBootTime
|
|
||||||
from bird.ctl output.
|
|
||||||
type: string
|
|
||||||
lastReconfigurationTime:
|
|
||||||
description: LastReconfigurationTime holds the value of lastReconfigTime
|
|
||||||
from bird.ctl output.
|
|
||||||
type: string
|
|
||||||
routerID:
|
|
||||||
description: Router ID used by bird.
|
|
||||||
type: string
|
|
||||||
state:
|
|
||||||
description: The state of the BGP Daemon.
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
description: Version of the BGP daemon
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
birdV6:
|
|
||||||
description: BIRDV6 represents the latest observed status of bird6.
|
|
||||||
properties:
|
|
||||||
lastBootTime:
|
|
||||||
description: LastBootTime holds the value of lastBootTime
|
|
||||||
from bird.ctl output.
|
|
||||||
type: string
|
|
||||||
lastReconfigurationTime:
|
|
||||||
description: LastReconfigurationTime holds the value of lastReconfigTime
|
|
||||||
from bird.ctl output.
|
|
||||||
type: string
|
|
||||||
routerID:
|
|
||||||
description: Router ID used by bird.
|
|
||||||
type: string
|
|
||||||
state:
|
|
||||||
description: The state of the BGP Daemon.
|
|
||||||
type: string
|
|
||||||
version:
|
|
||||||
description: Version of the BGP daemon
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
bgp:
|
|
||||||
description: BGP holds node BGP status.
|
|
||||||
properties:
|
|
||||||
numberEstablishedV4:
|
|
||||||
description: The total number of IPv4 established bgp sessions.
|
|
||||||
type: integer
|
|
||||||
numberEstablishedV6:
|
|
||||||
description: The total number of IPv6 established bgp sessions.
|
|
||||||
type: integer
|
|
||||||
numberNotEstablishedV4:
|
|
||||||
description: The total number of IPv4 non-established bgp sessions.
|
|
||||||
type: integer
|
|
||||||
numberNotEstablishedV6:
|
|
||||||
description: The total number of IPv6 non-established bgp sessions.
|
|
||||||
type: integer
|
|
||||||
peersV4:
|
|
||||||
description: PeersV4 represents IPv4 BGP peers status on the node.
|
|
||||||
items:
|
|
||||||
description: CalicoNodePeer contains the status of BGP peers
|
|
||||||
on the node.
|
|
||||||
properties:
|
|
||||||
peerIP:
|
|
||||||
description: IP address of the peer whose condition we are
|
|
||||||
reporting.
|
|
||||||
type: string
|
|
||||||
since:
|
|
||||||
description: Since the state or reason last changed.
|
|
||||||
type: string
|
|
||||||
state:
|
|
||||||
description: State is the BGP session state.
|
|
||||||
type: string
|
|
||||||
type:
|
|
||||||
description: Type indicates whether this peer is configured
|
|
||||||
via the node-to-node mesh, or via en explicit global or
|
|
||||||
per-node BGPPeer object.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
peersV6:
|
|
||||||
description: PeersV6 represents IPv6 BGP peers status on the node.
|
|
||||||
items:
|
|
||||||
description: CalicoNodePeer contains the status of BGP peers
|
|
||||||
on the node.
|
|
||||||
properties:
|
|
||||||
peerIP:
|
|
||||||
description: IP address of the peer whose condition we are
|
|
||||||
reporting.
|
|
||||||
type: string
|
|
||||||
since:
|
|
||||||
description: Since the state or reason last changed.
|
|
||||||
type: string
|
|
||||||
state:
|
|
||||||
description: State is the BGP session state.
|
|
||||||
type: string
|
|
||||||
type:
|
|
||||||
description: Type indicates whether this peer is configured
|
|
||||||
via the node-to-node mesh, or via en explicit global or
|
|
||||||
per-node BGPPeer object.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
required:
|
|
||||||
- numberEstablishedV4
|
|
||||||
- numberEstablishedV6
|
|
||||||
- numberNotEstablishedV4
|
|
||||||
- numberNotEstablishedV6
|
|
||||||
type: object
|
|
||||||
lastUpdated:
|
|
||||||
description: LastUpdated is a timestamp representing the server time
|
|
||||||
when CalicoNodeStatus object last updated. It is represented in
|
|
||||||
RFC3339 form and is in UTC.
|
|
||||||
format: date-time
|
|
||||||
nullable: true
|
|
||||||
type: string
|
|
||||||
routes:
|
|
||||||
description: Routes reports routes known to the Calico BGP daemon
|
|
||||||
on the node.
|
|
||||||
properties:
|
|
||||||
routesV4:
|
|
||||||
description: RoutesV4 represents IPv4 routes on the node.
|
|
||||||
items:
|
|
||||||
description: CalicoNodeRoute contains the status of BGP routes
|
|
||||||
on the node.
|
|
||||||
properties:
|
|
||||||
destination:
|
|
||||||
description: Destination of the route.
|
|
||||||
type: string
|
|
||||||
gateway:
|
|
||||||
description: Gateway for the destination.
|
|
||||||
type: string
|
|
||||||
interface:
|
|
||||||
description: Interface for the destination
|
|
||||||
type: string
|
|
||||||
learnedFrom:
|
|
||||||
description: LearnedFrom contains information regarding
|
|
||||||
where this route originated.
|
|
||||||
properties:
|
|
||||||
peerIP:
|
|
||||||
description: If sourceType is NodeMesh or BGPPeer, IP
|
|
||||||
address of the router that sent us this route.
|
|
||||||
type: string
|
|
||||||
sourceType:
|
|
||||||
description: Type of the source where a route is learned
|
|
||||||
from.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type:
|
|
||||||
description: Type indicates if the route is being used for
|
|
||||||
forwarding or not.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
routesV6:
|
|
||||||
description: RoutesV6 represents IPv6 routes on the node.
|
|
||||||
items:
|
|
||||||
description: CalicoNodeRoute contains the status of BGP routes
|
|
||||||
on the node.
|
|
||||||
properties:
|
|
||||||
destination:
|
|
||||||
description: Destination of the route.
|
|
||||||
type: string
|
|
||||||
gateway:
|
|
||||||
description: Gateway for the destination.
|
|
||||||
type: string
|
|
||||||
interface:
|
|
||||||
description: Interface for the destination
|
|
||||||
type: string
|
|
||||||
learnedFrom:
|
|
||||||
description: LearnedFrom contains information regarding
|
|
||||||
where this route originated.
|
|
||||||
properties:
|
|
||||||
peerIP:
|
|
||||||
description: If sourceType is NodeMesh or BGPPeer, IP
|
|
||||||
address of the router that sent us this route.
|
|
||||||
type: string
|
|
||||||
sourceType:
|
|
||||||
description: Type of the source where a route is learned
|
|
||||||
from.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type:
|
|
||||||
description: Type indicates if the route is being used for
|
|
||||||
forwarding or not.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
status:
|
|
||||||
acceptedNames:
|
|
||||||
kind: ""
|
|
||||||
plural: ""
|
|
||||||
conditions: []
|
|
||||||
storedVersions: []
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
|
||||||
kind: CustomResourceDefinition
|
|
||||||
metadata:
|
|
||||||
name: ipreservations.crd.projectcalico.org
|
|
||||||
spec:
|
|
||||||
group: crd.projectcalico.org
|
|
||||||
names:
|
|
||||||
kind: IPReservation
|
|
||||||
listKind: IPReservationList
|
|
||||||
plural: ipreservations
|
|
||||||
singular: ipreservation
|
|
||||||
scope: Cluster
|
|
||||||
versions:
|
|
||||||
- name: v1
|
|
||||||
schema:
|
|
||||||
openAPIV3Schema:
|
|
||||||
properties:
|
|
||||||
apiVersion:
|
|
||||||
description: 'APIVersion defines the versioned schema of this representation
|
|
||||||
of an object. Servers should convert recognized schemas to the latest
|
|
||||||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
|
|
||||||
type: string
|
|
||||||
kind:
|
|
||||||
description: 'Kind is a string value representing the REST resource this
|
|
||||||
object represents. Servers may infer this from the endpoint the client
|
|
||||||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
|
|
||||||
type: string
|
|
||||||
metadata:
|
|
||||||
type: object
|
|
||||||
spec:
|
|
||||||
description: IPReservationSpec contains the specification for an IPReservation
|
|
||||||
resource.
|
|
||||||
properties:
|
|
||||||
reservedCIDRs:
|
|
||||||
description: ReservedCIDRs is a list of CIDRs and/or IP addresses
|
|
||||||
that Calico IPAM will exclude from new allocations.
|
|
||||||
items:
|
|
||||||
type: string
|
|
||||||
type: array
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
served: true
|
|
||||||
storage: true
|
|
||||||
status:
|
|
||||||
acceptedNames:
|
|
||||||
kind: ""
|
|
||||||
plural: ""
|
|
||||||
conditions: []
|
|
||||||
storedVersions: []
|
|
||||||
|
|
@ -10,6 +10,6 @@
|
||||||
- https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
|
- https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
|
||||||
- https://github.com/tigera/operator
|
- https://github.com/tigera/operator
|
||||||
- https://github.com/projectcalico/calico
|
- https://github.com/projectcalico/calico
|
||||||
version: v3.22.2
|
version: v3.23.0
|
||||||
+annotations:
|
+annotations:
|
||||||
+ catalog.cattle.io/namespace: tigera-operator
|
+ catalog.cattle.io/namespace: tigera-operator
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
--- charts-original/crds/calico/kdd/crd.projectcalico.org_bgppeers.yaml
|
--- charts-original/crds/calico/crd.projectcalico.org_bgppeers.yaml
|
||||||
+++ charts/crds/calico/kdd/crd.projectcalico.org_bgppeers.yaml
|
+++ charts/crds/calico/crd.projectcalico.org_bgppeers.yaml
|
||||||
@@ -41,8 +41,8 @@
|
@@ -41,8 +41,8 @@
|
||||||
in the specific branch of the Node on "bird.cfg".
|
in the specific branch of the Node on "bird.cfg".
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
--- charts-original/crds/calico/kdd/crd.projectcalico.org_felixconfigurations.yaml
|
--- charts-original/crds/calico/crd.projectcalico.org_felixconfigurations.yaml
|
||||||
+++ charts/crds/calico/kdd/crd.projectcalico.org_felixconfigurations.yaml
|
+++ charts/crds/calico/crd.projectcalico.org_felixconfigurations.yaml
|
||||||
@@ -43,7 +43,7 @@
|
@@ -43,7 +43,7 @@
|
||||||
type: boolean
|
type: boolean
|
||||||
awsSrcDstCheck:
|
awsSrcDstCheck:
|
||||||
|
|
@ -9,10 +9,10 @@
|
||||||
DoNothing]'
|
DoNothing]'
|
||||||
enum:
|
enum:
|
||||||
- DoNothing
|
- DoNothing
|
||||||
@@ -77,13 +77,6 @@
|
@@ -82,13 +82,6 @@
|
||||||
description: 'BPFEnabled, if enabled Felix will use the BPF dataplane.
|
BPF programs regardless of what is the per-interfaces or global
|
||||||
[Default: false]'
|
setting. Possible values are Disabled or Strict. [Default: Strict]'
|
||||||
type: boolean
|
type: string
|
||||||
- bpfExtToServiceConnmark:
|
- bpfExtToServiceConnmark:
|
||||||
- description: 'BPFExtToServiceConnmark in BPF mode, control a 32bit
|
- description: 'BPFExtToServiceConnmark in BPF mode, control a 32bit
|
||||||
- mark that is set on connections from an external client to a local
|
- mark that is set on connections from an external client to a local
|
||||||
|
|
@ -23,22 +23,21 @@
|
||||||
bpfExternalServiceMode:
|
bpfExternalServiceMode:
|
||||||
description: 'BPFExternalServiceMode in BPF mode, controls how connections
|
description: 'BPFExternalServiceMode in BPF mode, controls how connections
|
||||||
from outside the cluster to services (node ports and cluster IPs)
|
from outside the cluster to services (node ports and cluster IPs)
|
||||||
@@ -94,6 +87,14 @@
|
@@ -99,6 +92,13 @@
|
||||||
node appears to use the IP of the ingress node; this requires a
|
node appears to use the IP of the ingress node; this requires a
|
||||||
permissive L2 network. [Default: Tunnel]'
|
permissive L2 network. [Default: Tunnel]'
|
||||||
type: string
|
type: string
|
||||||
+ bpfExtToServiceConnmark:
|
+ bpfExtToServiceConnmark:
|
||||||
+ description: 'BPFExtToServiceConnmark in BPF mode, controls a
|
+ description: 'BPFExtToServiceConnmark in BPF mode, control a 32bit
|
||||||
+ 32bit mark that is set on connections from an external client to
|
+ mark that is set on connections from an external client to a local
|
||||||
+ a local service. This mark allows us to control how packets of
|
+ service. This mark allows us to control how packets of that connection
|
||||||
+ that connection are routed within the host and how is routing
|
+ are routed within the host and how is routing intepreted by RPF
|
||||||
+ intepreted by RPF check. [Default: 0]'
|
+ check. [Default: 0]'
|
||||||
+ type: integer
|
+ type: integer
|
||||||
+
|
|
||||||
bpfKubeProxyEndpointSlicesEnabled:
|
bpfKubeProxyEndpointSlicesEnabled:
|
||||||
description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls
|
description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls
|
||||||
whether Felix's embedded kube-proxy accepts EndpointSlices or not.
|
whether Felix's embedded kube-proxy accepts EndpointSlices or not.
|
||||||
@@ -442,12 +443,6 @@
|
@@ -525,12 +525,6 @@
|
||||||
to false. This reduces the number of metrics reported, reducing
|
to false. This reduces the number of metrics reported, reducing
|
||||||
Prometheus load. [Default: true]'
|
Prometheus load. [Default: true]'
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
@ -51,7 +50,7 @@
|
||||||
removeExternalRoutes:
|
removeExternalRoutes:
|
||||||
description: Whether or not to remove device routes that have not
|
description: Whether or not to remove device routes that have not
|
||||||
been programmed by Felix. Disabling this will allow external applications
|
been programmed by Felix. Disabling this will allow external applications
|
||||||
@@ -529,10 +524,6 @@
|
@@ -637,10 +631,6 @@
|
||||||
description: 'WireguardEnabled controls whether Wireguard is enabled.
|
description: 'WireguardEnabled controls whether Wireguard is enabled.
|
||||||
[Default: false]'
|
[Default: false]'
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
--- charts-original/crds/calico/kdd/crd.projectcalico.org_globalnetworkpolicies.yaml
|
--- charts-original/crds/calico/crd.projectcalico.org_globalnetworkpolicies.yaml
|
||||||
+++ charts/crds/calico/kdd/crd.projectcalico.org_globalnetworkpolicies.yaml
|
+++ charts/crds/calico/crd.projectcalico.org_globalnetworkpolicies.yaml
|
||||||
@@ -169,8 +169,8 @@
|
@@ -169,8 +169,8 @@
|
||||||
within the selected service(s) will be matched, and only
|
within the selected service(s) will be matched, and only
|
||||||
to/from each endpoint's port. \n Services cannot be specified
|
to/from each endpoint's port. \n Services cannot be specified
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
--- charts-original/crds/calico/kdd/crd.projectcalico.org_ippools.yaml
|
--- charts-original/crds/calico/crd.projectcalico.org_ippools.yaml
|
||||||
+++ charts/crds/calico/kdd/crd.projectcalico.org_ippools.yaml
|
+++ charts/crds/calico/crd.projectcalico.org_ippools.yaml
|
||||||
@@ -30,12 +30,6 @@
|
@@ -30,12 +30,6 @@
|
||||||
spec:
|
spec:
|
||||||
description: IPPoolSpec contains the specification for an IPPool resource.
|
description: IPPoolSpec contains the specification for an IPPool resource.
|
||||||
|
|
@ -12,15 +12,15 @@
|
||||||
- type: array
|
- type: array
|
||||||
blockSize:
|
blockSize:
|
||||||
description: The block size to use for IP address assignments from
|
description: The block size to use for IP address assignments from
|
||||||
this pool. Defaults to 26 for IPv4 and 112 for IPv6.
|
this pool. Defaults to 26 for IPv4 and 122 for IPv6.
|
||||||
@@ -47,10 +41,6 @@
|
@@ -43,10 +37,6 @@
|
||||||
|
cidr:
|
||||||
|
description: The pool CIDR.
|
||||||
|
type: string
|
||||||
|
- disableBGPExport:
|
||||||
|
- description: 'Disable exporting routes from this IP Pool''s CIDR over
|
||||||
|
- BGP. [Default: false]'
|
||||||
|
- type: boolean
|
||||||
|
disabled:
|
||||||
description: When disabled is true, Calico IPAM will not assign addresses
|
description: When disabled is true, Calico IPAM will not assign addresses
|
||||||
from this pool.
|
from this pool.
|
||||||
type: boolean
|
|
||||||
- disableBGPExport:
|
|
||||||
- description: "Disable exporting routes from this IP Pool's CIDR over
|
|
||||||
- BGP. [Default: false]"
|
|
||||||
- type: boolean
|
|
||||||
ipip:
|
|
||||||
description: 'Deprecated: this field is only used for APIv1 backwards
|
|
||||||
compatibility. Setting this field is not allowed, this field is
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
--- charts-original/crds/calico/kdd/crd.projectcalico.org_networkpolicies.yaml
|
--- charts-original/crds/calico/crd.projectcalico.org_networkpolicies.yaml
|
||||||
+++ charts/crds/calico/kdd/crd.projectcalico.org_networkpolicies.yaml
|
+++ charts/crds/calico/crd.projectcalico.org_networkpolicies.yaml
|
||||||
@@ -158,8 +158,8 @@
|
@@ -158,8 +158,8 @@
|
||||||
within the selected service(s) will be matched, and only
|
within the selected service(s) will be matched, and only
|
||||||
to/from each endpoint's port. \n Services cannot be specified
|
to/from each endpoint's port. \n Services cannot be specified
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- charts-original/templates/crs/custom-resources.yaml
|
--- charts-original/templates/crs/custom-resources.yaml
|
||||||
+++ charts/templates/crs/custom-resources.yaml
|
+++ charts/templates/crs/custom-resources.yaml
|
||||||
@@ -6,6 +6,30 @@
|
@@ -6,6 +6,28 @@
|
||||||
{{ $secrets = append $secrets $item }}
|
{{ $secrets = append $secrets $item }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ $_ := set $installSpec "imagePullSecrets" $secrets }}
|
{{ $_ := set $installSpec "imagePullSecrets" $secrets }}
|
||||||
|
|
@ -15,18 +15,16 @@
|
||||||
+If there is a defined ipv6 CIDR, we must add it as a new IPPool, disable any encapsulation and enable bgp
|
+If there is a defined ipv6 CIDR, we must add it as a new IPPool, disable any encapsulation and enable bgp
|
||||||
+*/}}
|
+*/}}
|
||||||
+{{ if not (empty .Values.global.clusterCIDRv6) }}
|
+{{ if not (empty .Values.global.clusterCIDRv6) }}
|
||||||
+{{ $myIP6Dict := dict "natOutgoing" "Enabled" "cidr" .Values.global.clusterCIDRv6 }}
|
+{{ $myIP6Dict := dict "natOutgoing" "Enabled" "encapsulation" "VXLAN" "cidr" .Values.global.clusterCIDRv6 }}
|
||||||
+{{ $finalIpPoolList := list $myIP6Dict }}
|
+{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}
|
||||||
+{{ if not (empty .Values.global.clusterCIDRv4) }}
|
+{{ if not (empty .Values.global.clusterCIDRv4) }}
|
||||||
+{{ $allIpPools := get .Values.installation.calicoNetwork "ipPools" }}
|
+{{ $allIpPools := get .Values.installation.calicoNetwork "ipPools" }}
|
||||||
+{{ range $allIpPools }}
|
|
||||||
+{{ $_ := set . "encapsulation" "None" }}
|
|
||||||
+{{ end }}
|
|
||||||
+{{ $finalIpPoolList := append $allIpPools $myIP6Dict }}
|
+{{ $finalIpPoolList := append $allIpPools $myIP6Dict }}
|
||||||
+{ end }}
|
|
||||||
+{{ $calicoNetwork := get .Values.installation "calicoNetwork" }}
|
|
||||||
+{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
|
+{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
|
||||||
+{{ $_ := set $calicoNetwork "bgp" "Enabled" }}
|
+{{ else }}
|
||||||
|
+{{ $finalIpPoolList := list $myIP6Dict }}
|
||||||
|
+{{ $_ := set $calicoNetwork "ipPools" $finalIpPoolList }}
|
||||||
|
+{{ end }}
|
||||||
+{{ end }}
|
+{{ end }}
|
||||||
|
|
||||||
apiVersion: operator.tigera.io/v1
|
apiVersion: operator.tigera.io/v1
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
- rbac.authorization.k8s.io
|
- rbac.authorization.k8s.io
|
||||||
resources:
|
resources:
|
||||||
@@ -148,6 +147,13 @@
|
@@ -149,6 +148,13 @@
|
||||||
- delete
|
- delete
|
||||||
- watch
|
- watch
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
command:
|
command:
|
||||||
- operator
|
- operator
|
||||||
@@ -74,7 +74,6 @@
|
@@ -78,7 +78,6 @@
|
||||||
command:
|
command:
|
||||||
- calicoctl
|
- calicoctl
|
||||||
args:
|
args:
|
||||||
|
|
|
||||||
|
|
@ -30,20 +30,19 @@
|
||||||
|
|
||||||
certs:
|
certs:
|
||||||
node:
|
node:
|
||||||
@@ -20,9 +37,24 @@
|
@@ -22,9 +38,24 @@
|
||||||
|
|
||||||
# Configuration for the tigera operator
|
# Configuration for the tigera operator
|
||||||
tigeraOperator:
|
tigeraOperator:
|
||||||
- image: tigera/operator
|
- image: tigera/operator
|
||||||
- version: v1.25.7
|
|
||||||
- registry: quay.io
|
|
||||||
+ image: rancher/mirrored-calico-operator
|
+ image: rancher/mirrored-calico-operator
|
||||||
+ version: v1.25.8
|
version: v1.27.0
|
||||||
|
- registry: quay.io
|
||||||
+ registry: docker.io
|
+ registry: docker.io
|
||||||
calicoctl:
|
calicoctl:
|
||||||
- image: docker.io/calico/ctl
|
- image: docker.io/calico/ctl
|
||||||
+ image: rancher/mirrored-calico-ctl
|
+ image: rancher/mirrored-calico-ctl
|
||||||
tag: v3.22.2
|
tag: v3.23.0
|
||||||
+
|
+
|
||||||
+global:
|
+global:
|
||||||
+ systemDefaultRegistry: ""
|
+ systemDefaultRegistry: ""
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
url: https://github.com/projectcalico/calico/releases/download/v3.22.2/tigera-operator-v3.22.2.tgz
|
url: https://github.com/projectcalico/calico/releases/download/v3.23.0/tigera-operator-v3.23.0.tgz
|
||||||
packageVersion: 03
|
packageVersion: 01
|
||||||
additionalCharts:
|
additionalCharts:
|
||||||
- workingDir: charts-crd
|
- workingDir: charts-crd
|
||||||
crdOptions:
|
crdOptions:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
version: v3.22.0
|
version: v3.23.0
|
||||||
description: Installs the CRDs for rke2-calico
|
description: Installs the CRDs for rke2-calico
|
||||||
name: rke2-calico-crd
|
name: rke2-calico-crd
|
||||||
type: application
|
type: application
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue