Skip to content

Commit

Permalink
chore: add image pull secrets to server tag job (#147)
Browse files Browse the repository at this point in the history
* chore: add image pull secrets to server tag job

* update tirvy ignores
  • Loading branch information
ravisingal committed Apr 24, 2024
1 parent 45c65a1 commit 52b5960
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@ CVE-2023-38647 exp:2024-06-30

# org.apache.avro:avro (from upstream opensource shaded dependency. will be taken care during upgrade.)
CVE-2023-39410 exp:2024-06-30

# org.apache.commons:commons-compress
CVE-2024-25710 exp:2024-06-30
CVE-2024-26308 exp:2024-06-30
5 changes: 2 additions & 3 deletions helm/templates/server/tags-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ spec:
spec:
restartPolicy: Never
serviceAccountName: {{ include "pinot.server.serviceAccountName" . }}
imagePullSecrets:
{{- toYaml .Values.imagePullSecrets | nindent 8 }}
containers:
- name: {{ include "pinot.server.fullname" . }}-tags
image: {{ .Values.server.tagJob.image.repository }}:{{ .Values.server.tagJob.image.tag }}
Expand All @@ -36,9 +38,6 @@ spec:
exit $code
}
trap finish EXIT
{{- if .Values.server.tagJobWaitforSideCar }}
until curl -s --head localhost:15000; do echo "$(date) waiting for sidecar"; sleep 3; done
{{- end }}
until [ "$(curl -s --head --connect-timeout 3 -o /dev/null -w '%{http_code}\n' 'http://{{ include "pinot.controller.fullname" . }}-svc:{{ int $.Values.controller.service.port }}/')" == "200" ]; do
echo "$(date) waiting for {{ include "pinot.controller.fullname" . }} service"
sleep 3
Expand Down
9 changes: 4 additions & 5 deletions helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ controller:
port: 7071
image:
repository: hypertrace/prometheus-jmx-exporter
tag: 0.1.5
tag: 0.1.6
pullPolicy: IfNotPresent
resources:
requests:
Expand Down Expand Up @@ -266,7 +266,7 @@ broker:
port: 7072
image:
repository: hypertrace/prometheus-jmx-exporter
tag: 0.1.5
tag: 0.1.6
pullPolicy: IfNotPresent
resources:
requests:
Expand Down Expand Up @@ -374,7 +374,7 @@ minion:
port: 7074
image:
repository: hypertrace/prometheus-jmx-exporter
tag: 0.1.5
tag: 0.1.6
pullPolicy: IfNotPresent
resources:
requests:
Expand Down Expand Up @@ -486,7 +486,7 @@ server:
port: 7073
image:
repository: hypertrace/prometheus-jmx-exporter
tag: 0.1.5
tag: 0.1.6
pullPolicy: IfNotPresent
resources:
requests:
Expand All @@ -511,7 +511,6 @@ server:
tier1: {}

tagJobEnabled: false
tagJobWaitforSideCar: true
tagJob:
image:
repository: curlimages/curl
Expand Down

0 comments on commit 52b5960

Please sign in to comment.