Skip to content
Open
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
8 changes: 7 additions & 1 deletion build/codegen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,13 @@ openapi-gen \
"${PACKAGE_NAME}/pkg/lib/numorstring" 2>&1 | tee /tmp/openapi-gen.log
grep "API rule violation" /tmp/openapi-gen.log | grep "projectcalico" > /tmp/openapi-violations.log || true
if [ -s /tmp/openapi-violations.log ]; then
grep -v -F -f "${REPO_ROOT}/hack/openapi-violations-known.list" /tmp/openapi-violations.log > /tmp/openapi-new-violations.log || true
# Strip comments and blank lines before using the known list as a pattern
# file. A blank line makes grep -F match everything, which silently disables
# the gate.
KNOWN_VIOLATIONS=$(mktemp)
grep -v -e '^#' -e '^[[:space:]]*$' "${REPO_ROOT}/hack/openapi-violations-known.list" > "${KNOWN_VIOLATIONS}" || true
grep -v -x -F -f "${KNOWN_VIOLATIONS}" /tmp/openapi-violations.log > /tmp/openapi-new-violations.log || true
rm -f "${KNOWN_VIOLATIONS}"
if [ -s /tmp/openapi-new-violations.log ]; then
echo "ERROR: openapi-gen reported new API rule violations in Calico types:"
cat /tmp/openapi-new-violations.log
Expand Down
55 changes: 44 additions & 11 deletions config/crd/projectcalico.org_felixconfigurations.yaml

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

2 changes: 1 addition & 1 deletion config/crd/projectcalico.org_ipreservations.yaml

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

14 changes: 14 additions & 0 deletions config/crd/projectcalico.org_kubecontrollersconfigurations.yaml

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

42 changes: 25 additions & 17 deletions deps.txt
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
!!! GENERATED FILE, DO NOT EDIT !!!
Run 'make gen-deps-files' to regenerate.

go 1.26.4
go 1.26.5
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/emicklei/go-restful v2.15.0+incompatible
github.com/emicklei/go-restful/v3 v3.13.0
github.com/fxamacker/cbor/v2 v2.9.0
github.com/fxamacker/cbor/v2 v2.9.1
github.com/go-logr/logr v1.4.3
github.com/go-openapi/jsonpointer v0.22.4
github.com/go-openapi/jsonreference v0.21.4
github.com/go-openapi/swag v0.23.1
github.com/go-openapi/swag v0.25.4
github.com/go-openapi/swag/cmdutils v0.25.4
github.com/go-openapi/swag/conv v0.25.4
github.com/go-openapi/swag/fileutils v0.25.4
github.com/go-openapi/swag/jsonname v0.25.4
github.com/go-openapi/swag/jsonutils v0.25.4
github.com/go-openapi/swag/loading v0.25.4
github.com/go-openapi/swag/mangling v0.25.4
github.com/go-openapi/swag/netutils v0.25.4
github.com/go-openapi/swag/stringutils v0.25.4
github.com/go-openapi/swag/typeutils v0.25.4
github.com/go-openapi/swag/yamlutils v0.25.4
github.com/google/gnostic-models v0.7.0
github.com/google/uuid v1.6.0
github.com/jinzhu/copier v0.4.0
github.com/josharian/intern v1.0.0
github.com/json-iterator/go v1.1.12
github.com/mailru/easyjson v0.9.1
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
Expand All @@ -25,27 +34,26 @@ github.com/spf13/pflag v1.0.10
github.com/x448/float16 v0.8.4
go.yaml.in/yaml/v2 v2.4.4
go.yaml.in/yaml/v3 v3.0.4
golang.org/x/net v0.56.0
golang.org/x/net v0.57.0
golang.org/x/oauth2 v0.36.0
golang.org/x/sys v0.46.0
golang.org/x/term v0.44.0
golang.org/x/text v0.38.0
golang.org/x/sys v0.47.0
golang.org/x/term v0.45.0
golang.org/x/text v0.40.0
golang.org/x/time v0.15.0
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af
gopkg.in/evanphx/json-patch.v4 v4.13.0
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.36.2
k8s.io/apiextensions-apiserver v0.36.2
k8s.io/apimachinery v0.36.2
k8s.io/client-go v0.36.2
k8s.io/api v0.37.0-beta.0
k8s.io/apiextensions-apiserver v0.37.0-beta.0
k8s.io/apimachinery v0.37.0-beta.0
k8s.io/client-go v0.37.0-beta.0
k8s.io/klog v0.2.0
k8s.io/klog/v2 v2.140.0
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974
k8s.io/utils v0.0.0-20260626114624-be93311217bd
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
sigs.k8s.io/randfill v1.0.0
sigs.k8s.io/structured-merge-diff/v6 v6.4.0
sigs.k8s.io/structured-merge-diff/v6 v6.4.2
sigs.k8s.io/yaml v1.6.0

