Skip to content

Commit 33b7cb4

Browse files
authored
Merge branch 'main' into 192-application
2 parents 8c2d050 + 3f3c256 commit 33b7cb4

File tree

17 files changed

+584
-1245
lines changed

17 files changed

+584
-1245
lines changed

.github/actions/setup-ci-env/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ runs:
7878
- name: Install Helm
7979
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8080
with:
81-
version: 'latest'
81+
version: 'v3.14.4'
8282

8383
- name: Cache Helm plugins
8484
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
- name: Install helm
8686
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8787
with:
88-
version: 'latest'
88+
version: 'v3.14.4'
8989

9090
- name: Configure Helm for GitHub Packages
9191
run: |

distros/kubernetes/nvsentinel/charts/csp-health-monitor/templates/deployment.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ spec:
5555
- name: {{ .Chart.Name }}
5656
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default ((.Values.global).image).tag | default .Chart.AppVersion }}"
5757
imagePullPolicy: {{ .Values.image.pullPolicy }}
58-
command: ["/app/csp-health-monitor"]
5958
args:
6059
- "--config=/etc/config/config.toml"
6160
- "--metrics-port={{ ((.Values.global).metricsPort) | default 2112 }}"
@@ -81,11 +80,10 @@ spec:
8180
optional: true
8281

8382
- name: maintenance-notifier
84-
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default ((.Values.global).image).tag | default .Chart.AppVersion }}"
85-
imagePullPolicy: {{ .Values.image.pullPolicy }}
83+
image: "{{ .Values.quarantineTriggerEngine.image.repository }}:{{ .Values.image.tag | default ((.Values.global).image).tag | default .Chart.AppVersion }}"
84+
imagePullPolicy: {{ .Values.quarantineTriggerEngine.image.pullPolicy | default .Values.image.pullPolicy }}
8685
securityContext:
8786
runAsUser: 0
88-
command: ["/app/maintenance-notifier"]
8987
args:
9088
- "--config=/etc/config/config.toml"
9189
- "--mongo-client-cert-mount-path=/etc/ssl/mongo-client"

distros/kubernetes/nvsentinel/charts/csp-health-monitor/templates/serviceaccount.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ metadata:
2323
iam.gke.io/gcp-service-account: {{ .Values.configToml.gcp.gcpServiceAccountName }}@{{ .Values.configToml.gcp.targetProjectId }}.iam.gserviceaccount.com
2424
{{- end }}
2525
{{- if and (eq .Values.cspName "aws") .Values.configToml.aws .Values.configToml.aws.accountId .Values.configToml.clusterName }}
26-
eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.configToml.aws.accountId }}:role/{{ .Values.configToml.clusterName }}-health-monitor
26+
eks.amazonaws.com/role-arn: arn:aws:iam::{{ .Values.configToml.aws.accountId }}:role/{{ .Values.configToml.clusterName }}-nvsentinel-health-monitor-assume-role-policy
2727
{{- end }}
28-
{{- end }}
28+
{{- end }}

distros/kubernetes/nvsentinel/charts/csp-health-monitor/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ resources:
2929

3030
# Configuration for the Quarantine Trigger Engine sidecar
3131
quarantineTriggerEngine:
32+
image:
33+
repository: ghcr.io/nvidia/nvsentinel/maintenance-notifier
34+
pullPolicy: IfNotPresent
3235
resources:
3336
limits:
3437
cpu: "500m"

0 commit comments

Comments
 (0)