Default clientset_pkg and clientset_name variables #120877
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thockin
reviewed
Sep 25, 2023
| @@ -233,6 +233,9 @@ if grep -qw "lister" <<<"${GENS}"; then | |||
| fi | |||
|
|
|||
| if grep -qw "informer" <<<"${GENS}"; then | |||
| CLIENTSET_PKG="${CLIENTSET_PKG_NAME:-clientset}" | |||
There was a problem hiding this comment.
These lines exist above but maybe were not triggered. Can we do this instead:
diff --git a/staging/src/k8s.io/code-generator/generate-internal-groups.sh b/staging/src/k8s.io/code-generator/generate-internal-groups.sh
index db1f93f43ff..9676fac313b 100755
--- a/staging/src/k8s.io/code-generator/generate-internal-groups.sh
+++ b/staging/src/k8s.io/code-generator/generate-internal-groups.sh
@@ -120,6 +120,9 @@ for GVs in ${GROUPS_WITH_VERSIONS}; do
done
done
+CLIENTSET_PKG="${CLIENTSET_PKG_NAME:-clientset}"
+CLIENTSET_NAME="${CLIENTSET_NAME_VERSIONED:-versioned}"
+
if grep -qw "deepcopy" <<<"${GENS}"; then
# Nuke existing files
for dir in $(GO111MODULE=on go list -f '{{.Dir}}' "${ALL_FQ_APIS[@]}"); do
@@ -187,9 +190,6 @@ if grep -qw "applyconfiguration" <<<"${GENS}"; then
fi
if grep -qw "client" <<<"${GENS}"; then
- CLIENTSET_PKG="${CLIENTSET_PKG_NAME:-clientset}"
- CLIENTSET_NAME="${CLIENTSET_NAME_VERSIONED:-versioned}"
-
# Nuke existing files
root="$(GO111MODULE=on go list -f '{{.Dir}}' "${OUTPUT_PKG}/${CLIENTSET_PKG}/${CLIENTSET_NAME}" 2>/dev/null || true)"
if [ -n "${root}" ]; thenThere was a problem hiding this comment.
These lines exist above but maybe were not triggered. Can we do this instead:
Correct, but those are only invoked when generating client, if you invoke informer separately from client it won't.
Also, that was the other option I was considering - updated.
86dee3d
to
9b32d2f
Compare
|
/triage accepted |
|
/test unit |
|
@soltysh: The specified target(s) for
The following commands are available to trigger optional jobs:
Use
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
Thanks! /lgtm |
|
LGTM label has been added. Git tree hash: c51b34ff238a5d01c528463fc44bb0510cac7ec3
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: soltysh, thockin The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
/kind bug
/kind regression
What this PR does / why we need it:
Looks like during refactoring in #117262 something was missed.
Now when I use the deprecated script I'm getting:
This PR adds the missing defaulting where it should be.
Special notes for your reviewer:
/assign @thockin @liggitt
Does this PR introduce a user-facing change?