From ef1fa52b0816fa849e7aa74d47e8ed6fea1ceccb Mon Sep 17 00:00:00 2001 From: Xabier Larrakoetxea Date: Thu, 10 Oct 2024 14:24:43 +0200 Subject: [PATCH] Upgrade controller-tools, this update adds support for selectable fields in the CRDs Signed-off-by: Xabier Larrakoetxea --- _example/Makefile | 2 +- _example/apis/comic/v1/types.go | 2 ++ .../manifests/comic.kube-code-generator.slok.dev_heroes.yaml | 3 +++ docker/prod/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/_example/Makefile b/_example/Makefile index 3262f95..fb79a7f 100644 --- a/_example/Makefile +++ b/_example/Makefile @@ -1,4 +1,4 @@ -IMAGE := ghcr.io/slok/kube-code-generator:v0.3.0-amd64 +IMAGE := ghcr.io/slok/kube-code-generator:v0.3.1-amd64 DIRECTORY := $(PWD) DEPS_CMD := go mod tidy diff --git a/_example/apis/comic/v1/types.go b/_example/apis/comic/v1/types.go index 8914de5..86e9c37 100644 --- a/_example/apis/comic/v1/types.go +++ b/_example/apis/comic/v1/types.go @@ -29,6 +29,8 @@ const ( // +kubebuilder:printcolumn:name="KIND",type="string",JSONPath=".spec.kind" // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp" // +kubebuilder:resource:singular=hero,path=heroes,shortName=he;sh,scope=Namespaced,categories=heroes;superheroes +// +kubebuilder:selectablefield:JSONPath=`.spec.city` +// +kubebuilder:selectablefield:JSONPath=`.spec.kind` type Hero struct { metav1.TypeMeta `json:",inline"` metav1.ObjectMeta `json:"metadata,omitempty"` diff --git a/_example/manifests/comic.kube-code-generator.slok.dev_heroes.yaml b/_example/manifests/comic.kube-code-generator.slok.dev_heroes.yaml index 2520b29..ad0046c 100644 --- a/_example/manifests/comic.kube-code-generator.slok.dev_heroes.yaml +++ b/_example/manifests/comic.kube-code-generator.slok.dev_heroes.yaml @@ -95,6 +95,9 @@ spec: type: boolean type: object type: object + selectableFields: + - jsonPath: .spec.city + - jsonPath: .spec.kind served: true storage: true subresources: diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index feb8662..f63481b 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -15,8 +15,8 @@ COPY . . RUN ./scripts/build/bin/build-raw.sh FROM golang:1.23 -ARG CODEGEN_VERSION="1.31.0" -ARG CONTROLLER_GEN_VERSION="0.16.2" +ARG CODEGEN_VERSION="1.31.1" +ARG CONTROLLER_GEN_VERSION="0.16.4" COPY --from=build-stage /src/bin/kube-code-generator /usr/local/bin/kube-code-generator