Skip to content

Add patch to pull in code from k/k#124193 #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 23, 2024
Merged

Add patch to pull in code from k/k#124193 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03a0e0f
Add patch to pull in code from k/k#124193
soltysh May 23, 2024
f9f4e3a
go mod tidy
soltysh May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ require (
k8s.io/apimachinery v0.30.0
k8s.io/client-go v0.30.0
k8s.io/code-generator v0.30.0
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70
k8s.io/klog/v2 v2.120.1
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
)

Expand Down Expand Up @@ -52,6 +50,8 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
0 hack/applyconfiguration.go → hack/applyconfiguration.go.patch
View file
Open in desktop
File renamed without changes.
0 hack/targets.go → hack/targets.go.patch
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions hack/update-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ cp "${SCRIPT_ROOT}/hack/kube_codegen.sh" "${CODEGEN_PKG}/kube_codegen.sh"
# TODO(soltysh): this should be removed after https://github.com/kubernetes/kubernetes/pull/124193
# merges, since it already includes these changes:
mv "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go.orig"
cp "${SCRIPT_ROOT}/hack/applyconfiguration.go" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go"
cp "${SCRIPT_ROOT}/hack/applyconfiguration.go.patch" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go"
mv "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go.orig"
cp "${SCRIPT_ROOT}/hack/targets.go" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go"
cp "${SCRIPT_ROOT}/hack/targets.go.patch" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/targets.go"
function cleanup {
mv "${CODEGEN_PKG}/kube_codegen.sh.orig" "${CODEGEN_PKG}/kube_codegen.sh"
mv "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go.orig" "${SCRIPT_ROOT}/vendor/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/applyconfiguration.go"
Expand Down