Skip to content

Commit be19e45

Browse files
committed
Remove makefile based generator for applyconfigs
1 parent 2b94c5b commit be19e45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1
-102531
lines changed

Makefile

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,2 @@
11
test-all:
22
TRACE=1 ./test.sh
3-
4-
# Detect go environment to build tools into env specific directories.
5-
# This is helpful for those running tools locally and within containers across different OS/architechture combinations.
6-
GOOS=$(shell go env GOOS)
7-
GOARCH=$(shell go env GOARCH)
8-
SCRIPT_DIR=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
9-
OUTPUT_DIR=$(SCRIPT_DIR)/_output/bin/$(GOOS)/$(GOARCH)
10-
11-
.PHONY:applyconfiguration-gen
12-
applyconfiguration-gen: $(OUTPUT_DIR)/applyconfiguration-gen
13-
14-
$(OUTPUT_DIR)/applyconfiguration-gen:
15-
go build -mod=vendor -o $(OUTPUT_DIR)/applyconfiguration-gen ./vendor/k8s.io/code-generator/cmd/applyconfiguration-gen
16-
17-
generate-applyconfigs: applyconfiguration-gen
18-
$(OUTPUT_DIR)/applyconfiguration-gen \
19-
-v 3 \
20-
--output-package sigs.k8s.io/controller-tools/pkg/applyconfigurations/testdata/cronjob/applyconfigurations \
21-
--input-dirs sigs.k8s.io/controller-tools/pkg/applyconfigurations/testdata/cronjob \
22-
--go-header-file ./hack/empty.txt \
23-
--external-applyconfigurations k8s.io/api/batch/v1.JobSpec:k8s.io/client-go/applyconfigurations/batch/v1 \
24-
--external-applyconfigurations k8s.io/api/batch/v1beta1.JobTemplateSpec:k8s.io/client-go/applyconfigurations/batch/v1beta1 \
25-
sigs.k8s.io/controller-tools/pkg/applyconfigurations/testdata/cronjob

go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
k8s.io/apiextensions-apiserver v0.27.2
1818
k8s.io/apimachinery v0.27.2
1919
k8s.io/code-generator v0.27.2
20-
sigs.k8s.io/controller-tools/pkg/applyconfigurations/testdata/cronjob v0.0.0-00010101000000-000000000000
20+
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d
2121
sigs.k8s.io/yaml v1.3.0
2222
)
2323

@@ -47,12 +47,9 @@ require (
4747
google.golang.org/protobuf v1.28.1 // indirect
4848
gopkg.in/inf.v0 v0.9.1 // indirect
4949
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
50-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
5150
k8s.io/klog/v2 v2.90.1 // indirect
5251
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
5352
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
5453
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
5554
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
5655
)
57-
58-
replace sigs.k8s.io/controller-tools/pkg/applyconfigurations/testdata/cronjob => ./pkg/applyconfigurations/testdata/cronjob

hack/empty.txt

Whitespace-only changes.

pkg/applyconfigurations/testdata/cronjob/applyconfigurations/internal/internal.go

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

pkg/applyconfigurations/testdata/cronjob/applyconfigurations/testdata/cronjob/associativetype.go

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

pkg/applyconfigurations/testdata/cronjob/applyconfigurations/testdata/cronjob/cronjob.go

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

0 commit comments

Comments
 (0)