Skip to content

Commit

Permalink
Regenerate manifests using the latest controller-tools release
Browse files Browse the repository at this point in the history
This change regenerates Calico manifests using the latest controller-gen
utility. The newer release fixes an issue [1] where groupName is optional
from k8s 1.31. This optional field breaks our outdated controller-gen.

[1] kubernetes-sigs/controller-tools#1000
  • Loading branch information
hjiawei committed Dec 13, 2024
1 parent 419a46b commit 81f982d
Show file tree
Hide file tree
Showing 34 changed files with 18,883 additions and 18,872 deletions.
464 changes: 232 additions & 232 deletions felix/docs/config-params.json

Large diffs are not rendered by default.

678 changes: 560 additions & 118 deletions felix/docs/config-params.md

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions libcalico-go/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ gen-files: gen-crds
## Force a rebuild of custom resource definition yamls
gen-crds:
rm -rf config/crd
$(DOCKER_GO_BUILD) sh -c '$(GIT_CONFIG_SSH) controller-gen crd:crdVersions=v1 paths=./lib/apis/... output:crd:dir=config/crd/'
$(DOCKER_GO_BUILD) sh -c '$(GIT_CONFIG_SSH) controller-gen crd:allowDangerousTypes=true,crdVersions=v1,deprecatedV1beta1CompatibilityPreserveUnknownFields=false paths=./lib/apis/... output:crd:dir=config/crd/'
@rm config/crd/_.yaml
# Patch in manual tweaks to the generated CRDs.
patch -s -p0 < ./config.patch
# The first two lines are a newline and a yaml separator - remove them.
$(DOCKER_GO_BUILD) sh -c 'find ./config/crd -name "*.yaml" | xargs sed -i -e 1,2d'
patch -p2 < patches/0001-Add-nullable-to-IPAM-block-allocations-field.patch
# Remove the first yaml separator line.
$(DOCKER_GO_BUILD) sh -c 'find ./config/crd -name "*.yaml" | xargs sed -i 1d'
# Add K8S AdminNetworkPolicy CRD
curl $(NETPOL_CRD_URL)/$(NETPOL_ANP_CRD) -o ./config/crd/$(NETPOL_ANP_CRD)
curl $(NETPOL_CRD_URL)/$(NETPOL_BANP_CRD) -o ./config/crd/$(NETPOL_BANP_CRD)
Expand Down
347 changes: 0 additions & 347 deletions libcalico-go/config.patch

This file was deleted.

Loading

0 comments on commit 81f982d

Please sign in to comment.