Skip to content

K
k3s
Unverified Commit b251681e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #62893 from hzxuzhonghu/mark-APIServiceSpec.CABundle-optional

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. mark APIServiceSpec.CABundle optional xref: https://github.com/kubernetes/kubernetes/issues/60690#issuecomment-382842852 mark the caBundle field optional so openapi is accurate **Release note**: ```release-note NONE ```
parents dc7f0742 271f9422
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
api/openapi-spec/swagger.json
View file @ b251681e
...@@ -85393,7 +85393,6 @@ ...@@ -85393,7 +85393,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"
], ],
...@@ -85539,7 +85538,6 @@ ...@@ -85539,7 +85538,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"
], ],
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go
View file @ b251681e
...@@ -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.
......
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/generated.proto
View file @ b251681e
...@@ -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.
......
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1/types.go
View file @ b251681e
...@@ -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.
......
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/generated.proto
View file @ b251681e
...@@ -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.
......
staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go
View file @ b251681e
...@@ -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