Skip to content

Commit 37cbb05

Browse files
committed
refactor(codegen): add conversion to make rule
- Add conversion to make rule - Switch entirely to internal codegen script
1 parent 681f00b commit 37cbb05

File tree

3 files changed

+1
-90
lines changed

3 files changed

+1
-90
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ SHELL := /bin/bash
66
PKG := github.com/operator-framework/operator-lifecycle-manager
77
MOD_FLAGS := $(shell (go version | grep -q -E "1\.(11|12)") && echo -mod=vendor)
88
CMDS := $(addprefix bin/, $(shell go list $(MOD_FLAGS) ./cmd/... | xargs -I{} basename {}))
9-
CODEGEN := ./vendor/k8s.io/code-generator/generate_groups.sh
109
CODEGEN_INTERNAL := ./vendor/k8s.io/code-generator/generate_internal_groups.sh
1110
MOCKGEN := ./scripts/generate_mocks.sh
1211
# counterfeiter := $(GOBIN)/counterfeiter
@@ -127,12 +126,11 @@ gen-ci: $(CI)
127126
# Must be run in gopath: https://github.com/kubernetes/kubernetes/issues/67566
128127
# use container-codegen
129128
codegen:
130-
cp scripts/generate_groups.sh vendor/k8s.io/code-generator/generate_groups.sh
131129
cp scripts/generate_internal_groups.sh vendor/k8s.io/code-generator/generate_internal_groups.sh
132130
mkdir -p vendor/k8s.io/code-generator/hack
133131
cp boilerplate.go.txt vendor/k8s.io/code-generator/hack/boilerplate.go.txt
134132
go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr -i ./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/version,./pkg/package-server/apis/operators/v1,./pkg/package-server/apis/apps/v1alpha1,./pkg/api/apis/operators/v1alpha1,./pkg/lib/version -p $(PKG)/pkg/package-server/apis/openapi -O zz_generated.openapi -h boilerplate.go.txt -r /dev/null
135-
$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis "operators:v1alpha1,v1"
133+
$(CODEGEN_INTERNAL) deepcopy,conversion,client,lister,informer $(PKG)/pkg/api/client $(PKG)/pkg/api/apis $(PKG)/pkg/api/apis "operators:v1alpha1,v1"
136134
$(CODEGEN_INTERNAL) all $(PKG)/pkg/package-server/client $(PKG)/pkg/package-server/apis $(PKG)/pkg/package-server/apis "operators:v1 apps:v1alpha1"
137135

138136
container-codegen:

codegen.Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
33
COPY Makefile Makefile
44
COPY pkg pkg
55
COPY vendor vendor
6-
COPY scripts/generate_groups.sh scripts/generate_groups.sh
76
COPY scripts/generate_internal_groups.sh scripts/generate_internal_groups.sh
87
COPY boilerplate.go.txt boilerplate.go.txt
98
RUN make codegen

scripts/generate_groups.sh

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

0 commit comments

Comments
 (0)