Merge pull request #305 from thomasferrandiz/calico-v3.24.5

update rke2-calico to v3.24.5
pull/308/head
thomasferrandiz 2022-12-01 17:54:18 +01:00 committed by GitHub
commit 19f07bf58c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 105 additions and 9 deletions

View File

@ -10,6 +10,6 @@
- https://github.com/projectcalico/calico/tree/master/calico/_includes/charts/tigera-operator
- https://github.com/tigera/operator
- https://github.com/projectcalico/calico
version: v3.24.1
version: v3.24.5
+annotations:
+ catalog.cattle.io/namespace: tigera-operator

View File

@ -0,0 +1,11 @@
--- charts-original/README.md
+++ charts/README.md
@@ -88,7 +88,7 @@
```
# Image pull secrets to provision for pulling images from private registries.
-# This field is a map of desired Secret name to .dockerconfigjson formatted data to use for the secret.
+# If provided, references to the secrets must also be provided in the installation section.
imagePullSecrets: {}
# Configures general installation parameters for Calico. Schema is based

View File

@ -0,0 +1,25 @@
--- charts-original/crds/calico/crd.projectcalico.org_felixconfigurations.yaml
+++ charts/crds/calico/crd.projectcalico.org_felixconfigurations.yaml
@@ -100,11 +100,6 @@
node appears to use the IP of the ingress node; this requires a
permissive L2 network. [Default: Tunnel]'
type: string
- bpfHostConntrackBypass:
- description: 'BPFHostConntrackBypass Controls whether to bypass Linux
- conntrack in BPF mode for workloads and services. [Default: true
- - bypass Linux conntrack]'
- type: boolean
bpfKubeProxyEndpointSlicesEnabled:
description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls
whether Felix's embedded kube-proxy accepts EndpointSlices or not.
@@ -637,8 +632,8 @@
type: boolean
vxlanEnabled:
description: 'VXLANEnabled overrides whether Felix should create the
- VXLAN tunnel device for IPv4 VXLAN networking. Optional as Felix
- determines this based on the existing IP pools. [Default: nil (unset)]'
+ VXLAN tunnel device for VXLAN networking. Optional as Felix determines
+ this based on the existing IP pools. [Default: nil (unset)]'
type: boolean
vxlanMTU:
description: 'VXLANMTU is the MTU to set on the IPv4 VXLAN tunnel

View File

@ -24,3 +24,12 @@
disabled:
description: When disabled is true, Calico IPAM will not assign addresses
from this pool.
@@ -81,7 +71,7 @@
for internal use only.'
type: boolean
natOutgoing:
- description: When natOutgoing is true, packets sent from Calico networked
+ description: When nat-outgoing is true, packets sent from Calico networked
containers in this pool to destinations outside of this pool will
be masqueraded.
type: boolean

View File

@ -14,7 +14,31 @@
controlPlaneTolerations:
description: ControlPlaneTolerations specify tolerations which are
then globally applied to all resources created by the operator.
@@ -4337,10 +4330,6 @@
@@ -4202,14 +4195,6 @@
type: string
type: object
type: array
- fipsMode:
- description: 'FIPSMode uses images and features only that are using
- FIPS 140-2 validated cryptographic modules and standards. Default:
- Disabled'
- enum:
- - Enabled
- - Disabled
- type: string
flexVolumePath:
description: FlexVolumePath optionally specifies a custom path for
FlexVolume. If not specified, FlexVolume will be enabled by default.
@@ -4253,7 +4238,7 @@
kubeletVolumePluginPath:
description: 'KubeletVolumePluginPath optionally specifies enablement
of Calico CSI plugin. If not specified, CSI will be enabled by default.
- If set to ''None'', CSI will be disabled. Default: /var/lib/kubelet'
+ If set to "None", CSI will be disabled. Default: /var/lib/kubelet'
type: string
kubernetesProvider:
description: KubernetesProvider specifies a particular provider of
@@ -4345,10 +4330,6 @@
or "OnDelete". Default is RollingUpdate.
type: string
type: object
@ -25,7 +49,7 @@
registry:
description: "Registry is the default Docker registry used for component
Docker images. If specified then the given value must end with a
@@ -10305,13 +10294,6 @@
@@ -10313,13 +10294,6 @@
plane nodes on which to run Calico components. This is globally
applied to all resources created by the operator excluding daemonsets.
type: object
@ -39,7 +63,34 @@
controlPlaneTolerations:
description: ControlPlaneTolerations specify tolerations which
are then globally applied to all resources created by the operator.
@@ -10490,10 +10472,6 @@
@@ -10362,14 +10336,6 @@
type: string
type: object
type: array
- fipsMode:
- description: 'FIPSMode uses images and features only that are
- using FIPS 140-2 validated cryptographic modules and standards.
- Default: Disabled'
- enum:
- - Enabled
- - Disabled
- type: string
flexVolumePath:
description: FlexVolumePath optionally specifies a custom path
for FlexVolume. If not specified, FlexVolume will be enabled
@@ -10412,9 +10378,8 @@
type: array
kubeletVolumePluginPath:
description: 'KubeletVolumePluginPath optionally specifies enablement
- of Calico CSI plugin. If not specified, CSI will be enabled
- by default. If set to ''None'', CSI will be disabled. Default:
- /var/lib/kubelet'
+ of Calico CSI plugin. If not specified, CSI will be enabled by default.
+ If set to "None", CSI will be disabled. Default: /var/lib/kubelet'
type: string
kubernetesProvider:
description: KubernetesProvider specifies a particular provider
@@ -10507,10 +10472,6 @@
or "OnDelete". Default is RollingUpdate.
type: string
type: object

View File

@ -32,13 +32,13 @@
tigeraOperator:
- image: tigera/operator
+ image: rancher/mirrored-calico-operator
version: v1.28.1
version: v1.28.5
- registry: quay.io
+ registry: docker.io
calicoctl:
- image: docker.io/calico/ctl
+ image: rancher/mirrored-calico-ctl
tag: v3.24.1
tag: v3.24.5
+
+global:
+ systemDefaultRegistry: ""

View File

@ -1,5 +1,5 @@
url: https://github.com/projectcalico/calico/releases/download/v3.24.1/tigera-operator-v3.24.1.tgz
packageVersion: 03
url: https://github.com/projectcalico/calico/releases/download/v3.24.5/tigera-operator-v3.24.5.tgz
packageVersion: 01
additionalCharts:
- workingDir: charts-crd
crdOptions:

View File

@ -1,5 +1,5 @@
apiVersion: v1
version: v3.24.1
version: v3.24.5
description: Installs the CRDs for rke2-calico
name: rke2-calico-crd
type: application