Skip to content

Commit 1214bff

Browse files
authored
Merge pull request #747 from Huang-Wei/revert-codegen
2 parents ab04632 + ebde0d5 commit 1214bff

File tree

18 files changed

+1104
-36
lines changed

18 files changed

+1104
-36
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ require (
3030
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
3131
sigs.k8s.io/controller-runtime v0.16.5
3232
sigs.k8s.io/security-profiles-operator v0.4.0
33+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
3334
sigs.k8s.io/yaml v1.3.0
3435
)
3536

@@ -143,7 +144,6 @@ require (
143144
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
144145
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
145146
sigs.k8s.io/release-utils v0.3.0 // indirect
146-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
147147
)
148148

149149
replace (

hack/update-codegen.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ GOBIN=${TOOLS_BIN_DIR} ${GO_INSTALL} sigs.k8s.io/controller-tools/cmd/controller
3333

3434
CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; ls -d -1 ./vendor/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
3535

36-
bash "${CODEGEN_PKG}"/kube_codegen.sh \
36+
bash "${CODEGEN_PKG}"/generate-internal-groups.sh \
3737
"deepcopy,conversion,defaulter" \
3838
sigs.k8s.io/scheduler-plugins/pkg/generated \
3939
sigs.k8s.io/scheduler-plugins/apis \
@@ -43,7 +43,7 @@ bash "${CODEGEN_PKG}"/kube_codegen.sh \
4343
--output-base "./" \
4444
--go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt
4545

46-
bash "${CODEGEN_PKG}"/kube_codegen.sh \
46+
bash "${CODEGEN_PKG}"/generate-groups.sh \
4747
all \
4848
sigs.k8s.io/scheduler-plugins/pkg/generated \
4949
sigs.k8s.io/scheduler-plugins/apis \

pkg/generated/applyconfiguration/internal/internal.go

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

pkg/generated/applyconfiguration/scheduling/v1alpha1/elasticquota.go

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

pkg/generated/applyconfiguration/scheduling/v1alpha1/elasticquotaspec.go

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

0 commit comments

Comments
 (0)