github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116233 from SergeyKanzhelev/GRPCContainerProbeGA

Browse Source 
GRPCContainerProbe is GA
This commit is contained in:
Kubernetes Prow Robot 2023-03-03 15:21:06 -08:00 committed by GitHub
commit 6260796b63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

3
pkg/features/kube_features.go
View File

@ -298,6 +298,7 @@ const (
// kep: https://kep.k8s.io/2727
// alpha: v1.23
// beta: v1.24
// stable: v1.27
//
// Enables GRPC probe method for {Liveness,Readiness,Startup}Probe.
GRPCContainerProbe featuregate.Feature = "GRPCContainerProbe"
@ -934,7 +935,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
ExperimentalHostUserNamespaceDefaultingGate: {Default: false, PreRelease: featuregate.Beta},
GRPCContainerProbe: {Default: true, PreRelease: featuregate.Beta},
GRPCContainerProbe: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, //remove in 1.29
GracefulNodeShutdown: {Default: true, PreRelease: featuregate.Beta},

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

@ -24174,7 +24174,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 a beta field and requires enabling GRPCContainerProbe feature gate.",
Description: "GRPC specifies an action involving a GRPC port.",
Ref: ref("k8s.io/api/core/v1.GRPCAction"),
},
},
@ -24255,7 +24255,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 a beta field and requires enabling GRPCContainerProbe feature gate.",
Description: "GRPC specifies an action involving a GRPC port.",
Ref: ref("k8s.io/api/core/v1.GRPCAction"),
},
},

4
pkg/kubelet/prober/prober.go
View File

@ -23,9 +23,7 @@ import (
"time"
v1 "k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/tools/record"
kubefeatures "k8s.io/kubernetes/pkg/features"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/prober/results"
@ -170,7 +168,7 @@ func (pb *prober) runProbe(ctx context.Context, probeType probeType, p *v1.Probe
return pb.tcp.Probe(host, port, timeout)
}
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.GRPCContainerProbe) && p.GRPC != nil {
if p.GRPC != nil {
host := status.PodIP
service := ""
if p.GRPC.Service != nil {

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

@ -4170,8 +4170,6 @@ message ProbeHandler {
optional TCPSocketAction tcpSocket = 3;
// GRPC specifies an action involving a GRPC port.
// 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

@ -2548,8 +2548,6 @@ type ProbeHandler struct {
TCPSocket *TCPSocketAction `json:"tcpSocket,omitempty" protobuf:"bytes,3,opt,name=tcpSocket"`
// GRPC specifies an action involving a GRPC port.
// 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

@ -1856,7 +1856,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 a beta field and requires enabling GRPCContainerProbe feature gate.",
"grpc": "GRPC specifies an action involving a GRPC port.",
}
func (ProbeHandler) SwaggerDoc() map[string]string {