Skip to content

Commit a7ee2ea

Browse files
authored
Update zz_generated.deepcopy.go, also add new make target for the same (#8267)
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 22653a9 commit a7ee2ea

File tree

3 files changed

+50
-24
lines changed

3 files changed

+50
-24
lines changed

Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ update-coredns: ## get latest coredns builds for each available eks version
189189
update-ec2-info: ## get latest info on ec2 instance types
190190
@go run cmd/ec2geninfo/main.go
191191

192+
.PHONY: update-deepcopy
193+
update-deepcopy:
194+
build/scripts/update-codegen.sh
195+
192196
deep_copy_helper_input = $(shell $(call godeps_cmd,./pkg/apis/...) | sed 's|$(generated_code_deep_copy_helper)||' )
193197
$(generated_code_deep_copy_helper): $(deep_copy_helper_input) ## Generate Kubernetes API helpers
194198
build/scripts/update-codegen.sh

build/scripts/update-codegen.sh

+5-24
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,15 @@ set -o errexit
44
set -o nounset
55

66

7-
SCRIPT_ROOT=$(git rev-parse --show-toplevel)
7+
PROJECT_ROOT=$(git rev-parse --show-toplevel)
88

99
# Grab code-generator pkg
1010
CODEGEN_PKG=$(go list -m -f '{{.Dir}}' 'k8s.io/code-generator')
1111
echo ">> Using ${CODEGEN_PKG}"
1212

13-
# code-generator does work with go.mod but makes assumptions about
14-
# the project living in `$GOPATH/src`. To work around this and support
15-
# any location; create a temporary directory, use this as an output
16-
# base, and copy everything back once generated.
17-
TEMP_DIR=$(mktemp -d)
18-
cleanup() {
19-
echo ">> Removing ${TEMP_DIR}"
20-
rm -rf "${TEMP_DIR}"
21-
}
22-
trap "cleanup" EXIT SIGINT
2313

24-
echo ">> Temporary output directory ${TEMP_DIR}"
14+
source "${CODEGEN_PKG}/kube_codegen.sh"
2515

26-
# Ensure we can execute.
27-
chmod +x "${CODEGEN_PKG}/generate-groups.sh"
28-
chmod +x "${CODEGEN_PKG}/generate-internal-groups.sh"
29-
30-
GOPATH=$(go env GOPATH) "${CODEGEN_PKG}/generate-groups.sh" deepcopy,defaulter \
31-
_ github.com/weaveworks/eksctl/pkg/apis \
32-
eksctl.io:v1alpha5 \
33-
--go-header-file <(printf "/*\n%s\n*/\n" "$(cat LICENSE)") \
34-
--output-base "${TEMP_DIR}"
35-
36-
# Copy everything back.
37-
cp -r "${TEMP_DIR}/github.com/weaveworks/eksctl/." "${SCRIPT_ROOT}/"
16+
kube::codegen::gen_helpers \
17+
--boilerplate <(printf "/*\n%s\n*/\n" "$(cat LICENSE)") \
18+
"${PROJECT_ROOT}/pkg/apis"

pkg/apis/eksctl.io/v1alpha5/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)