Skip to content

Commit e16a5d1

Browse files
authored
fix: enable audit logging in janitor-provider (#1074) (#1075)
1 parent e74f996 commit e16a5d1

File tree

2 files changed

+36
-3
lines changed

2 files changed

+36
-3
lines changed

distros/kubernetes/nvsentinel/charts/janitor-provider/templates/deployment.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ spec:
4444
{{- toYaml . | nindent 8 }}
4545
{{- end }}
4646
serviceAccountName: {{ include "provider.serviceAccountName" . }}
47+
{{- if .Values.global.auditLogging.enabled }}
48+
securityContext:
49+
fsGroup: 65532
50+
{{- end }}
51+
{{- if .Values.global.auditLogging.enabled }}
52+
initContainers:
53+
{{- include "nvsentinel.auditLogging.initContainer" . | nindent 8 }}
54+
{{- end }}
4755
containers:
4856
- name: janitor-provider
4957
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default ((.Values.global).image).tag | default .Chart.AppVersion }}"
@@ -56,8 +64,15 @@ spec:
5664
- name: service
5765
containerPort: {{ .Values.service.port | default "50051" }}
5866
env:
67+
- name: POD_NAME
68+
valueFrom:
69+
fieldRef:
70+
fieldPath: metadata.name
5971
- name: JANITOR_PROVIDER_PORT
6072
value: {{ .Values.service.port | default 50051 | quote }}
73+
{{- if .Values.global.auditLogging.enabled }}
74+
{{- include "nvsentinel.auditLogging.envVars" . | nindent 12 }}
75+
{{- end }}
6176
- name: METRICS_PORT
6277
value: {{ ((.Values.global).metricsPort) | default 2112 | quote }}
6378
# Cloud Service Provider configuration
@@ -165,8 +180,11 @@ spec:
165180
{{- end }}
166181
readinessProbe:
167182
{{- toYaml .Values.readinessProbe | nindent 12 }}
168-
{{- if or .Values.tls.enabled (and (eq (.Values.csp.provider | default "kind") "nebius") .Values.csp.nebius.serviceAccountKeySecret) }}
183+
{{- if or .Values.global.auditLogging.enabled .Values.tls.enabled (and (eq (.Values.csp.provider | default "kind") "nebius") .Values.csp.nebius.serviceAccountKeySecret) }}
169184
volumeMounts:
185+
{{- if .Values.global.auditLogging.enabled }}
186+
{{- include "nvsentinel.auditLogging.volumeMount" . | nindent 12 }}
187+
{{- end }}
170188
{{- if .Values.tls.enabled }}
171189
- name: tls-cert
172190
mountPath: {{ .Values.tls.certDir }}
@@ -178,8 +196,11 @@ spec:
178196
readOnly: true
179197
{{- end }}
180198
{{- end }}
181-
{{- if or .Values.tls.enabled (and (eq (.Values.csp.provider | default "kind") "nebius") .Values.csp.nebius.serviceAccountKeySecret) }}
199+
{{- if or .Values.global.auditLogging.enabled .Values.tls.enabled (and (eq (.Values.csp.provider | default "kind") "nebius") .Values.csp.nebius.serviceAccountKeySecret) }}
182200
volumes:
201+
{{- if .Values.global.auditLogging.enabled }}
202+
{{- include "nvsentinel.auditLogging.volume" . | nindent 8 }}
203+
{{- end }}
183204
{{- if .Values.tls.enabled }}
184205
- name: tls-cert
185206
secret:

janitor-provider/main.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import (
4040
"sigs.k8s.io/controller-runtime/pkg/certwatcher"
4141

4242
cspv1alpha1 "github.com/nvidia/nvsentinel/api/gen/go/csp/v1alpha1"
43+
"github.com/nvidia/nvsentinel/commons/pkg/auditlogger"
4344
"github.com/nvidia/nvsentinel/commons/pkg/logger"
4445
"github.com/nvidia/nvsentinel/commons/pkg/server"
4546
"github.com/nvidia/nvsentinel/janitor-provider/pkg/auth"
@@ -121,13 +122,24 @@ func (s *janitorProviderServer) SendTerminateSignal(
121122
}
122123

123124
func main() {
125+
os.Exit(realMain())
126+
}
127+
128+
func realMain() int {
124129
logger.SetDefaultStructuredLogger("janitor-provider", version)
125130
slog.Info("Starting janitor-provider", "version", version, "commit", commit, "date", date)
126131

132+
if err := auditlogger.InitAuditLogger("janitor-provider"); err != nil {
133+
slog.Warn("Failed to initialize audit logger", "error", err)
134+
}
135+
defer auditlogger.CloseAuditLogger() //nolint:errcheck
136+
127137
if err := run(); err != nil {
128138
slog.Error("Failed to run", "error", err)
129-
os.Exit(1)
139+
return 1
130140
}
141+
142+
return 0
131143
}
132144

133145
func run() error {

0 commit comments

Comments
 (0)