From 291f9a6ca5004cc91cfc4a744abf129c639d5682 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@microsoft.com>
Date: Fri, 5 Nov 2021 13:46:41 -0700
Subject: [PATCH] Update proto generation. (#211)

---
 proto/dependencies.sh | 81 ++++++++++++++++++++++++-------------------
 proto/generate.sh     |  7 ++--
 2 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/proto/dependencies.sh b/proto/dependencies.sh
index 96c7904..6e63732 100755
--- a/proto/dependencies.sh
+++ b/proto/dependencies.sh
@@ -16,6 +16,9 @@
 
 release=${1:-"master"}
 
+set -x
+curl_cmd="curl --fail -s"
+
 echo Downloading proto files for ${release}
 
 mkdir -p k8s.io/apimachinery/pkg/api/resource
@@ -28,12 +31,12 @@ mkdir -p k8s.io/api/rbac/v1alpha1
 mkdir -p k8s.io/api/rbac/v1
 mkdir -p k8s.io/api/rbac/v1beta1
 mkdir -p k8s.io/api/networking/v1
-mkdir -p k8s.io/api/settings/v1alpha1
+mkdir -p k8s.io/api/admissionregistration/v1
 mkdir -p k8s.io/api/admissionregistration/v1beta1
+mkdir -p k8s.io/api/scheduling/v1
 mkdir -p k8s.io/api/scheduling/v1alpha1
 mkdir -p k8s.io/api/storage/v1
 mkdir -p k8s.io/api/storage/v1beta1
-mkdir -p k8s.io/api/batch/v2alpha1
 mkdir -p k8s.io/api/batch/v1
 mkdir -p k8s.io/api/batch/v1beta1
 mkdir -p k8s.io/api/apps/v1beta2
@@ -41,13 +44,16 @@ mkdir -p k8s.io/api/apps/v1
 mkdir -p k8s.io/api/apps/v1beta1
 mkdir -p k8s.io/api/authentication/v1
 mkdir -p k8s.io/api/authentication/v1beta1
+mkdir -p k8s.io/api/admission/v1
 mkdir -p k8s.io/api/admission/v1beta1
+mkdir -p k8s.io/api/policy/v1
 mkdir -p k8s.io/api/policy/v1beta1
 mkdir -p k8s.io/api/core/v1
 mkdir -p k8s.io/api/autoscaling/v1
 mkdir -p k8s.io/api/autoscaling/v2beta1
 mkdir -p k8s.io/api/autoscaling/v2beta2
 mkdir -p k8s.io/api/extensions/v1beta1
+mkdir -p k8s.io/api/certificates/v1
 mkdir -p k8s.io/api/certificates/v1beta1
 mkdir -p k8s.io/api/imagepolicy/v1alpha1
 mkdir -p k8s.io/api/authorization/v1
@@ -56,48 +62,51 @@ mkdir -p k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
 
 base=https://raw.githubusercontent.com/kubernetes
 machinery_base=${base}/apimachinery/${release}
-curl -s ${machinery_base}/pkg/api/resource/generated.proto \
+$curl_cmd ${machinery_base}/pkg/api/resource/generated.proto \
 	> k8s.io/apimachinery/pkg/api/resource/generated.proto
 
-curl -s ${machinery_base}/pkg/apis/meta/v1/generated.proto \
+$curl_cmd ${machinery_base}/pkg/apis/meta/v1/generated.proto \
 	> k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
 
-curl -s ${machinery_base}/pkg/util/intstr/generated.proto \
+$curl_cmd ${machinery_base}/pkg/util/intstr/generated.proto \
 	> k8s.io/apimachinery/pkg/util/intstr/generated.proto
 
-curl -s ${machinery_base}/pkg/runtime/generated.proto \
+$curl_cmd ${machinery_base}/pkg/runtime/generated.proto \
 	> k8s.io/apimachinery/pkg/runtime/generated.proto
 
-curl -s ${machinery_base}/pkg/runtime/schema/generated.proto \
+$curl_cmd ${machinery_base}/pkg/runtime/schema/generated.proto \
 	> k8s.io/apimachinery/pkg/runtime/schema/generated.proto
 
 # There are currently no release branches for these files.
-curl -s ${base}/api/master/rbac/v1alpha1/generated.proto > k8s.io/api/rbac/v1alpha1/generated.proto
-curl -s ${base}/api/master/rbac/v1/generated.proto > k8s.io/api/rbac/v1/generated.proto
-curl -s ${base}/api/master/rbac/v1beta1/generated.proto > k8s.io/api/rbac/v1beta1/generated.proto
-curl -s ${base}/api/master/networking/v1/generated.proto > k8s.io/api/networking/v1/generated.proto
-curl -s ${base}/api/master/settings/v1alpha1/generated.proto > k8s.io/api/settings/v1alpha1/generated.proto
-curl -s ${base}/api/master/admissionregistration/v1beta1/generated.proto > k8s.io/api/admissionregistration/v1beta1/generated.proto
-curl -s ${base}/api/master/scheduling/v1alpha1/generated.proto > k8s.io/api/scheduling/v1alpha1/generated.proto
-curl -s ${base}/api/master/storage/v1/generated.proto > k8s.io/api/storage/v1/generated.proto
-curl -s ${base}/api/master/storage/v1beta1/generated.proto > k8s.io/api/storage/v1beta1/generated.proto
-curl -s ${base}/api/master/batch/v2alpha1/generated.proto > k8s.io/api/batch/v2alpha1/generated.proto
-curl -s ${base}/api/master/batch/v1/generated.proto > k8s.io/api/batch/v1/generated.proto
-curl -s ${base}/api/master/batch/v1beta1/generated.proto > k8s.io/api/batch/v1beta1/generated.proto
-curl -s ${base}/api/master/apps/v1beta2/generated.proto > k8s.io/api/apps/v1beta2/generated.proto
-curl -s ${base}/api/master/apps/v1/generated.proto > k8s.io/api/apps/v1/generated.proto
-curl -s ${base}/api/master/apps/v1beta1/generated.proto > k8s.io/api/apps/v1beta1/generated.proto
-curl -s ${base}/api/master/authentication/v1/generated.proto > k8s.io/api/authentication/v1/generated.proto
-curl -s ${base}/api/master/authentication/v1beta1/generated.proto > k8s.io/api/authentication/v1beta1/generated.proto
-curl -s ${base}/api/master/admission/v1beta1/generated.proto > k8s.io/api/admission/v1beta1/generated.proto
-curl -s ${base}/api/master/policy/v1beta1/generated.proto > k8s.io/api/policy/v1beta1/generated.proto
-curl -s ${base}/api/master/core/v1/generated.proto > k8s.io/api/core/v1/generated.proto
-curl -s ${base}/api/master/autoscaling/v1/generated.proto > k8s.io/api/autoscaling/v1/generated.proto
-curl -s ${base}/api/master/autoscaling/v2beta1/generated.proto > k8s.io/api/autoscaling/v2beta1/generated.proto
-curl -s ${base}/api/master/autoscaling/v2beta2/generated.proto > k8s.io/api/autoscaling/v2beta2/generated.proto
-curl -s ${base}/api/master/extensions/v1beta1/generated.proto > k8s.io/api/extensions/v1beta1/generated.proto
-curl -s ${base}/api/master/certificates/v1beta1/generated.proto > k8s.io/api/certificates/v1beta1/generated.proto
-curl -s ${base}/api/master/imagepolicy/v1alpha1/generated.proto > k8s.io/api/imagepolicy/v1alpha1/generated.proto
-curl -s ${base}/api/master/authorization/v1/generated.proto > k8s.io/api/authorization/v1/generated.proto
-curl -s ${base}/api/master/authorization/v1beta1/generated.proto > k8s.io/api/authorization/v1beta1/generated.proto
-curl -s ${base}/apiextensions-apiserver/master/pkg/apis/apiextensions/v1beta1/generated.proto > k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/rbac/v1alpha1/generated.proto > k8s.io/api/rbac/v1alpha1/generated.proto
+$curl_cmd ${base}/api/master/rbac/v1/generated.proto > k8s.io/api/rbac/v1/generated.proto
+$curl_cmd ${base}/api/master/rbac/v1beta1/generated.proto > k8s.io/api/rbac/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/networking/v1/generated.proto > k8s.io/api/networking/v1/generated.proto
+$curl_cmd ${base}/api/master/admissionregistration/v1beta1/generated.proto > k8s.io/api/admissionregistration/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/admissionregistration/v1/generated.proto > k8s.io/api/admissionregistration/v1/generated.proto
+$curl_cmd ${base}/api/master/scheduling/v1alpha1/generated.proto > k8s.io/api/scheduling/v1alpha1/generated.proto
+$curl_cmd ${base}/api/master/scheduling/v1/generated.proto > k8s.io/api/scheduling/v1/generated.proto
+$curl_cmd ${base}/api/master/storage/v1/generated.proto > k8s.io/api/storage/v1/generated.proto
+$curl_cmd ${base}/api/master/storage/v1beta1/generated.proto > k8s.io/api/storage/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/batch/v1/generated.proto > k8s.io/api/batch/v1/generated.proto
+$curl_cmd ${base}/api/master/batch/v1beta1/generated.proto > k8s.io/api/batch/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/apps/v1beta2/generated.proto > k8s.io/api/apps/v1beta2/generated.proto
+$curl_cmd ${base}/api/master/apps/v1/generated.proto > k8s.io/api/apps/v1/generated.proto
+$curl_cmd ${base}/api/master/apps/v1beta1/generated.proto > k8s.io/api/apps/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/authentication/v1/generated.proto > k8s.io/api/authentication/v1/generated.proto
+$curl_cmd ${base}/api/master/authentication/v1beta1/generated.proto > k8s.io/api/authentication/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/admission/v1beta1/generated.proto > k8s.io/api/admission/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/admission/v1/generated.proto > k8s.io/api/admission/v1/generated.proto
+$curl_cmd ${base}/api/master/policy/v1/generated.proto > k8s.io/api/policy/v1/generated.proto
+$curl_cmd ${base}/api/master/policy/v1beta1/generated.proto > k8s.io/api/policy/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/core/v1/generated.proto > k8s.io/api/core/v1/generated.proto
+$curl_cmd ${base}/api/master/autoscaling/v1/generated.proto > k8s.io/api/autoscaling/v1/generated.proto
+$curl_cmd ${base}/api/master/autoscaling/v2beta1/generated.proto > k8s.io/api/autoscaling/v2beta1/generated.proto
+$curl_cmd ${base}/api/master/autoscaling/v2beta2/generated.proto > k8s.io/api/autoscaling/v2beta2/generated.proto
+$curl_cmd ${base}/api/master/extensions/v1beta1/generated.proto > k8s.io/api/extensions/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/certificates/v1/generated.proto > k8s.io/api/certificates/v1/generated.proto
+$curl_cmd ${base}/api/master/certificates/v1beta1/generated.proto > k8s.io/api/certificates/v1beta1/generated.proto
+$curl_cmd ${base}/api/master/imagepolicy/v1alpha1/generated.proto > k8s.io/api/imagepolicy/v1alpha1/generated.proto
+$curl_cmd ${base}/api/master/authorization/v1/generated.proto > k8s.io/api/authorization/v1/generated.proto
+$curl_cmd ${base}/api/master/authorization/v1beta1/generated.proto > k8s.io/api/authorization/v1beta1/generated.proto
+$curl_cmd ${base}/apiextensions-apiserver/master/pkg/apis/apiextensions/v1beta1/generated.proto > k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
diff --git a/proto/generate.sh b/proto/generate.sh
index 335f24c..5760596 100755
--- a/proto/generate.sh
+++ b/proto/generate.sh
@@ -39,12 +39,12 @@ files="k8s.io/apimachinery/pkg/api/resource/generated.proto;Resource \
        k8s.io/api/rbac/v1/generated.proto;V1Rbac \
        k8s.io/api/rbac/v1beta1/generated.proto;V1beta1Rbac \
        k8s.io/api/networking/v1/generated.proto;V1Networking \
-       k8s.io/api/settings/v1alpha1/generated.proto;V1alpha1Settings \
        k8s.io/api/admissionregistration/v1beta1/generated.proto;V1beta1Admissionregistration \
+       k8s.io/api/admissionregistration/v1/generated.proto;V1Admissionregistration \
        k8s.io/api/scheduling/v1alpha1/generated.proto;V1alpha1Scheduling \
+       k8s.io/api/scheduling/v1/generated.proto;V1Scheduling \
        k8s.io/api/storage/v1/generated.proto;V1Storage \
        k8s.io/api/storage/v1beta1/generated.proto;V1beta1Storage \
-       k8s.io/api/batch/v2alpha1/generated.proto;V2alpha1Batch \
        k8s.io/api/batch/v1/generated.proto;V1Batch \
        k8s.io/api/batch/v1beta1/generated.proto;V1beta1Batch \
        k8s.io/api/apps/v1beta2/generated.proto;V1beta2Apps \
@@ -52,13 +52,16 @@ files="k8s.io/apimachinery/pkg/api/resource/generated.proto;Resource \
        k8s.io/api/apps/v1beta1/generated.proto;V1beta1Apps \
        k8s.io/api/authentication/v1/generated.proto;V1Authentication \
        k8s.io/api/authentication/v1beta1/generated.proto;V1beta1Authentication \
+       k8s.io/api/admission/v1/generated.proto;V1Admission \
        k8s.io/api/admission/v1beta1/generated.proto;V1beta1Admission \
+       k8s.io/api/policy/v1/generated.proto;V1Policy \
        k8s.io/api/policy/v1beta1/generated.proto;V1beta1Policy \
        k8s.io/api/core/v1/generated.proto;V1 \
        k8s.io/api/autoscaling/v1/generated.proto;V1Autoscaling \
        k8s.io/api/autoscaling/v2beta1/generated.proto;V2beta1Autoscaling \
        k8s.io/api/autoscaling/v2beta2/generated.proto;V2beta2Autoscaling \
        k8s.io/api/extensions/v1beta1/generated.proto;V1beta1Extensions \
+       k8s.io/api/certificates/v1/generated.proto;V1Certificates \
        k8s.io/api/certificates/v1beta1/generated.proto;V1beta1Certificates \
        k8s.io/api/imagepolicy/v1alpha1/generated.proto;V1alpha1Imagepolicy \
        k8s.io/api/authorization/v1/generated.proto;V1Authorization \