Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions config/calico_versions.yml
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
# Components defined here are required to be kept in sync with hack/gen-versions/calico.go.tpl
title: v3.30.5
title: v3.30.6
components:
libcalico-go:
version: v3.30.5
version: v3.30.6
typha:
version: v3.30.5
version: v3.30.6
calico/node:
version: v3.30.5
version: v3.30.6
calico/cni:
version: v3.30.5
version: v3.30.6
calico/node-windows:
version: v3.30.5
version: v3.30.6
calico/cni-windows:
version: v3.30.5
version: v3.30.6
calico/kube-controllers:
version: v3.30.5
version: v3.30.6
calico/goldmane:
version: v3.30.5
version: v3.30.6
flexvol:
version: v3.30.5
version: v3.30.6
calico/apiserver:
version: v3.30.5
version: v3.30.6
calico/csi:
version: v3.30.5
version: v3.30.6
csi-node-driver-registrar:
version: v3.30.5
version: v3.30.6
key-cert-provisioner:
version: v3.30.5
version: v3.30.6
calico/whisker:
version: v3.30.5
version: v3.30.6
calico/whisker-backend:
version: v3.30.5
version: v3.30.6
calico/envoy-gateway:
version: v3.30.5
version: v3.30.6
calico/envoy-proxy:
version: v3.30.5
version: v3.30.6
calico/envoy-ratelimit:
version: v3.30.5
version: v3.30.6
calico/guardian:
version: v3.30.5
version: v3.30.6
52 changes: 26 additions & 26 deletions pkg/components/calico.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,154 +20,154 @@ package components
import "github.com/tigera/operator/version"

var (
CalicoRelease string = "v3.30.5"
CalicoRelease string = "v3.30.6"

ComponentCalicoCNI = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/cni",
Registry: "",
}

ComponentCalicoCNIFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/cni",
Registry: "",
}

ComponentCalicoCNIWindows = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/cni-windows",
Registry: "",
}

ComponentCalicoCSRInitContainer = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/key-cert-provisioner",
Registry: "",
}

ComponentCalicoKubeControllers = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/kube-controllers",
Registry: "",
}

ComponentCalicoKubeControllersFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/kube-controllers",
Registry: "",
}

ComponentCalicoNode = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/node",
Registry: "",
}

ComponentCalicoNodeFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/node",
Registry: "",
}

ComponentCalicoNodeWindows = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/node-windows",
Registry: "",
}

ComponentCalicoTypha = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/typha",
Registry: "",
}

ComponentCalicoTyphaFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/typha",
Registry: "",
}

ComponentCalicoFlexVolume = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/pod2daemon-flexvol",
Registry: "",
}

ComponentCalicoAPIServer = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/apiserver",
Registry: "",
}

ComponentCalicoAPIServerFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/apiserver",
Registry: "",
}

ComponentCalicoCSI = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/csi",
Registry: "",
}

ComponentCalicoCSIFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/csi",
Registry: "",
}

ComponentCalicoCSIRegistrar = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/node-driver-registrar",
Registry: "",
}

ComponentCalicoCSIRegistrarFIPS = Component{
Version: "v3.30.5-fips",
Version: "v3.30.6-fips",
Image: "calico/node-driver-registrar",
Registry: "",
}

ComponentCalicoGoldmane = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/goldmane",
Registry: "",
}

ComponentCalicoWhisker = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/whisker",
Registry: "",
}

ComponentCalicoWhiskerBackend = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/whisker-backend",
Registry: "",
}

ComponentCalicoEnvoyGateway = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/envoy-gateway",
Registry: "",
}

ComponentCalicoEnvoyProxy = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/envoy-proxy",
Registry: "",
}

ComponentCalicoEnvoyRatelimit = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/envoy-ratelimit",
Registry: "",
}

ComponentCalicoGuardian = Component{
Version: "v3.30.5",
Version: "v3.30.6",
Image: "calico/guardian",
Registry: "",
}
Expand Down
25 changes: 23 additions & 2 deletions pkg/crds/calico/crd.projectcalico.org_felixconfigurations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,18 @@ spec:
pattern: ^.*
x-kubernetes-int-or-string: true
type: array
logActionRateLimit:
description: |-
LogActionRateLimit sets the rate of hitting a Log action. The value must be in the format "N/unit",
where N is a number and unit is one of: second, minute, hour, or day. For example: "10/second" or "100/hour".
pattern: ^[1-9]\d{0,3}/(?:second|minute|hour|day)$
type: string
logActionRateLimitBurst:
description: LogActionRateLimitBurst sets the rate limit burst of
hitting a Log action when LogActionRateLimit is enabled.
maximum: 9999
minimum: 0
type: integer
logDebugFilenameRegex:
description: |-
LogDebugFilenameRegex controls which source code files have their Debug log output included in the logs.
Expand All @@ -863,8 +875,17 @@ spec:
none to disable file logging. [Default: /var/log/calico/felix.log]'
type: string
logPrefix:
description: 'LogPrefix is the log prefix that Felix uses when rendering
LOG rules. [Default: calico-packet]'
description: |-
LogPrefix is the log prefix that Felix uses when rendering LOG rules. It is possible to use the following specifiers
to include extra information in the log prefix.
- %t: Tier name.
- %k: Kind (short names).
- %n: Policy or profile name.
- %p: Policy or profile name (namespace/name for namespaced kinds or just name for non namespaced kinds).
Calico includes ": " characters at the end of the generated log prefix.
Note that iptables shows up to 29 characters for the log prefix and nftables up to 127 characters. Extra characters are truncated.
[Default: calico-packet]
pattern: '^([a-zA-Z0-9%: /_-])*$'
type: string
logSeverityFile:
description: 'LogSeverityFile is the log severity above which logs
Expand Down