chore: label cron jobs so they can be matched across different enviro… (

#142) * chore: label cron jobs so they can be matched across different environments * fix: slog for destroy handler
dhis2-sre · Sep 29, 2024 · 6b2c9e9 · 6b2c9e9
1 parent f60528b
commit 6b2c9e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/helm/chart/templates/cronjob.yaml b/helm/chart/templates/cronjob.yaml
@@ -16,6 +16,9 @@ spec:
  {{- include "im-inspector.selectorLabels" . | nindent 8 }}
  spec:
  template:
+ metadata:
+ labels:
+ {{- include "im-inspector.selectorLabels" . | nindent 12 }}
  spec:
  {{- with .Values.imagePullSecrets }}
  imagePullSecrets:

diff --git a/pkg/pod/ttlDestroyHandler.go b/pkg/pod/ttlDestroyHandler.go
@@ -36,9 +36,9 @@ func (t ttlDestroyHandler) Supports() string {
 
 func (t ttlDestroyHandler) Handle(pod v1.Pod) error {
  correlationID := uuid.NewString()
- t.logger = t.logger.With("correlationId", correlationID)
+ logger := t.logger.With("correlationId", correlationID)
 
- t.logger.Info("TTL handler invoked", "pod", pod.Name)
+ logger.Info("TTL handler invoked", "pod", pod.Name)
 
  creationTimestampLabel := pod.Labels["im-creation-timestamp"]
  if creationTimestampLabel == "" {
@@ -47,7 +47,7 @@ func (t ttlDestroyHandler) Handle(pod v1.Pod) error {
 
  ttlLabel := pod.Labels["im-ttl"]
  if ttlLabel == "" {
- t.logger.Info(`No TTL label "im-ttl" found`)
+ logger.Info(`No TTL label "im-ttl" found`)
  return nil
  }
 
@@ -72,7 +72,7 @@ func (t ttlDestroyHandler) Handle(pod v1.Pod) error {
  if err != nil {
  return err
  }
- t.logger.Info("TTL destroyed", "pod", pod.Name, "namespace", pod.Namespace, "correlationId", correlationID)
+ logger.Info("TTL destroyed", "pod", pod.Name, "namespace", pod.Namespace, "correlationId", correlationID)
  }
 
  return nil