Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backend update probes #2703

Merged
merged 8 commits into from
Jul 7, 2023
Merged

Backend update probes #2703

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6850c12
Adding proto method
fran2344 Jun 23, 2023
3285cff
Adding backend configuration
fran2344 Jun 23, 2023
99ff216
Adding testing method
fran2344 Jun 23, 2023
1dbce7f
Adding handler validation
fran2344 Jun 23, 2023
6dc8656
Adding testing to updateContainerProbes
fran2344 Jun 26, 2023
0fa21b6
Adding testing for each handler and include the processObjProbe method
fran2344 Jun 28, 2023
a97956e
Adding link configuration changes
fran2344 Jun 28, 2023
1ef42b0
update deployment structure
fran2344 Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
176 changes: 176 additions & 0 deletions backend/service/k8s/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,62 @@ func ProtoForDeployment(cluster string, deployment *appsv1.Deployment) *k8sapiv1
return k8sDeployment
}

func processObjProbe(objProbe *v1.Probe) *k8sapiv1.Probe {
HandlerObj := &k8sapiv1.Probe{}

if objProbe.ProbeHandler.HTTPGet != nil {
ObjProbeHTTPHeaders := make([]*k8sapiv1.HTTPHeader, 0, len(objProbe.ProbeHandler.HTTPGet.HTTPHeaders))
for _, value := range objProbe.ProbeHandler.HTTPGet.HTTPHeaders {
UniqueLivenessHeader := &k8sapiv1.HTTPHeader{
Name: &value.Name,
Value: &value.Value,
}
ObjProbeHTTPHeaders = append(ObjProbeHTTPHeaders, UniqueLivenessHeader)
}

ObjProbeHTTPObject := &k8sapiv1.HTTPGetAction{
Path: objProbe.ProbeHandler.HTTPGet.Path,
Port: objProbe.ProbeHandler.HTTPGet.Port.IntVal,
Host: objProbe.ProbeHandler.HTTPGet.Host,
Scheme: string(objProbe.ProbeHandler.HTTPGet.Scheme),
HttpHeaders: ObjProbeHTTPHeaders,
}
HandlerObj.Handler = &k8sapiv1.Probe_HttpGet{
HttpGet: ObjProbeHTTPObject,
}
}

if objProbe.ProbeHandler.Exec != nil {
ObjProbeExec := &k8sapiv1.ExecAction{
Command: objProbe.ProbeHandler.Exec.Command,
}
HandlerObj.Handler = &k8sapiv1.Probe_Exec{
Exec: ObjProbeExec,
}
}

if objProbe.ProbeHandler.TCPSocket != nil {
ObjProbeTCPSocket := &k8sapiv1.TCPSocketAction{
Port: objProbe.ProbeHandler.TCPSocket.Port.IntVal,
Host: objProbe.ProbeHandler.TCPSocket.Host,
}
HandlerObj.Handler = &k8sapiv1.Probe_TcpSocket{
TcpSocket: ObjProbeTCPSocket,
}
}

if objProbe.ProbeHandler.GRPC != nil {
ObjProbeGRPC := &k8sapiv1.GRPCAction{
Port: objProbe.ProbeHandler.GRPC.Port,
Service: *objProbe.ProbeHandler.GRPC.Service,
}
HandlerObj.Handler = &k8sapiv1.Probe_Grpc{
Grpc: ObjProbeGRPC,
}
}
return HandlerObj
}