local:api/examples/list-gnp
Expand Down
104 changes: 56 additions & 48 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,87 +1,95 @@
module github.com/projectcalico/api

go 1.26.4
go 1.26.5

require (
github.com/jinzhu/copier v0.4.0
github.com/onsi/ginkgo/v2 v2.31.0
github.com/onsi/gomega v1.42.0
k8s.io/api v0.36.2
k8s.io/apiextensions-apiserver v0.36.2
k8s.io/apimachinery v0.36.2
k8s.io/client-go v0.36.2
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a
sigs.k8s.io/structured-merge-diff/v6 v6.4.0
k8s.io/api v0.37.0-beta.0
k8s.io/apiextensions-apiserver v0.37.0-beta.0
k8s.io/apimachinery v0.37.0-beta.0
k8s.io/client-go v0.37.0-beta.0
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974
sigs.k8s.io/structured-merge-diff/v6 v6.4.2
sigs.k8s.io/yaml v1.6.0
)

require (
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/go-openapi/jsonpointer v0.22.4 // indirect
github.com/go-openapi/jsonreference v0.21.4 // indirect
github.com/go-openapi/swag v0.25.4 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag/conv v0.25.4 // indirect
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
github.com/go-openapi/swag/loading v0.25.4 // indirect
github.com/go-openapi/swag/mangling v0.25.4 // indirect
github.com/go-openapi/swag/netutils v0.25.4 // indirect
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/spf13/pflag v1.0.9 // indirect
github.com/spf13/pflag v1.0.10 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/mod v0.37.0 // indirect
golang.org/x/net v0.56.0 // indirect
golang.org/x/mod v0.38.0 // indirect
golang.org/x/net v0.57.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.21.0 // indirect
golang.org/x/sys v0.46.0 // indirect
golang.org/x/term v0.44.0 // indirect
golang.org/x/text v0.38.0 // indirect
golang.org/x/sync v0.22.0 // indirect
golang.org/x/sys v0.47.0 // indirect
golang.org/x/term v0.45.0 // indirect
golang.org/x/text v0.40.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools v0.47.0 // indirect
golang.org/x/tools v0.48.0 // indirect
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
k8s.io/utils v0.0.0-20260626114624-be93311217bd // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
)

replace (
k8s.io/api => k8s.io/api v0.36.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.36.2
k8s.io/apimachinery => k8s.io/apimachinery v0.36.2
k8s.io/apiserver => k8s.io/apiserver v0.36.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.36.2
k8s.io/client-go => k8s.io/client-go v0.36.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.36.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.36.2
k8s.io/code-generator => k8s.io/code-generator v0.36.2
k8s.io/component-base => k8s.io/component-base v0.36.2
k8s.io/component-helpers => k8s.io/component-helpers v0.36.2
k8s.io/controller-manager => k8s.io/controller-manager v0.36.2
k8s.io/cri-api => k8s.io/cri-api v0.36.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.36.2
k8s.io/externaljwt => k8s.io/externaljwt v0.36.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.36.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.36.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.36.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.36.2
k8s.io/kubectl => k8s.io/kubectl v0.36.2
k8s.io/kubelet => k8s.io/kubelet v0.36.2
k8s.io/metrics => k8s.io/metrics v0.36.2
k8s.io/mount-utils => k8s.io/mount-utils v0.36.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.36.2
k8s.io/api => k8s.io/api v0.37.0-beta.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.37.0-beta.0
k8s.io/apimachinery => k8s.io/apimachinery v0.37.0-beta.0
k8s.io/apiserver => k8s.io/apiserver v0.37.0-beta.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.37.0-beta.0
k8s.io/client-go => k8s.io/client-go v0.37.0-beta.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.37.0-beta.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.37.0-beta.0
k8s.io/code-generator => k8s.io/code-generator v0.37.0-beta.0
k8s.io/component-base => k8s.io/component-base v0.37.0-beta.0
k8s.io/component-helpers => k8s.io/component-helpers v0.37.0-beta.0
k8s.io/controller-manager => k8s.io/controller-manager v0.37.0-beta.0
k8s.io/cri-api => k8s.io/cri-api v0.37.0-beta.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.37.0-beta.0
k8s.io/externaljwt => k8s.io/externaljwt v0.37.0-beta.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.37.0-beta.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.37.0-beta.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.37.0-beta.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.37.0-beta.0
k8s.io/kubectl => k8s.io/kubectl v0.37.0-beta.0
k8s.io/kubelet => k8s.io/kubelet v0.37.0-beta.0
k8s.io/metrics => k8s.io/metrics v0.37.0-beta.0
k8s.io/mount-utils => k8s.io/mount-utils v0.37.0-beta.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.37.0-beta.0
)
Loading