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
4 changes: 2 additions & 2 deletions metadata.mk
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ GIT_REPO ?= calico-private
GIT_REMOTE ?= origin

RELEASE_BRANCH_PREFIX ?=release-calient
DEV_TAG_SUFFIX ?= calient-2.dev
DEV_TAG_SUFFIX ?= calient-3.dev

# Part of the git remote that is common to git and HTTP representations.
# Used to auto-detect the right remote.
Expand Down Expand Up @@ -92,7 +92,7 @@ WINDOWS_VERSIONS ?= ltsc2019 ltsc2022

# The CNI plugin and flannel code that will be cloned and rebuilt with this repo's go-build image
# whenever the cni-plugin image is created.
CNI_VERSION=master
CNI_VERSION=9ffe547cb3b66f80dd32a00fc69a6d0082b55321
FLANNEL_VERSION=main

# The libbpf version to use
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/projectcalico/v3/felixconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ type FelixConfigurationSpec struct {
// FlowLogsFileEnabledForDenied is used to enable/disable flow logs entries created for denied flows. Default is true.
// This parameter only takes effect when FlowLogsFileReporterEnabled is set to true.
FlowLogsFileEnabledForDenied *bool `json:"flowLogsFileEnabledForDenied,omitempty"`
// FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is true.
// FlowLogsDynamicAggregationEnabled is used to enable/disable dynamically changing aggregation levels. Default is false.
FlowLogsDynamicAggregationEnabled *bool `json:"flowLogsDynamicAggregationEnabled,omitempty"`
// FlowLogsPositionFilePath is used specify the position of the external pipeline that reads flow logs. Default is /var/log/calico/flows.log.pos.
// This parameter only takes effect when FlowLogsDynamicAggregationEnabled is set to true.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/openapi/generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.