Skip to content

Commit

Permalink
Merge pull request #178 from ScheererJ/updates/calico-3.22.2
Browse files Browse the repository at this point in the history
Update to Calico v3.22.2
  • Loading branch information
ScheererJ authored May 10, 2022
2 parents d578aa9 + cf17af8 commit 75fdcfa
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 9 deletions.
10 changes: 5 additions & 5 deletions charts/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ images:
- name: calico-node
sourceRepository: github.com/projectcalico/calico
repository: docker.io/calico/node
tag: v3.22.1
tag: v3.22.2
targetVersion: ">= 1.17"
- name: calico-cni
sourceRepository: github.com/projectcalico/cni-plugin
repository: docker.io/calico/cni
tag: v3.22.1
tag: v3.22.2
targetVersion: ">= 1.17"
- name: calico-typha
sourceRepository: github.com/projectcalico/typha
repository: docker.io/calico/typha
tag: v3.22.1
tag: v3.22.2
targetVersion: ">= 1.17"
labels:
- name: cloud.gardener.cnudie/dso/scanning-hints/binary_id/v1
Expand All @@ -22,12 +22,12 @@ images:
- name: calico-kube-controllers
sourceRepository: github.com/projectcalico/kube-controllers
repository: docker.io/calico/kube-controllers
tag: v3.22.1
tag: v3.22.2
targetVersion: ">= 1.17"
- name: calico-podtodaemon-flex
sourceRepository: github.com/projectcalico/pod2daemon
repository: docker.io/calico/pod2daemon-flexvol
tag: v3.22.1
tag: v3.22.2
targetVersion: ">= 1.17"
- name: calico-cpa
sourceRepository: github.com/kubernetes-sigs/cluster-proportional-autoscaler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,20 @@ spec:
logs are emitted to the BPF trace pipe, accessible with the command
`tc exec bpf debug`. [Default: Off].'
type: string
bpfPSNATPorts:
anyOf:
- type: integer
- type: string
description: 'BPFPSNATPorts sets the range from which we randomly
pick a port if there is a source port collision. This should be
within the ephemeral range as defined by RFC 6056 (1024–65535) and
preferably outside the ephemeral ranges used by common operating
systems. Linux uses 32768–60999, while others mostly use the IANA
defined range 49152–65535. It is not necessarily a problem if this
range overlaps with the operating systems. Both ends of the range
are inclusive. [Default: 20000:29999]'
pattern: ^.*
x-kubernetes-int-or-string: true
chainInsertMode:
description: 'ChainInsertMode controls whether Felix hooks the kernel''s
top-level iptables chains by inserting a rule at the top of the
Expand Down Expand Up @@ -233,6 +247,14 @@ spec:
"true" or "false" will force the feature, empty or omitted values
are auto-detected.
type: string
floatingIPs:
default: Disabled
description: FloatingIPs configures whether or not Felix will program
floating IP addresses.
enum:
- Enabled
- Disabled
type: string
genericXDPEnabled:
description: 'GenericXDPEnabled enables Generic XDP so network cards
that don''t support XDP offload or driver modes can use XDP. This
Expand Down Expand Up @@ -349,6 +371,12 @@ spec:
pattern: ^.*
x-kubernetes-int-or-string: true
type: array
logDebugFilenameRegex:
description: LogDebugFilenameRegex controls which source code files
have their Debug log output included in the logs. Only logs from
files with names that match the given regular expression are included. The
filter only applies to Debug level logs.
type: string
logFilePath:
description: 'LogFilePath is the full path to the Felix log. Set to
none to disable file logging. [Default: /var/log/calico/felix.log]'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,27 @@ spec:
resource.
properties:
affinity:
description: Affinity of the block, if this block has one. If set,
it will be of the form "host:<hostname>". If not set, this block
is not affine to a host.
type: string
allocations:
description: Array of allocations in-use within this block. nil entries
mean the allocation is free. For non-nil entries at index i, the
index is the ordinal of the allocation within this block and the
value is the index of the associated attributes in the Attributes
array.
items:
type: integer
# TODO: This nullable is manually added in. We should update controller-gen
# to handle []*int properly itself.
nullable: true
type: array
attributes:
description: Attributes is an array of arbitrary metadata associated
with allocations in the block. To find attributes for a given allocation,
use the value of the allocation's entry in the Allocations array
as the index of the element in this array.
items:
properties:
handle_id:
Expand All @@ -55,12 +67,38 @@ spec:
type: object
type: array
cidr:
description: The block's CIDR.
type: string
deleted:
description: Deleted is an internal boolean used to workaround a limitation
in the Kubernetes API whereby deletion will not return a conflict
error if the block has been updated. It should not be set manually.
type: boolean
sequenceNumber:
default: 0
description: We store a sequence number that is updated each time
the block is written. Each allocation will also store the sequence
number of the block at the time of its creation. When releasing
an IP, passing the sequence number associated with the allocation
allows us to protect against a race condition and ensure the IP
hasn't been released and re-allocated since the release request.
format: int64
type: integer
sequenceNumberForAllocation:
additionalProperties:
format: int64
type: integer
description: Map of allocated ordinal within the block to sequence
number of the block at the time of allocation. Kubernetes does not
allow numerical keys for maps, so the key is cast to a string.
type: object
strictAffinity:
description: StrictAffinity on the IPAMBlock is deprecated and no
longer used by the code. Use IPAMConfig StrictAffinity instead.
type: boolean
unallocated:
description: Unallocated is an ordered list of allocations which are
free in the block.
items:
type: integer
type: array
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ spec:
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
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ spec:
type: string
type: object
type: object
debugProfilePort:
description: DebugProfilePort configures the port to serve memory
and cpu profiles on. If not specified, profiling is disabled.
format: int32
type: integer
etcdV3CompactionPeriod:
description: 'EtcdV3CompactionPeriod is the period between etcdv3
compaction requests. Set to 0 to disable. [Default: 10m]'
Expand Down Expand Up @@ -212,6 +217,11 @@ spec:
type: string
type: object
type: object
debugProfilePort:
description: DebugProfilePort configures the port to serve memory
and cpu profiles on. If not specified, profiling is disabled.
format: int32
type: integer
etcdV3CompactionPeriod:
description: 'EtcdV3CompactionPeriod is the period between etcdv3
compaction requests. Set to 0 to disable. [Default: 10m]'
Expand Down

0 comments on commit 75fdcfa

Please sign in to comment.