Skip to content

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

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
Sep 28, 2026
Merged

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

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
2 changes: 2 additions & 0 deletions config/crd/projectcalico.org_hostendpoints.yaml
View file
Open in desktop

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

32 changes: 32 additions & 0 deletions pkg/apis/projectcalico/v3/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@
package v3_test

import (
"io/fs"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/tigera/api/config/crd"
apiv3 "github.com/tigera/api/pkg/apis/projectcalico/v3"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/yaml"
)

// The aggregated apiserver rejects any field label it hasn't been told about, so
Expand Down Expand Up @@ -49,3 +54,30 @@ var _ = Describe("UISettings field label conversion", func() {
Expect(err).To(MatchError(ContainSubstring("field label not supported: spec.description")))
})
})

// Clients look up the HostEndpoints of a node by spec.node, so the field has to be
// selectable whether the API is served by the aggregated apiserver or by the v3 CRDs.
var _ = Describe("HostEndpoint spec.node field selector", func() {
It("is accepted by the aggregated apiserver", func() {
scheme := runtime.NewScheme()
Expect(apiv3.AddToScheme(scheme)).To(Succeed())

gvk := schema.GroupVersionKind{Group: "projectcalico.org", Version: "v3", Kind: apiv3.KindHostEndpoint}
label, value, err := scheme.ConvertFieldLabel(gvk, "spec.node", "node-1")
Expect(err).NotTo(HaveOccurred())
Expect(label).To(Equal("spec.node"))
Expect(value).To(Equal("node-1"))
})

It("is a selectable field of the CRD", func() {
raw, err := fs.ReadFile(crd.FS(), "projectcalico.org_hostendpoints.yaml")
Expect(err).NotTo(HaveOccurred())

var def apiextensionsv1.CustomResourceDefinition
Expect(yaml.Unmarshal(raw, &def)).To(Succeed())
Expect(def.Spec.Versions).NotTo(BeEmpty())
for _, v := range def.Spec.Versions {
Expect(v.SelectableFields).To(ContainElement(apiextensionsv1.SelectableField{JSONPath: ".spec.node"}), "version %s", v.Name)
}
})
})
1 change: 1 addition & 0 deletions pkg/apis/projectcalico/v3/hostendpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type HostEndpointList struct {
// +genclient
// +genclient:nonNamespaced
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:selectablefield:JSONPath=`.spec.node`
// +kubebuilder:resource:scope=Cluster,shortName={hep,heps}
// +kubebuilder:printcolumn:name="Node",type=string,JSONPath=".spec.node",description="The node name identifying the Calico node instance that is targeted by this HostEndpoint"
// +kubebuilder:printcolumn:name="Interface",type=string,JSONPath=".spec.interfaceName",description="The name of the interface that is targeted by this HostEndpoint"
Expand Down
Loading