Skip to content

Commit 3ff7f15

Browse files
authored
Merge pull request #793 from bryantbiggs/fix/codegen
fix: Correct codgen script due to deprecated script removal
2 parents e9aa152 + f863e9e commit 3ff7f15

File tree

13 files changed

+228
-327
lines changed

13 files changed

+228
-327
lines changed

hack/update-codegen.sh

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,19 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
CODE_GEN_VERSION=$(go mod edit -print |grep 'k8s.io/code-generator' | cut -f2 -d' ')
2323
CODE_GEN_PKG=${CODE_GEN_PKG:-$GOPATH/pkg/mod/k8s.io/code-generator\@${CODE_GEN_VERSION}}
2424
chmod +x ${CODE_GEN_PKG}/kube_codegen.sh
25-
# generate the code with:
26-
# --output-base because this script should also be able to run inside the vendor dir of
27-
# k8s.io/kubernetes. The output-base is needed for the generators to output into the vendor dir
28-
# instead of the $GOPATH directly. For normal projects this can be dropped.
29-
"${CODE_GEN_PKG}"/kube_codegen.sh "deepcopy,client,informer,lister" \
30-
sigs.k8s.io/aws-iam-authenticator/pkg/mapper/crd/generated sigs.k8s.io/aws-iam-authenticator/pkg/mapper/crd/apis \
31-
iamauthenticator:v1alpha1 \
32-
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../.." \
33-
--go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
3425

35-
# To use your own boilerplate text append:
36-
# --go-header-file "${SCRIPT_ROOT}"/hack/custom-boilerplate.go.txt
26+
AUTHENTICATOR_ROOT="${SCRIPT_ROOT}/pkg/mapper/crd"
27+
AUTHENTICATOR_PKG="sigs.k8s.io/aws-iam-authenticator"
28+
29+
source "${CODE_GEN_PKG}/kube_codegen.sh"
30+
31+
kube::codegen::gen_helpers \
32+
--boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
33+
"${AUTHENTICATOR_ROOT}/apis" \
34+
35+
kube::codegen::gen_client \
36+
--boilerplate "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
37+
--output-dir "${AUTHENTICATOR_ROOT}/generated" \
38+
--output-pkg "${AUTHENTICATOR_PKG}/pkg/mapper/crd/generated" \
39+
--with-watch \
40+
"${AUTHENTICATOR_ROOT}/apis" \

pkg/mapper/crd/apis/iamauthenticator/v1alpha1/zz_generated.deepcopy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/mapper/crd/generated/clientset/versioned/clientset.go

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

pkg/mapper/crd/generated/clientset/versioned/doc.go

Lines changed: 0 additions & 19 deletions
This file was deleted.

pkg/mapper/crd/generated/clientset/versioned/fake/clientset_generated.go

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/mapper/crd/generated/clientset/versioned/typed/iamauthenticator/v1alpha1/fake/fake_iamauthenticator_client.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/mapper/crd/generated/clientset/versioned/typed/iamauthenticator/v1alpha1/fake/fake_iamidentitymapping.go

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

pkg/mapper/crd/generated/clientset/versioned/typed/iamauthenticator/v1alpha1/iamauthenticator_client.go

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

0 commit comments

Comments
 (0)