Skip to content

Commit d951d19

Browse files
authored
Merge pull request kubernetes#64996 from roycaihw/optional-crdstatus-conditions
Mark Conditions in CustomResourceDefinitionStatus as optional
2 parents b8e8130 + b614879 commit d951d19

File tree

5 files changed

+4
-2
lines changed

5 files changed

+4
-2
lines changed

api/openapi-spec/swagger.json

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/generated.proto

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ type CustomResourceDefinitionCondition struct {
295295
// CustomResourceDefinitionStatus indicates the state of the CustomResourceDefinition
296296
type CustomResourceDefinitionStatus struct {
297297
// Conditions indicate state for particular aspects of a CustomResourceDefinition
298+
// +optional
298299
Conditions []CustomResourceDefinitionCondition `json:"conditions" protobuf:"bytes,1,opt,name=conditions"`
299300

300301
// AcceptedNames are the names that are actually being used to serve discovery

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ type CustomResourceDefinitionCondition struct {
337337
// CustomResourceDefinitionStatus indicates the state of the CustomResourceDefinition
338338
type CustomResourceDefinitionStatus struct {
339339
// Conditions indicate state for particular aspects of a CustomResourceDefinition
340+
// +optional
340341
Conditions []CustomResourceDefinitionCondition `json:"conditions" protobuf:"bytes,1,opt,name=conditions"`
341342

342343
// AcceptedNames are the names that are actually being used to serve discovery

0 commit comments

Comments
 (0)