diff --git a/hack/make-rules/update.sh b/hack/make-rules/update.sh index 37e5e58a711..abeb7b19c0e 100755 --- a/hack/make-rules/update.sh +++ b/hack/make-rules/update.sh @@ -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 diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index 69d620255f2..0447574e189 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -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 diff --git a/hack/update-generated-proto-bindings.sh b/hack/update-generated-proto-bindings.sh deleted file mode 100755 index 87bdee7fe14..00000000000 --- a/hack/update-generated-proto-bindings.sh +++ /dev/null @@ -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 diff --git a/hack/verify-generated-proto-bindings.sh b/hack/verify-generated-proto-bindings.sh deleted file mode 100755 index b0ae55b52f4..00000000000 --- a/hack/verify-generated-proto-bindings.sh +++ /dev/null @@ -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 diff --git a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1/api.proto b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1/api.proto index 33176d2b00a..ba61622714c 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1/api.proto +++ b/staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/v2alpha1/api.proto @@ -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; diff --git a/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto b/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto index 5475a7afa8c..7df44f2d2ee 100644 --- a/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto +++ b/staging/src/k8s.io/cri-api/pkg/apis/runtime/v1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kms/apis/v1beta1/api.proto b/staging/src/k8s.io/kms/apis/v1beta1/api.proto index b6576b2d242..ec3f570a57a 100644 --- a/staging/src/k8s.io/kms/apis/v1beta1/api.proto +++ b/staging/src/k8s.io/kms/apis/v1beta1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kms/apis/v2alpha1/api.proto b/staging/src/k8s.io/kms/apis/v2alpha1/api.proto index eaf77077d5c..2c3b3fa669c 100644 --- a/staging/src/k8s.io/kms/apis/v2alpha1/api.proto +++ b/staging/src/k8s.io/kms/apis/v2alpha1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto index 61809b14253..201a4cb7cb8 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1alpha/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto index a907a84a2e5..dbf608b810d 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha1/api.proto index c86ef6928e0..8278fbc9b98 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha1/api.proto @@ -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"; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.proto index 03bab1af856..454404c3976 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.proto index 03bab1af856..454404c3976 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1alpha1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.proto index 03bab1af856..454404c3976 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1beta1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto index 40427bb5bbc..1157a162933 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1/api.proto @@ -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; diff --git a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto index 6d74b6ba493..c78660b5eee 100644 --- a/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto +++ b/staging/src/k8s.io/kubelet/pkg/apis/podresources/v1alpha1/api.proto @@ -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;