Skip to content

Use controller-gen with no patches #754

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

Open
radixo wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −72
Open

Use controller-gen with no patches #754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35ee3ae
Use controller-gen with no patches
radixo Jan 6, 2026
77168e8
Download vendor prebuilt controller-gen binary
hjiawei Jan 6, 2026
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
7 changes: 3 additions & 4 deletions images/calico-go-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ubi
ARG TARGETARCH

ARG CONTAINERREGISTRY_VERSION=v0.20.7
ARG CONTROLLER_TOOLS_VERSION=v0.18.0
ARG CONTROLLER_TOOLS_VERSION=v0.20.0
ARG GO_LINT_VERSION=v2.6.2
ARG MOCKERY_VERSION=3.5.5
ARG PROTOC_VERSION=33.1
Expand Down Expand Up @@ -158,11 +158,10 @@ RUN set -eux; \
# Install Go utilities

# controller-gen is used for generating CRD files.
COPY patches/controller-gen-Support-Calico-NumOrString-types.patch /tmp/controller-tools/calico.patch

RUN set -eux; \
mkdir -p /tmp/controller-tools; \
curl -sfL https://github.com/kubernetes-sigs/controller-tools/archive/refs/tags/${CONTROLLER_TOOLS_VERSION}.tar.gz | tar xz --strip-components 1 -C /tmp/controller-tools; \
cd /tmp/controller-tools && patch -p1 < calico.patch && CGO_ENABLED=0 go build -o /usr/local/bin/controller-gen -v -buildvcs=false \
cd /tmp/controller-tools && CGO_ENABLED=0 go build -o /usr/local/bin/controller-gen -v -buildvcs=false \
Comment thread
hjiawei marked this conversation as resolved.
Outdated
-ldflags "-X sigs.k8s.io/controller-tools/pkg/version.version=${CONTROLLER_TOOLS_VERSION} -s -w" ./cmd/controller-gen; \
rm -fr /tmp/controller-tools

Expand Down
65 changes: 0 additions & 65 deletions images/calico-go-build/patches/controller-gen-Support-Calico-NumOrString-types.patch
View file
Open in desktop

This file was deleted.