Skip to content

Commit ec8f0ff

Browse files
committed
Update codegen
Hack `scripts/update_codegen.sh` script to continue to generate code using the deprecated scripts. The deprecated scripts now call into each other, and unfortunately, `go mod vendor` doesn't keep permission bits around. So, we need to update the execute permissions on a vendored script. The new `kube_codegen.sh` doesn't work when the repository path is outside the package name, see: kubernetes/code-generator#165 The workaround is to create symlinked directories to fool `kube_codegen.sh` into thinking the path is correct. But first we'd have to start using the new script. Once `kube_codegen.sh` is fixed, we should migrate to it (which is a non-trivial task). Signed-off-by: Todd Short <[email protected]>
1 parent da8376e commit ec8f0ff

File tree

7 files changed

+26
-60
lines changed

7 files changed

+26
-60
lines changed

Diff for: deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml

+18-9
Large diffs are not rendered by default.

Diff for: pkg/api/client/clientset/versioned/doc.go

-20
This file was deleted.

Diff for: pkg/api/client/informers/externalversions/factory.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/package-server/client/clientset/versioned/doc.go

-20
This file was deleted.

Diff for: pkg/package-server/client/informers/externalversions/factory.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: pkg/package-server/client/openapi/zz_generated.openapi.go

-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: scripts/update_codegen.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-
2323

2424
# create a temporary directory to generate code in and ensure we clean it up on exit
2525
OUTPUT_BASE=$(mktemp -d)
26-
trap 'rm -rf "${OUTPUT_BASE}"' ERR EXIT
26+
# Hack the script to make it executable from within generate-groups.sh
27+
# Because vendored sources do not include permission bits
28+
chmod u+x "${CODEGEN_PKG}/generate-internal-groups.sh"
29+
trap 'rm -rf "${OUTPUT_BASE}"; chmod u-x "${CODEGEN_PKG}/generate-internal-groups.sh"' ERR EXIT
2730

2831
ORG="github.com/operator-framework"
2932
API_MODULE="${ORG}/api"

0 commit comments

Comments
 (0)