From 9eb544e78a4ad67af42d4b12a6ac1cc61df20c27 Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Fri, 1 Apr 2022 11:52:44 -0400 Subject: [PATCH 1/2] [sts] Generated: Make available replicas optional --- api/openapi-spec/swagger.json | 3 +-- api/openapi-spec/v3/apis__apps__v1_openapi.json | 3 +-- pkg/generated/openapi/zz_generated.openapi.go | 6 +++--- staging/src/k8s.io/api/apps/v1/generated.proto | 1 + staging/src/k8s.io/api/apps/v1beta1/generated.proto | 1 + staging/src/k8s.io/api/apps/v1beta2/generated.proto | 1 + 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index f0acd1722a19..b4d38cd64d33 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -1442,8 +1442,7 @@ } }, "required": [ - "replicas", - "availableReplicas" + "replicas" ], "type": "object" }, diff --git a/api/openapi-spec/v3/apis__apps__v1_openapi.json b/api/openapi-spec/v3/apis__apps__v1_openapi.json index 9d59e73aba05..8ef9d280796a 100644 --- a/api/openapi-spec/v3/apis__apps__v1_openapi.json +++ b/api/openapi-spec/v3/apis__apps__v1_openapi.json @@ -1203,8 +1203,7 @@ } }, "required": [ - "replicas", - "availableReplicas" + "replicas" ], "type": "object" }, diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 458f3e1b65fd..cb739f53580b 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -4165,7 +4165,7 @@ func schema_k8sio_api_apps_v1_StatefulSetStatus(ref common.ReferenceCallback) co }, }, }, - Required: []string{"replicas", "availableReplicas"}, + Required: []string{"replicas"}, }, }, Dependencies: []string{ @@ -5273,7 +5273,7 @@ func schema_k8sio_api_apps_v1beta1_StatefulSetStatus(ref common.ReferenceCallbac }, }, }, - Required: []string{"replicas", "availableReplicas"}, + Required: []string{"replicas"}, }, }, Dependencies: []string{ @@ -6930,7 +6930,7 @@ func schema_k8sio_api_apps_v1beta2_StatefulSetStatus(ref common.ReferenceCallbac }, }, }, - Required: []string{"replicas", "availableReplicas"}, + Required: []string{"replicas"}, }, }, Dependencies: []string{ diff --git a/staging/src/k8s.io/api/apps/v1/generated.proto b/staging/src/k8s.io/api/apps/v1/generated.proto index d46373d92dcf..1bdc400b9d20 100644 --- a/staging/src/k8s.io/api/apps/v1/generated.proto +++ b/staging/src/k8s.io/api/apps/v1/generated.proto @@ -759,6 +759,7 @@ message StatefulSetStatus { // Total number of available pods (ready for at least minReadySeconds) targeted by this statefulset. // This is a beta field and enabled/disabled by StatefulSetMinReadySeconds feature gate. + // +optional optional int32 availableReplicas = 11; } diff --git a/staging/src/k8s.io/api/apps/v1beta1/generated.proto b/staging/src/k8s.io/api/apps/v1beta1/generated.proto index 7f49e3eb543d..53df96ee4de3 100644 --- a/staging/src/k8s.io/api/apps/v1beta1/generated.proto +++ b/staging/src/k8s.io/api/apps/v1beta1/generated.proto @@ -514,6 +514,7 @@ message StatefulSetStatus { // Total number of available pods (ready for at least minReadySeconds) targeted by this StatefulSet. // This is a beta field and enabled/disabled by StatefulSetMinReadySeconds feature gate. + // +optional optional int32 availableReplicas = 11; } diff --git a/staging/src/k8s.io/api/apps/v1beta2/generated.proto b/staging/src/k8s.io/api/apps/v1beta2/generated.proto index f9e3ef7ef512..b5bc8c0cab51 100644 --- a/staging/src/k8s.io/api/apps/v1beta2/generated.proto +++ b/staging/src/k8s.io/api/apps/v1beta2/generated.proto @@ -801,6 +801,7 @@ message StatefulSetStatus { // Total number of available pods (ready for at least minReadySeconds) targeted by this StatefulSet. // This is a beta field and enabled/disabled by StatefulSetMinReadySeconds feature gate. + // +optional optional int32 availableReplicas = 11; } From 807ae0c318a2a5e2d8f6945170d8c129957cc8cf Mon Sep 17 00:00:00 2001 From: ravisantoshgudimetla Date: Fri, 1 Apr 2022 11:53:25 -0400 Subject: [PATCH 2/2] [sts] api: Make available replicas optional --- pkg/apis/apps/types.go | 1 + staging/src/k8s.io/api/apps/v1/types.go | 1 + staging/src/k8s.io/api/apps/v1beta1/types.go | 1 + staging/src/k8s.io/api/apps/v1beta2/types.go | 1 + 4 files changed, 4 insertions(+) diff --git a/pkg/apis/apps/types.go b/pkg/apis/apps/types.go index a86fd4f7dd76..771b2ef23c85 100644 --- a/pkg/apis/apps/types.go +++ b/pkg/apis/apps/types.go @@ -257,6 +257,7 @@ type StatefulSetStatus struct { // Total number of available pods (ready for at least minReadySeconds) targeted by this statefulset. // This is a beta field and requires enabling StatefulSetMinReadySeconds feature gate. + // +optional AvailableReplicas int32 } diff --git a/staging/src/k8s.io/api/apps/v1/types.go b/staging/src/k8s.io/api/apps/v1/types.go index 74c0ad66d85d..28474be7f4fd 100644 --- a/staging/src/k8s.io/api/apps/v1/types.go +++ b/staging/src/k8s.io/api/apps/v1/types.go @@ -282,6 +282,7 @@ type StatefulSetStatus struct { // Total number of available pods (ready for at least minReadySeconds) targeted by this statefulset. // This is a beta field and enabled/disabled by StatefulSetMinReadySeconds feature gate. + // +optional AvailableReplicas int32 `json:"availableReplicas" protobuf:"varint,11,opt,name=availableReplicas"` } diff --git a/staging/src/k8s.io/api/apps/v1beta1/types.go b/staging/src/k8s.io/api/apps/v1beta1/types.go index 08a36f5182d4..cdc81c956a3c 100644 --- a/staging/src/k8s.io/api/apps/v1beta1/types.go +++ b/staging/src/k8s.io/api/apps/v1beta1/types.go @@ -321,6 +321,7 @@ type StatefulSetStatus struct { // Total number of available pods (ready for at least minReadySeconds) targeted by this StatefulSet. // This is a beta field and enabled/disabled by StatefulSetMinReadySeconds feature gate. + // +optional AvailableReplicas int32 `json:"availableReplicas" protobuf:"varint,11,opt,name=availableReplicas"` } diff --git a/staging/src/k8s.io/api/apps/v1beta2/types.go b/staging/src/k8s.io/api/apps/v1beta2/types.go index a93ef4f95468..6c2448869e71 100644 --- a/staging/src/k8s.io/api/apps/v1beta2/types.go +++ b/staging/src/k8s.io/api/apps/v1beta2/types.go @@ -330,6 +330,7 @@ type StatefulSetStatus struct { // Total number of available pods (ready for at least minReadySeconds) targeted by this StatefulSet. // This is a beta field and enabled/disabled by StatefulSetMinReadySeconds feature gate. + // +optional AvailableReplicas int32 `json:"availableReplicas" protobuf:"varint,11,opt,name=availableReplicas"` }