github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make update-codegen conversion work on gengo/v2

Browse Source
This commit is contained in:
Tim Hockin
2023-12-29 15:08:57 -08:00
parent ed35118664
commit 5475797f43
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
hack/update-codegen.sh
View File

@@ -413,7 +413,7 @@ function codegen::defaults() {
# IDL. # IDL.
function codegen::conversions() { function codegen::conversions() {
# Build the tool. # Build the tool.
GO111MODULE=on GOPROXY=off go install \ GOPROXY=off go install \
k8s.io/code-generator/cmd/conversion-gen k8s.io/code-generator/cmd/conversion-gen
# The result file, in each pkg, of conversion generation. # The result file, in each pkg, of conversion generation.
@@ -438,7 +438,7 @@ function codegen::conversions() {
local tag_pkgs=() local tag_pkgs=()
for dir in "${tag_dirs[@]}"; do for dir in "${tag_dirs[@]}"; do
tag_pkgs+=("${PRJ_SRC_PATH}/$dir") tag_pkgs+=("./$dir")
done done
local extra_peer_pkgs=( local extra_peer_pkgs=(
@@ -457,13 +457,12 @@ function codegen::conversions() {
git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f git_find -z ':(glob)**'/"${output_file}.go" | xargs -0 rm -f
./hack/run-in-gopath.sh "${gen_conversion_bin}" \ "${gen_conversion_bin}" \
--v "${KUBE_VERBOSE}" \ --v "${KUBE_VERBOSE}" \
--logtostderr \ --logtostderr \
--go-header-file "${BOILERPLATE_FILENAME}" \ --go-header-file "${BOILERPLATE_FILENAME}" \
--output-file-base "${output_file}" \ --output-file-base "${output_file}" \
$(printf -- " --extra-peer-dirs %s" "${extra_peer_pkgs[@]}") \ $(printf -- " --extra-peer-dirs %s" "${extra_peer_pkgs[@]}") \
$(printf -- " --extra-dirs %s" "${tag_pkgs[@]}") \
$(printf -- " -i %s" "${tag_pkgs[@]}") \ $(printf -- " -i %s" "${tag_pkgs[@]}") \
"$@" "$@"

2
staging/src/k8s.io/client-go/scale/scheme/appsv1beta1/doc.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
// +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta1 // +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta1
package appsv1beta1 // import "k8s.io/client-go/scale/scheme/appsv1beta1" package appsv1beta1 // import "k8s.io/client-go/scale/scheme/appsv1beta1"

2
staging/src/k8s.io/client-go/scale/scheme/appsv1beta2/doc.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
// +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta2 // +k8s:conversion-gen-external-types=k8s.io/api/apps/v1beta2
package appsv1beta2 // import "k8s.io/client-go/scale/scheme/appsv1beta2" package appsv1beta2 // import "k8s.io/client-go/scale/scheme/appsv1beta2"

2
staging/src/k8s.io/client-go/scale/scheme/autoscalingv1/doc.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
// +k8s:conversion-gen-external-types=k8s.io/api/autoscaling/v1 // +k8s:conversion-gen-external-types=k8s.io/api/autoscaling/v1
package autoscalingv1 // import "k8s.io/client-go/scale/scheme/autoscalingv1" package autoscalingv1 // import "k8s.io/client-go/scale/scheme/autoscalingv1"

2
staging/src/k8s.io/client-go/scale/scheme/extensionsv1beta1/doc.go
View File

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/client-go/scale/scheme // +k8s:conversion-gen=k8s.io/client-go/scale/scheme
// +k8s:conversion-gen-external-types=k8s.io/api/extensions/v1beta1 // +k8s:conversion-gen-external-types=k8s.io/api/extensions/v1beta1
package extensionsv1beta1 // import "k8s.io/client-go/scale/scheme/extensionsv1beta1" package extensionsv1beta1 // import "k8s.io/client-go/scale/scheme/extensionsv1beta1"