Skip to content

Commit 387d57f

Browse files
committed
hack/tools: use mainstream conversion-gen
1 parent 805e912 commit 387d57f

File tree

8 files changed

+5
-1580
lines changed

8 files changed

+5
-1580
lines changed

docs/triage-party/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ FROM gcr.io/distroless/base:latest
2828
WORKDIR /app
2929
COPY --chown=nobody:nobody --from=builder /go/bin/server /app/triage-party
3030
COPY --chown=nobody:nobody --from=builder /git/triage-party/site /app/site
31-
COPY --chown=nobody:nobody --from=builder /git/triage-party/third_party /app/third_party
3231
COPY --chown=nobody:nobody config/config.yaml /app/config/config.yaml
3332
COPY --chown=nobody:nobody --from=builder /.cache /app/.cache
3433
ENV HOME /app

hack/boilerplate/boilerplate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def file_passes(filename, refs, regexs):
149149
def file_extension(filename):
150150
return os.path.splitext(filename)[1].split(".")[-1].lower()
151151

152-
skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh',
152+
skipped_dirs = ['Godeps', '_gopath', '_output', '.git', 'cluster/env.sh',
153153
"vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test",
154154
"pkg/kubectl/generated/bindata.go"]
155155

hack/tools/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ $(CONTROLLER_GEN): $(BIN_DIR) go.mod go.sum # Build controller-gen from tools fo
7676
go build -tags=tools -o $@ sigs.k8s.io/controller-tools/cmd/controller-gen
7777

7878
CONVERSION_GEN := $(BIN_DIR)/conversion-gen
79-
$(CONVERSION_GEN): $(BIN_DIR) go.mod go.sum $(call rwildcard,.,third_party/conversion-gen/*.*)
80-
go build -tags=tools -o $@ ./third_party/conversion-gen
79+
$(CONVERSION_GEN): $(BIN_DIR) go.mod go.sum
80+
go build -tags=tools -o $@ k8s.io/code-generator/cmd/conversion-gen
8181

8282
CONVERSION_VERIFIER := $(BIN_DIR)/conversion-verifier
8383
$(CONVERSION_VERIFIER): $(BIN_DIR) go.mod go.sum

hack/tools/third_party/conversion-gen/LICENSE

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

hack/tools/third_party/conversion-gen/README.md

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

0 commit comments

Comments
 (0)