Skip to content

Commit 291f9a6

Browse files
Update proto generation. (#211)
1 parent 2db702d commit 291f9a6

File tree

2 files changed

+50
-38
lines changed

2 files changed

+50
-38
lines changed

proto/dependencies.sh

+45-36
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
release=${1:-"master"}
1818

19+
set -x
20+
curl_cmd="curl --fail -s"
21+
1922
echo Downloading proto files for ${release}
2023

2124
mkdir -p k8s.io/apimachinery/pkg/api/resource
@@ -28,26 +31,29 @@ mkdir -p k8s.io/api/rbac/v1alpha1
2831
mkdir -p k8s.io/api/rbac/v1
2932
mkdir -p k8s.io/api/rbac/v1beta1
3033
mkdir -p k8s.io/api/networking/v1
31-
mkdir -p k8s.io/api/settings/v1alpha1
34+
mkdir -p k8s.io/api/admissionregistration/v1
3235
mkdir -p k8s.io/api/admissionregistration/v1beta1
36+
mkdir -p k8s.io/api/scheduling/v1
3337
mkdir -p k8s.io/api/scheduling/v1alpha1
3438
mkdir -p k8s.io/api/storage/v1
3539
mkdir -p k8s.io/api/storage/v1beta1
36-
mkdir -p k8s.io/api/batch/v2alpha1
3740
mkdir -p k8s.io/api/batch/v1
3841
mkdir -p k8s.io/api/batch/v1beta1
3942
mkdir -p k8s.io/api/apps/v1beta2
4043
mkdir -p k8s.io/api/apps/v1
4144
mkdir -p k8s.io/api/apps/v1beta1
4245
mkdir -p k8s.io/api/authentication/v1
4346
mkdir -p k8s.io/api/authentication/v1beta1
47+
mkdir -p k8s.io/api/admission/v1
4448
mkdir -p k8s.io/api/admission/v1beta1
49+
mkdir -p k8s.io/api/policy/v1
4550
mkdir -p k8s.io/api/policy/v1beta1
4651
mkdir -p k8s.io/api/core/v1
4752
mkdir -p k8s.io/api/autoscaling/v1
4853
mkdir -p k8s.io/api/autoscaling/v2beta1
4954
mkdir -p k8s.io/api/autoscaling/v2beta2
5055
mkdir -p k8s.io/api/extensions/v1beta1
56+
mkdir -p k8s.io/api/certificates/v1
5157
mkdir -p k8s.io/api/certificates/v1beta1
5258
mkdir -p k8s.io/api/imagepolicy/v1alpha1
5359
mkdir -p k8s.io/api/authorization/v1
@@ -56,48 +62,51 @@ mkdir -p k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
5662

5763
base=https://raw.githubusercontent.com/kubernetes
5864
machinery_base=${base}/apimachinery/${release}
59-
curl -s ${machinery_base}/pkg/api/resource/generated.proto \
65+
$curl_cmd ${machinery_base}/pkg/api/resource/generated.proto \
6066
> k8s.io/apimachinery/pkg/api/resource/generated.proto
6167

62-
curl -s ${machinery_base}/pkg/apis/meta/v1/generated.proto \
68+
$curl_cmd ${machinery_base}/pkg/apis/meta/v1/generated.proto \
6369
> k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
6470

65-
curl -s ${machinery_base}/pkg/util/intstr/generated.proto \
71+
$curl_cmd ${machinery_base}/pkg/util/intstr/generated.proto \
6672
> k8s.io/apimachinery/pkg/util/intstr/generated.proto
6773

68-
curl -s ${machinery_base}/pkg/runtime/generated.proto \
74+
$curl_cmd ${machinery_base}/pkg/runtime/generated.proto \
6975
> k8s.io/apimachinery/pkg/runtime/generated.proto
7076

71-
curl -s ${machinery_base}/pkg/runtime/schema/generated.proto \
77+
$curl_cmd ${machinery_base}/pkg/runtime/schema/generated.proto \
7278
> k8s.io/apimachinery/pkg/runtime/schema/generated.proto
7379

7480
# There are currently no release branches for these files.
75-
curl -s ${base}/api/master/rbac/v1alpha1/generated.proto > k8s.io/api/rbac/v1alpha1/generated.proto
76-
curl -s ${base}/api/master/rbac/v1/generated.proto > k8s.io/api/rbac/v1/generated.proto
77-
curl -s ${base}/api/master/rbac/v1beta1/generated.proto > k8s.io/api/rbac/v1beta1/generated.proto
78-
curl -s ${base}/api/master/networking/v1/generated.proto > k8s.io/api/networking/v1/generated.proto
79-
curl -s ${base}/api/master/settings/v1alpha1/generated.proto > k8s.io/api/settings/v1alpha1/generated.proto
80-
curl -s ${base}/api/master/admissionregistration/v1beta1/generated.proto > k8s.io/api/admissionregistration/v1beta1/generated.proto
81-
curl -s ${base}/api/master/scheduling/v1alpha1/generated.proto > k8s.io/api/scheduling/v1alpha1/generated.proto
82-
curl -s ${base}/api/master/storage/v1/generated.proto > k8s.io/api/storage/v1/generated.proto
83-
curl -s ${base}/api/master/storage/v1beta1/generated.proto > k8s.io/api/storage/v1beta1/generated.proto
84-
curl -s ${base}/api/master/batch/v2alpha1/generated.proto > k8s.io/api/batch/v2alpha1/generated.proto
85-
curl -s ${base}/api/master/batch/v1/generated.proto > k8s.io/api/batch/v1/generated.proto
86-
curl -s ${base}/api/master/batch/v1beta1/generated.proto > k8s.io/api/batch/v1beta1/generated.proto
87-
curl -s ${base}/api/master/apps/v1beta2/generated.proto > k8s.io/api/apps/v1beta2/generated.proto
88-
curl -s ${base}/api/master/apps/v1/generated.proto > k8s.io/api/apps/v1/generated.proto
89-
curl -s ${base}/api/master/apps/v1beta1/generated.proto > k8s.io/api/apps/v1beta1/generated.proto
90-
curl -s ${base}/api/master/authentication/v1/generated.proto > k8s.io/api/authentication/v1/generated.proto
91-
curl -s ${base}/api/master/authentication/v1beta1/generated.proto > k8s.io/api/authentication/v1beta1/generated.proto
92-
curl -s ${base}/api/master/admission/v1beta1/generated.proto > k8s.io/api/admission/v1beta1/generated.proto
93-
curl -s ${base}/api/master/policy/v1beta1/generated.proto > k8s.io/api/policy/v1beta1/generated.proto
94-
curl -s ${base}/api/master/core/v1/generated.proto > k8s.io/api/core/v1/generated.proto
95-
curl -s ${base}/api/master/autoscaling/v1/generated.proto > k8s.io/api/autoscaling/v1/generated.proto
96-
curl -s ${base}/api/master/autoscaling/v2beta1/generated.proto > k8s.io/api/autoscaling/v2beta1/generated.proto
97-
curl -s ${base}/api/master/autoscaling/v2beta2/generated.proto > k8s.io/api/autoscaling/v2beta2/generated.proto
98-
curl -s ${base}/api/master/extensions/v1beta1/generated.proto > k8s.io/api/extensions/v1beta1/generated.proto
99-
curl -s ${base}/api/master/certificates/v1beta1/generated.proto > k8s.io/api/certificates/v1beta1/generated.proto
100-
curl -s ${base}/api/master/imagepolicy/v1alpha1/generated.proto > k8s.io/api/imagepolicy/v1alpha1/generated.proto
101-
curl -s ${base}/api/master/authorization/v1/generated.proto > k8s.io/api/authorization/v1/generated.proto
102-
curl -s ${base}/api/master/authorization/v1beta1/generated.proto > k8s.io/api/authorization/v1beta1/generated.proto
103-
curl -s ${base}/apiextensions-apiserver/master/pkg/apis/apiextensions/v1beta1/generated.proto > k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
81+
$curl_cmd ${base}/api/master/rbac/v1alpha1/generated.proto > k8s.io/api/rbac/v1alpha1/generated.proto
82+
$curl_cmd ${base}/api/master/rbac/v1/generated.proto > k8s.io/api/rbac/v1/generated.proto
83+
$curl_cmd ${base}/api/master/rbac/v1beta1/generated.proto > k8s.io/api/rbac/v1beta1/generated.proto
84+
$curl_cmd ${base}/api/master/networking/v1/generated.proto > k8s.io/api/networking/v1/generated.proto
85+
$curl_cmd ${base}/api/master/admissionregistration/v1beta1/generated.proto > k8s.io/api/admissionregistration/v1beta1/generated.proto
86+
$curl_cmd ${base}/api/master/admissionregistration/v1/generated.proto > k8s.io/api/admissionregistration/v1/generated.proto
87+
$curl_cmd ${base}/api/master/scheduling/v1alpha1/generated.proto > k8s.io/api/scheduling/v1alpha1/generated.proto
88+
$curl_cmd ${base}/api/master/scheduling/v1/generated.proto > k8s.io/api/scheduling/v1/generated.proto
89+
$curl_cmd ${base}/api/master/storage/v1/generated.proto > k8s.io/api/storage/v1/generated.proto
90+
$curl_cmd ${base}/api/master/storage/v1beta1/generated.proto > k8s.io/api/storage/v1beta1/generated.proto
91+
$curl_cmd ${base}/api/master/batch/v1/generated.proto > k8s.io/api/batch/v1/generated.proto
92+
$curl_cmd ${base}/api/master/batch/v1beta1/generated.proto > k8s.io/api/batch/v1beta1/generated.proto
93+
$curl_cmd ${base}/api/master/apps/v1beta2/generated.proto > k8s.io/api/apps/v1beta2/generated.proto
94+
$curl_cmd ${base}/api/master/apps/v1/generated.proto > k8s.io/api/apps/v1/generated.proto
95+
$curl_cmd ${base}/api/master/apps/v1beta1/generated.proto > k8s.io/api/apps/v1beta1/generated.proto
96+
$curl_cmd ${base}/api/master/authentication/v1/generated.proto > k8s.io/api/authentication/v1/generated.proto
97+
$curl_cmd ${base}/api/master/authentication/v1beta1/generated.proto > k8s.io/api/authentication/v1beta1/generated.proto
98+
$curl_cmd ${base}/api/master/admission/v1beta1/generated.proto > k8s.io/api/admission/v1beta1/generated.proto
99+
$curl_cmd ${base}/api/master/admission/v1/generated.proto > k8s.io/api/admission/v1/generated.proto
100+
$curl_cmd ${base}/api/master/policy/v1/generated.proto > k8s.io/api/policy/v1/generated.proto
101+
$curl_cmd ${base}/api/master/policy/v1beta1/generated.proto > k8s.io/api/policy/v1beta1/generated.proto
102+
$curl_cmd ${base}/api/master/core/v1/generated.proto > k8s.io/api/core/v1/generated.proto
103+
$curl_cmd ${base}/api/master/autoscaling/v1/generated.proto > k8s.io/api/autoscaling/v1/generated.proto
104+
$curl_cmd ${base}/api/master/autoscaling/v2beta1/generated.proto > k8s.io/api/autoscaling/v2beta1/generated.proto
105+
$curl_cmd ${base}/api/master/autoscaling/v2beta2/generated.proto > k8s.io/api/autoscaling/v2beta2/generated.proto
106+
$curl_cmd ${base}/api/master/extensions/v1beta1/generated.proto > k8s.io/api/extensions/v1beta1/generated.proto
107+
$curl_cmd ${base}/api/master/certificates/v1/generated.proto > k8s.io/api/certificates/v1/generated.proto
108+
$curl_cmd ${base}/api/master/certificates/v1beta1/generated.proto > k8s.io/api/certificates/v1beta1/generated.proto
109+
$curl_cmd ${base}/api/master/imagepolicy/v1alpha1/generated.proto > k8s.io/api/imagepolicy/v1alpha1/generated.proto
110+
$curl_cmd ${base}/api/master/authorization/v1/generated.proto > k8s.io/api/authorization/v1/generated.proto
111+
$curl_cmd ${base}/api/master/authorization/v1beta1/generated.proto > k8s.io/api/authorization/v1beta1/generated.proto
112+
$curl_cmd ${base}/apiextensions-apiserver/master/pkg/apis/apiextensions/v1beta1/generated.proto > k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto

proto/generate.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,29 @@ files="k8s.io/apimachinery/pkg/api/resource/generated.proto;Resource \
3939
k8s.io/api/rbac/v1/generated.proto;V1Rbac \
4040
k8s.io/api/rbac/v1beta1/generated.proto;V1beta1Rbac \
4141
k8s.io/api/networking/v1/generated.proto;V1Networking \
42-
k8s.io/api/settings/v1alpha1/generated.proto;V1alpha1Settings \
4342
k8s.io/api/admissionregistration/v1beta1/generated.proto;V1beta1Admissionregistration \
43+
k8s.io/api/admissionregistration/v1/generated.proto;V1Admissionregistration \
4444
k8s.io/api/scheduling/v1alpha1/generated.proto;V1alpha1Scheduling \
45+
k8s.io/api/scheduling/v1/generated.proto;V1Scheduling \
4546
k8s.io/api/storage/v1/generated.proto;V1Storage \
4647
k8s.io/api/storage/v1beta1/generated.proto;V1beta1Storage \
47-
k8s.io/api/batch/v2alpha1/generated.proto;V2alpha1Batch \
4848
k8s.io/api/batch/v1/generated.proto;V1Batch \
4949
k8s.io/api/batch/v1beta1/generated.proto;V1beta1Batch \
5050
k8s.io/api/apps/v1beta2/generated.proto;V1beta2Apps \
5151
k8s.io/api/apps/v1/generated.proto;V1Apps \
5252
k8s.io/api/apps/v1beta1/generated.proto;V1beta1Apps \
5353
k8s.io/api/authentication/v1/generated.proto;V1Authentication \
5454
k8s.io/api/authentication/v1beta1/generated.proto;V1beta1Authentication \
55+
k8s.io/api/admission/v1/generated.proto;V1Admission \
5556
k8s.io/api/admission/v1beta1/generated.proto;V1beta1Admission \
57+
k8s.io/api/policy/v1/generated.proto;V1Policy \
5658
k8s.io/api/policy/v1beta1/generated.proto;V1beta1Policy \
5759
k8s.io/api/core/v1/generated.proto;V1 \
5860
k8s.io/api/autoscaling/v1/generated.proto;V1Autoscaling \
5961
k8s.io/api/autoscaling/v2beta1/generated.proto;V2beta1Autoscaling \
6062
k8s.io/api/autoscaling/v2beta2/generated.proto;V2beta2Autoscaling \
6163
k8s.io/api/extensions/v1beta1/generated.proto;V1beta1Extensions \
64+
k8s.io/api/certificates/v1/generated.proto;V1Certificates \
6265
k8s.io/api/certificates/v1beta1/generated.proto;V1beta1Certificates \
6366
k8s.io/api/imagepolicy/v1alpha1/generated.proto;V1alpha1Imagepolicy \
6467
k8s.io/api/authorization/v1/generated.proto;V1Authorization \

0 commit comments

Comments
 (0)