func ProtoForDeploymentSpec(deploymentSpec appsv1.DeploymentSpec) *k8sapiv1.Deployment_DeploymentSpec {
deploymentContainers := make([]*k8sapiv1.Deployment_DeploymentSpec_PodTemplateSpec_PodSpec_Container, 0, len(deploymentSpec.Template.Spec.Containers))
for _, container := range deploymentSpec.Template.Spec.Containers {
Expand All @@ -101,12 +157,44 @@ func ProtoForDeploymentSpec(deploymentSpec appsv1.DeploymentSpec) *k8sapiv1.Depl
resourceRequests[string(res)] = quantity.String()
}

LivenessProbeObject := &k8sapiv1.Probe{}
ReadinessProbeObject := &k8sapiv1.Probe{}
fran2344 marked this conversation as resolved.
Show resolved Hide resolved
if container.LivenessProbe != nil {
HandlerObj := processObjProbe(container.LivenessProbe)

LivenessProbeObject = &k8sapiv1.Probe{
InitialDelaySeconds: &container.LivenessProbe.InitialDelaySeconds,
TimeoutSeconds: &container.LivenessProbe.TimeoutSeconds,
PeriodSeconds: &container.LivenessProbe.PeriodSeconds,
SuccessThreshold: &container.LivenessProbe.SuccessThreshold,
FailureThreshold: &container.LivenessProbe.FailureThreshold,
TerminationGracePeriodSeconds: container.LivenessProbe.TerminationGracePeriodSeconds,
Handler: HandlerObj.Handler,
}
}

if container.ReadinessProbe != nil {
HandlerObj := processObjProbe(container.ReadinessProbe)

ReadinessProbeObject = &k8sapiv1.Probe{
InitialDelaySeconds: &container.ReadinessProbe.InitialDelaySeconds,
TimeoutSeconds: &container.ReadinessProbe.TimeoutSeconds,
PeriodSeconds: &container.ReadinessProbe.PeriodSeconds,
SuccessThreshold: &container.ReadinessProbe.SuccessThreshold,
FailureThreshold: &container.ReadinessProbe.FailureThreshold,
TerminationGracePeriodSeconds: container.ReadinessProbe.TerminationGracePeriodSeconds,
Handler: HandlerObj.Handler,
}
}

newContainer := &k8sapiv1.Deployment_DeploymentSpec_PodTemplateSpec_PodSpec_Container{
Name: container.Name,
Resources: &k8sapiv1.Deployment_DeploymentSpec_PodTemplateSpec_PodSpec_Container_ResourceRequirements{
Limits: resourceLimits,
Requests: resourceRequests,
},
LivenessProbe: LivenessProbeObject,
ReadinessProbe: ReadinessProbeObject,
}
deploymentContainers = append(deploymentContainers, newContainer)
}
Expand Down Expand Up @@ -179,6 +267,10 @@ func (s *svc) UpdateDeployment(ctx context.Context, clientset, cluster, namespac
return err
}

if err := updateContainerProbes(newDeployment, fields); err != nil {
return err
}

patchBytes, err := GenerateStrategicPatch(oldDeployment, newDeployment, appsv1.Deployment{})
if err != nil {
return err
Expand Down Expand Up @@ -236,3 +328,87 @@ func updateContainerResources(deployment *appsv1.Deployment, fields *k8sapiv1.Up
}
return nil
}

func setOptionalInt64Value(source *int64, target *int64) {
if source != nil {
*target = *source
}
}

func setOptionalValue(source *int32, target *int32) {
if source != nil {
*target = *source
}
}

