github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108522 from SergeyKanzhelev/grpcToBeta

Browse Source 
promote grpcProbes to beta
This commit is contained in:
Kubernetes Prow Robot
2022-03-23 22:31:05 -07:00
committed by GitHub
parent 68a0fccfb9 792a37e2f1
commit 8168c68bb6
12 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json generated
View File

@@ -8968,7 +8968,7 @@
},
"grpc": {
"$ref": "#/definitions/io.k8s.api.core.v1.GRPCAction",
"description": "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate."
"description": "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate."
},
"httpGet": {
"$ref": "#/definitions/io.k8s.api.core.v1.HTTPGetAction",

2
api/openapi-spec/v3/api__v1_openapi.json
View File

@@ -4635,7 +4635,7 @@
},
"grpc": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.GRPCAction",
"description": "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate."
"description": "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate."
},
"httpGet": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.HTTPGetAction",

2
api/openapi-spec/v3/apis__apps__v1_openapi.json
View File

@@ -3166,7 +3166,7 @@
},
"grpc": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.GRPCAction",
"description": "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate."
"description": "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate."
},
"httpGet": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.HTTPGetAction",

2
api/openapi-spec/v3/apis__batch__v1_openapi.json
View File

@@ -2392,7 +2392,7 @@
},
"grpc": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.GRPCAction",
"description": "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate."
"description": "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate."
},
"httpGet": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.HTTPGetAction",

2
api/openapi-spec/v3/apis__batch__v1beta1_openapi.json
View File

