Call update-proto-bindings from update-codegen

One script to bring them all ...
This commit is contained in:
Tim Hockin 2023-01-05 15:41:51 -08:00
parent a057f35c90
commit 4dae505d53
No known key found for this signature in database
16 changed files with 18 additions and 89 deletions

View File

@ -38,7 +38,6 @@ fi
BASH_TARGETS=(
update-generated-protobuf
update-codegen
update-generated-proto-bindings
update-generated-api-compatibility-data
update-generated-docs
update-generated-swagger-docs

View File

@ -777,6 +777,12 @@ function codegen::subprojects() {
done
}
function codegen::protobindings() {
# NOTE: All output from this script needs to be copied back to the calling
# source tree. This is managed in kube::build::copy_output in build/common.sh.
# If the output set is changed update that function.
build/run.sh hack/update-generated-proto-bindings-dockerized.sh
}
#
# main

View File

@ -1,27 +0,0 @@
#!/usr/bin/env bash
# Copyright 2017 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
# NOTE: All output from this script needs to be copied back to the calling
# source tree. This is managed in kube::build::copy_output in build/common.sh.
# If the output set is changed update that function.
"${KUBE_ROOT}/build/run.sh" hack/update-generated-proto-bindings-dockerized.sh

View File

@ -1,49 +0,0 @@
#!/usr/bin/env bash
# Copyright 2018 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# This script checks whether updating of protobuf bindings is needed.
# Run `hack/update-generated-proto-bindings.sh` to regenerate them.
#
# Usage: `hack/verify-generated-proto-bindings.sh`.
set -o errexit
set -o nounset
set -o pipefail
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
source "${KUBE_ROOT}/hack/lib/init.sh"
kube::util::ensure_clean_working_dir
_tmpdir="$(kube::realpath "$(mktemp -d -t "$(basename "$0").XXXXXX")")"
git worktree add -f -q "${_tmpdir}" HEAD
kube::util::trap_add "git worktree remove -f ${_tmpdir}" EXIT
cd "${_tmpdir}"
# Regenerate.
hack/update-generated-proto-bindings.sh
# Test for diffs
diffs=$(git status --porcelain | wc -l)
if [[ ${diffs} -gt 0 ]]; then
git status
git diff
echo
echo "Proto bindings need to be regenerated" >&2
echo "Please run 'hack/update-generated-proto-bindings.sh'" >&2
exit 1
fi

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package v2alpha1;

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package runtime.v1;

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package v1beta1;

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package v2alpha1;

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package deviceplugin;

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package v1beta1;

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package pluginregistration;

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package pluginregistration;

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package pluginregistration;

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package v1;

View File

@ -1,4 +1,4 @@
// To regenerate api.pb.go run hack/update-generated-proto-bindings.sh
// To regenerate api.pb.go run `hack/update-codegen.sh protobindings`
syntax = "proto3";
package v1alpha1;