func updateContainerProbes(deployment *appsv1.Deployment, fields *k8sapiv1.UpdateDeploymentRequest_Fields) error {
fran2344 marked this conversation as resolved.
Show resolved Hide resolved
for _, containerProbes := range fields.ContainerProbes {
for _, container := range deployment.Spec.Template.Spec.Containers {
if container.Name == containerProbes.ContainerName {
if containerProbes.LivenessProbe != nil {
resourceProbe := containerProbes.LivenessProbe
setOptionalValue(resourceProbe.InitialDelaySeconds, &container.LivenessProbe.InitialDelaySeconds)
setOptionalValue(resourceProbe.PeriodSeconds, &container.LivenessProbe.PeriodSeconds)
setOptionalValue(resourceProbe.TimeoutSeconds, &container.LivenessProbe.TimeoutSeconds)
setOptionalValue(resourceProbe.SuccessThreshold, &container.LivenessProbe.SuccessThreshold)
setOptionalValue(resourceProbe.FailureThreshold, &container.LivenessProbe.FailureThreshold)
setOptionalInt64Value(resourceProbe.TerminationGracePeriodSeconds, container.LivenessProbe.TerminationGracePeriodSeconds)
if handler := resourceProbe.Handler; handler != nil {
switch resourceProbe.Handler.(type) {
case *k8sapiv1.Probe_Exec:
container.LivenessProbe.ProbeHandler.Exec.Command = resourceProbe.GetExec().Command
case *k8sapiv1.Probe_Grpc:
container.LivenessProbe.ProbeHandler.GRPC.Port = resourceProbe.GetGrpc().Port
container.LivenessProbe.ProbeHandler.GRPC.Service = &resourceProbe.GetGrpc().Service
case *k8sapiv1.Probe_TcpSocket:
container.LivenessProbe.ProbeHandler.TCPSocket.Port.IntVal = resourceProbe.GetTcpSocket().Port
container.LivenessProbe.ProbeHandler.TCPSocket.Host = resourceProbe.GetTcpSocket().Host
case *k8sapiv1.Probe_HttpGet:
container.LivenessProbe.ProbeHandler.HTTPGet.Host = resourceProbe.GetHttpGet().Host
container.LivenessProbe.ProbeHandler.HTTPGet.Path = resourceProbe.GetHttpGet().Path
container.LivenessProbe.ProbeHandler.HTTPGet.Port.IntVal = resourceProbe.GetHttpGet().Port
container.LivenessProbe.ProbeHandler.HTTPGet.Scheme = (v1.URIScheme)(resourceProbe.GetHttpGet().Scheme)
LivenessProbeHTTPHeaders := make([]v1.HTTPHeader, 0, len(resourceProbe.GetHttpGet().HttpHeaders))
for _, value := range resourceProbe.GetHttpGet().HttpHeaders {
UniqueLivenessHeader := v1.HTTPHeader{
Name: *value.Name,
Value: *value.Value,
}
LivenessProbeHTTPHeaders = append(LivenessProbeHTTPHeaders, UniqueLivenessHeader)
}
container.LivenessProbe.ProbeHandler.HTTPGet.HTTPHeaders = LivenessProbeHTTPHeaders
}
}
}
if containerProbes.ReadinessProbe == nil {
return nil
}
resourceReadinessProbe := containerProbes.ReadinessProbe
setOptionalValue(resourceReadinessProbe.InitialDelaySeconds, &container.ReadinessProbe.InitialDelaySeconds)
setOptionalValue(resourceReadinessProbe.PeriodSeconds, &container.ReadinessProbe.PeriodSeconds)
setOptionalValue(resourceReadinessProbe.TimeoutSeconds, &container.ReadinessProbe.TimeoutSeconds)
setOptionalValue(resourceReadinessProbe.SuccessThreshold, &container.ReadinessProbe.SuccessThreshold)
setOptionalValue(resourceReadinessProbe.FailureThreshold, &container.ReadinessProbe.FailureThreshold)
setOptionalInt64Value(resourceReadinessProbe.TerminationGracePeriodSeconds, container.ReadinessProbe.TerminationGracePeriodSeconds)
if handler := resourceReadinessProbe.Handler; handler != nil {
switch resourceReadinessProbe.Handler.(type) {
case *k8sapiv1.Probe_Exec:
container.ReadinessProbe.ProbeHandler.Exec.Command = resourceReadinessProbe.GetExec().Command
case *k8sapiv1.Probe_Grpc:
container.ReadinessProbe.ProbeHandler.GRPC.Port = resourceReadinessProbe.GetGrpc().Port
container.ReadinessProbe.ProbeHandler.GRPC.Service = &resourceReadinessProbe.GetGrpc().Service
case *k8sapiv1.Probe_TcpSocket:
container.ReadinessProbe.ProbeHandler.TCPSocket.Port.IntVal = resourceReadinessProbe.GetTcpSocket().Port
container.ReadinessProbe.ProbeHandler.TCPSocket.Host = resourceReadinessProbe.GetTcpSocket().Host
case *k8sapiv1.Probe_HttpGet:
container.ReadinessProbe.ProbeHandler.HTTPGet.Host = resourceReadinessProbe.GetHttpGet().Host
container.ReadinessProbe.ProbeHandler.HTTPGet.Path = resourceReadinessProbe.GetHttpGet().Path
container.ReadinessProbe.ProbeHandler.HTTPGet.Port.IntVal = resourceReadinessProbe.GetHttpGet().Port
container.ReadinessProbe.ProbeHandler.HTTPGet.Scheme = (v1.URIScheme)(resourceReadinessProbe.GetHttpGet().Scheme)
}
}
}
}
}
return nil
}
Loading