@@ -2199,7 +2199,7 @@
},
"grpc": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.GRPCAction",
"description": "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate."
"description": "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate."
},
"httpGet": {
"$ref": "#/components/schemas/io.k8s.api.core.v1.HTTPGetAction",

2
pkg/apis/core/types.go
View File

@@ -2243,7 +2243,7 @@ type ProbeHandler struct {
TCPSocket *TCPSocketAction
// GRPC specifies an action involving a GRPC port.
// This is an alpha field and requires enabling GRPCContainerProbe feature gate.
// This is a beta field and requires enabling GRPCContainerProbe feature gate.
// +featureGate=GRPCContainerProbe
// +optional
GRPC *GRPCAction

5
pkg/features/kube_features.go
View File

@@ -819,9 +819,10 @@ const (
// Allow users to recover from volume expansion failure
RecoverVolumeExpansionFailure featuregate.Feature = "RecoverVolumeExpansionFailure"
// owner: @yuzhiquan, @bowei, @PxyUp
// owner: @yuzhiquan, @bowei, @PxyUp, @SergeyKanzhelev
// kep: http://kep.k8s.io/2727
// alpha: v1.23
// beta: v1.24
//
// Enables GRPC probe method for {Liveness,Readiness,Startup}Probe.
GRPCContainerProbe featuregate.Feature = "GRPCContainerProbe"
@@ -958,7 +959,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
PodAndContainerStatsFromCRI: {Default: false, PreRelease: featuregate.Alpha},
HonorPVReclaimPolicy: {Default: false, PreRelease: featuregate.Beta},
RecoverVolumeExpansionFailure: {Default: false, PreRelease: featuregate.Alpha},
GRPCContainerProbe: {Default: false, PreRelease: featuregate.Alpha},
GRPCContainerProbe: {Default: true, PreRelease: featuregate.Beta},
LegacyServiceAccountTokenNoAutoGeneration: {Default: true, PreRelease: featuregate.Beta},
MinDomainsInPodTopologySpread: {Default: false, PreRelease: featuregate.Alpha},

4
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -22631,7 +22631,7 @@ func schema_k8sio_api_core_v1_Probe(ref common.ReferenceCallback) common.OpenAPI
},
"grpc": {
SchemaProps: spec.SchemaProps{
Description: "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate.",
Description: "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate.",
Ref: ref("k8s.io/api/core/v1.GRPCAction"),
},
},
@@ -22712,7 +22712,7 @@ func schema_k8sio_api_core_v1_ProbeHandler(ref common.ReferenceCallback) common.
},
"grpc": {
SchemaProps: spec.SchemaProps{
Description: "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate.",
Description: "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate.",
Ref: ref("k8s.io/api/core/v1.GRPCAction"),
},
},

2
staging/src/k8s.io/api/core/v1/generated.proto
View File

@@ -4010,7 +4010,7 @@ message ProbeHandler {
optional TCPSocketAction tcpSocket = 3;
// GRPC specifies an action involving a GRPC port.
// This is an alpha field and requires enabling GRPCContainerProbe feature gate.
// This is a beta field and requires enabling GRPCContainerProbe feature gate.
// +featureGate=GRPCContainerProbe
// +optional
optional GRPCAction grpc = 4;

2
staging/src/k8s.io/api/core/v1/types.go
View File

@@ -2461,7 +2461,7 @@ type ProbeHandler struct {
TCPSocket *TCPSocketAction `json:"tcpSocket,omitempty" protobuf:"bytes,3,opt,name=tcpSocket"`
// GRPC specifies an action involving a GRPC port.
// This is an alpha field and requires enabling GRPCContainerProbe feature gate.
// This is a beta field and requires enabling GRPCContainerProbe feature gate.
// +featureGate=GRPCContainerProbe
// +optional
GRPC *GRPCAction `json:"grpc,omitempty" protobuf:"bytes,4,opt,name=grpc"`

2
staging/src/k8s.io/api/core/v1/types_swagger_doc_generated.go generated
View File

@@ -1808,7 +1808,7 @@ var map_ProbeHandler = map[string]string{
"exec": "Exec specifies the action to take.",
"httpGet": "HTTPGet specifies the http request to perform.",
"tcpSocket": "TCPSocket specifies an action involving a TCP port.",
"grpc": "GRPC specifies an action involving a GRPC port. This is an alpha field and requires enabling GRPCContainerProbe feature gate.",
"grpc": "GRPC specifies an action involving a GRPC port. This is a beta field and requires enabling GRPCContainerProbe feature gate.",
}
func (ProbeHandler) SwaggerDoc() map[string]string {

10
test/e2e/common/node/container_probe.go
View File

@@ -520,10 +520,7 @@ var _ = SIGDescribe("Probing container", func() {
Testname: Pod liveness probe, using grpc call, success
Description: A Pod is created with liveness probe on grpc service. Liveness probe on this endpoint will not fail. When liveness probe does not fail then the restart count MUST remain zero.
*/
ginkgo.It("should *not* be restarted with a GRPC liveness probe [NodeAlphaFeature:GRPCContainerProbe][Feature:GRPCContainerProbe]", func() {
// TODO(SergeyKanzhelev): it is unclear when feature gates are not working as expected.
//e2eskipper.SkipUnlessFeatureGateEnabled(kubefeatures.GRPCContainerProbe)
ginkgo.It("should *not* be restarted with a GRPC liveness probe [NodeConformance]", func() {
livenessProbe := &v1.Probe{
ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{
@@ -546,10 +543,7 @@ var _ = SIGDescribe("Probing container", func() {
Description: A Pod is created with liveness probe on grpc service. Liveness probe on this endpoint should fail because of wrong probe port.
When liveness probe does fail then the restart count should +1.
*/
ginkgo.It("should be restarted with a GRPC liveness probe [NodeAlphaFeature:GRPCContainerProbe][Feature:GRPCContainerProbe]", func() {
// TODO(SergeyKanzhelev): it is unclear when feature gates are not working as expected.
//e2eskipper.SkipUnlessFeatureGateEnabled(kubefeatures.GRPCContainerProbe)
ginkgo.It("should be restarted with a GRPC liveness probe [NodeConformance]", func() {
livenessProbe := &v1.Probe{
ProbeHandler: v1.ProbeHandler{
GRPC: &v1.GRPCAction{