From f07b9b6a3c67053cffbfce42e9f865c3a0a71221 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Sat, 30 Mar 2019 14:52:18 +0800 Subject: [PATCH 1/2] add possible values to CustomResourceDefinitionConditionType --- .../apiextensions-apiserver/pkg/apis/apiextensions/types.go | 2 +- .../pkg/apis/apiextensions/v1beta1/types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go index 21873d46020..cd1e8c5ff50 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go @@ -267,7 +267,7 @@ const ( // CustomResourceDefinitionCondition contains details for the current condition of this pod. type CustomResourceDefinitionCondition struct { - // Type is the type of the condition. + // Type is the type of the condition. Types include Established, NamesAccepted and Terminating. Type CustomResourceDefinitionConditionType // Status is the status of the condition. // Can be True, False, Unknown. diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go index 973ac0eedd5..af2415ef586 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go @@ -281,7 +281,7 @@ const ( // CustomResourceDefinitionCondition contains details for the current condition of this pod. type CustomResourceDefinitionCondition struct { - // Type is the type of the condition. + // Type is the type of the condition. Types include Established, NamesAccepted and Terminating. Type CustomResourceDefinitionConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=CustomResourceDefinitionConditionType"` // Status is the status of the condition. // Can be True, False, Unknown. From 9c772a2855928de88af06eece5b492fc7b2ea859 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Sat, 30 Mar 2019 14:52:50 +0800 Subject: [PATCH 2/2] update generated files --- api/openapi-spec/swagger.json | 2 +- .../pkg/apis/apiextensions/v1beta1/generated.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 572be2e0f68..74c1802e498 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -16320,7 +16320,7 @@ "type": "string" }, "type": { - "description": "Type is the type of the condition.", + "description": "Type is the type of the condition. Types include Established, NamesAccepted and Terminating.", "type": "string" } }, diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto index 7e18cb9e314..febd5a6d999 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto @@ -140,7 +140,7 @@ message CustomResourceDefinition { // CustomResourceDefinitionCondition contains details for the current condition of this pod. message CustomResourceDefinitionCondition { - // Type is the type of the condition. + // Type is the type of the condition. Types include Established, NamesAccepted and Terminating. optional string type = 1; // Status is the status of the condition.