Skip to content

Auto: sync API from tigera/calico-private [master] #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marvin-tigera merged 1 commit into from
Oct 5, 2026
Merged

Auto: sync API from tigera/calico-private [master] #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions config/crd/projectcalico.org_networks.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion metadata.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ WINDOWS_DIST = dist/windows
# The Windows HPC container version used as base for Calico Windows images
WINDOWS_HPC_VERSION ?= v1.0.0
# The Windows versions used as base for Calico Windows images
WINDOWS_VERSIONS ?= ltsc2019 ltsc2022
WINDOWS_VERSIONS ?= ltsc2019 ltsc2022 ltsc2025

# The CNI plugin and flannel code that will be cloned and rebuilt with this repo's go-build image.
# Pinned so the content-addressed third-party-cni-plugins image hash changes when these move.
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/projectcalico/v3/network-l2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ type L2BridgeSpec struct {
// "vlan" field; if spec.vlans has exactly one entry that resolves to
// a single VLAN ID, the CNI config "vlan" field may be omitted.
// +kubebuilder:validation:MinItems=1
// +kubebuilder:validation:MaxItems=4094
// +listType=atomic
VLANs []L2VLANSpec `json:"vlans" validate:"required,min=1,dive"`

Expand Down
Loading