Commit 271f9422 authored by hzxuzhonghu's avatar hzxuzhonghu Committed by xuzhonghu

mark APIServiceSpec.CABundle optional

parent bf3cda66
...@@ -85395,7 +85395,6 @@ ...@@ -85395,7 +85395,6 @@
"description": "APIServiceSpec contains information for locating and communicating with a server. Only https is supported, though you are able to disable certificate verification.", "description": "APIServiceSpec contains information for locating and communicating with a server. Only https is supported, though you are able to disable certificate verification.",
"required": [ "required": [
"service", "service",
"caBundle",
"groupPriorityMinimum", "groupPriorityMinimum",
"versionPriority" "versionPriority"
], ],
...@@ -85541,7 +85540,6 @@ ...@@ -85541,7 +85540,6 @@
"description": "APIServiceSpec contains information for locating and communicating with a server. Only https is supported, though you are able to disable certificate verification.", "description": "APIServiceSpec contains information for locating and communicating with a server. Only https is supported, though you are able to disable certificate verification.",
"required": [ "required": [
"service", "service",
"caBundle",
"groupPriorityMinimum", "groupPriorityMinimum",
"versionPriority" "versionPriority"
], ],
...@@ -53,6 +53,7 @@ type APIServiceSpec struct { ...@@ -53,6 +53,7 @@ type APIServiceSpec struct {
// This is strongly discouraged. You should use the CABundle instead. // This is strongly discouraged. You should use the CABundle instead.
InsecureSkipTLSVerify bool InsecureSkipTLSVerify bool
// CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate. // CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate.
// +optional
CABundle []byte CABundle []byte
// GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones. // GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones.
......
...@@ -89,6 +89,7 @@ message APIServiceSpec { ...@@ -89,6 +89,7 @@ message APIServiceSpec {
optional bool insecureSkipTLSVerify = 4; optional bool insecureSkipTLSVerify = 4;
// CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate. // CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate.
// +optional
optional bytes caBundle = 5; optional bytes caBundle = 5;
// GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones. // GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones.
......
...@@ -53,7 +53,8 @@ type APIServiceSpec struct { ...@@ -53,7 +53,8 @@ type APIServiceSpec struct {
// This is strongly discouraged. You should use the CABundle instead. // This is strongly discouraged. You should use the CABundle instead.
InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty" protobuf:"varint,4,opt,name=insecureSkipTLSVerify"` InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty" protobuf:"varint,4,opt,name=insecureSkipTLSVerify"`
// CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate. // CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate.
CABundle []byte `json:"caBundle" protobuf:"bytes,5,opt,name=caBundle"` // +optional
CABundle []byte `json:"caBundle,omitempty" protobuf:"bytes,5,opt,name=caBundle"`
// GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones. // GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones.
// Note that other versions of this group might specify even higher GroupPriorityMininum values such that the whole group gets a higher priority. // Note that other versions of this group might specify even higher GroupPriorityMininum values such that the whole group gets a higher priority.
......
...@@ -89,6 +89,7 @@ message APIServiceSpec { ...@@ -89,6 +89,7 @@ message APIServiceSpec {
optional bool insecureSkipTLSVerify = 4; optional bool insecureSkipTLSVerify = 4;
// CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate. // CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate.
// +optional
optional bytes caBundle = 5; optional bytes caBundle = 5;
// GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones. // GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones.
......
...@@ -53,7 +53,8 @@ type APIServiceSpec struct { ...@@ -53,7 +53,8 @@ type APIServiceSpec struct {
// This is strongly discouraged. You should use the CABundle instead. // This is strongly discouraged. You should use the CABundle instead.
InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty" protobuf:"varint,4,opt,name=insecureSkipTLSVerify"` InsecureSkipTLSVerify bool `json:"insecureSkipTLSVerify,omitempty" protobuf:"varint,4,opt,name=insecureSkipTLSVerify"`
// CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate. // CABundle is a PEM encoded CA bundle which will be used to validate an API server's serving certificate.
CABundle []byte `json:"caBundle" protobuf:"bytes,5,opt,name=caBundle"` // +optional
CABundle []byte `json:"caBundle,omitempty" protobuf:"bytes,5,opt,name=caBundle"`
// GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones. // GroupPriorityMininum is the priority this group should have at least. Higher priority means that the group is preferred by clients over lower priority ones.
// Note that other versions of this group might specify even higher GroupPriorityMininum values such that the whole group gets a higher priority. // Note that other versions of this group might specify even higher GroupPriorityMininum values such that the whole group gets a higher priority.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment