Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -498,5 +498,6 @@ Common Zookeeper chart related resources labels
{{- define "zookeeper.defaultLabels" -}}
app.kubernetes.io/version: '{{ .Values.ARTIFACT_DESCRIPTOR_VERSION | trunc 63 | trimAll "-_." }}'
app.kubernetes.io/component: 'backend'
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/part-of: '{{ .Values.PART_OF }}'
{{- end -}}
{{- end -}}
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,26 @@ spec:
memory: {{ default "128Mi" .Values.operator.resources.requests.memory }}
securityContext:
{{- include "zookeeper-service.globalContainerSecurityContext" . | nindent 12 }}
livenessProbe:
httpGet:
path: /healthz
port: 8081
scheme: HTTP
initialDelaySeconds: 30
timeoutSeconds: 5
periodSeconds: 15
successThreshold: 1
failureThreshold: 5
readinessProbe:
httpGet:
path: /readyz
port: 8081
scheme: HTTP
initialDelaySeconds: 40
timeoutSeconds: 15
periodSeconds: 15
successThreshold: 1
failureThreshold: 5
{{- if .Values.operator.affinity }}
affinity:
{{ .Values.operator.affinity | toJson }}
Expand All @@ -68,4 +88,4 @@ spec:
{{- include "zookeeper-service.globalPodSecurityContext" . | nindent 8 }}
{{- with .Values.operator.securityContext }}
{{- toYaml . | nindent 8 -}}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ spec:
periodSeconds: 20
successThreshold: 1
failureThreshold: 5
livenessProbe:
tcpSocket:
port: 8080
initialDelaySeconds: 20
timeoutSeconds: 5
periodSeconds: 20
successThreshold: 1
failureThreshold: 5
volumes:
- name: output
emptyDir: {}
Expand Down
27 changes: 27 additions & 0 deletions operator/controllers/provider/monitoring_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
"strconv"
)

Expand Down Expand Up @@ -178,6 +179,8 @@ func (mrp MonitoringResourceProvider) NewMonitoringDeployment() *appsv1.Deployme
Command: mrp.getCommand(),
Args: mrp.getArgs(),
SecurityContext: getDefaultContainerSecurityContext(),
LivenessProbe: mrp.getLivenessProbe(),
ReadinessProbe: mrp.getReadinessProbe(),
},
},
SecurityContext: &mrp.spec.SecurityContext,
Expand Down Expand Up @@ -340,3 +343,27 @@ func (mrp MonitoringResourceProvider) GetMonitoringCustomLabels(monitoringLabels
func (mrp MonitoringResourceProvider) GetServiceAccountName() string {
return mrp.GetServiceName()
}

func (mrp MonitoringResourceProvider) getLivenessProbe() *corev1.Probe {
probe := mrp.getProbe()
probe.Handler = corev1.Handler{
TCPSocket: &corev1.TCPSocketAction{
Port: intstr.FromInt(8096),
},
}
return probe
}

func (mrp MonitoringResourceProvider) getReadinessProbe() *corev1.Probe {
return mrp.getLivenessProbe()
}

func (mrp MonitoringResourceProvider) getProbe() *corev1.Probe {
return &corev1.Probe{
InitialDelaySeconds: 30,
TimeoutSeconds: 5,
PeriodSeconds: 10,
SuccessThreshold: 1,
FailureThreshold: 5,
}
}
Loading