Skip to content

Commit 99bdfef

Browse files
committed
Temporary fix for register-gen regression in v1.32
1 parent d7a4992 commit 99bdfef

File tree

6 files changed

+20
-0
lines changed

6 files changed

+20
-0
lines changed

apis/v1/zz_generated.register.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha2/zz_generated.register.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha3/zz_generated.register.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1beta1/zz_generated.register.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apisx/v1alpha1/zz_generated.register.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hack/update-clientset.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,20 @@ readonly API_PATHS=(apis apisx)
4242

4343
GATEWAY_INPUT_DIRS_SPACE=""
4444
GATEWAY_INPUT_DIRS_COMMA=""
45+
GATEWAY_API_DIRS_COMMA=""
4546

4647
for API_PATH in "${API_PATHS[@]}"; do
4748
VERSIONS=($(find ./${API_PATH} -maxdepth 1 -name "v*" -exec bash -c 'basename {}' \; | LC_ALL=C sort -u))
4849
for VERSION in "${VERSIONS[@]}"; do
4950
GATEWAY_INPUT_DIRS_SPACE+="${APIS_PKG}/${API_PATH}/${VERSION} "
5051
GATEWAY_INPUT_DIRS_COMMA+="${APIS_PKG}/${API_PATH}/${VERSION},"
52+
GATEWAY_API_DIRS_COMMA+="${API_PATH}/${VERSION},"
5153
done
5254
done
55+
5356
GATEWAY_INPUT_DIRS_SPACE="${GATEWAY_INPUT_DIRS_SPACE%,}" # drop trailing space
5457
GATEWAY_INPUT_DIRS_COMMA="${GATEWAY_INPUT_DIRS_COMMA%,}" # drop trailing comma
58+
GATEWAY_API_DIRS_COMMA="${GATEWAY_API_DIRS_COMMA%,}" # drop trailing comma
5559

5660
# throw away
5761
new_report="$(mktemp -t "$(basename "$0").api_violations.XXXXXX")"
@@ -109,6 +113,12 @@ go run k8s.io/code-generator/cmd/register-gen \
109113
${COMMON_FLAGS} \
110114
${GATEWAY_INPUT_DIRS_SPACE}
111115

116+
# This is an awful hack to make up for a deficiency in register-gen in k8s v1.32
117+
for input_dir in ${GATEWAY_API_DIRS_COMMA//,/ }
118+
do
119+
sed -z -i 's|v1 "k8s.io/apimachinery/pkg/apis/meta/v1"\n|v1 "k8s.io/apimachinery/pkg/apis/meta/v1"\n\t"k8s.io/apimachinery/pkg/runtime"\n\t"k8s.io/apimachinery/pkg/runtime/schema"\n|' ${input_dir}/zz_generated.register.go
120+
done
121+
112122
echo "Generating deepcopy"
113123
go run sigs.k8s.io/controller-tools/cmd/controller-gen \
114124
object:headerFile=${SCRIPT_ROOT}/hack/boilerplate/boilerplate.generatego.txt \

0 commit comments

Comments
 (0)