-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into artifacts
- Loading branch information
Showing
17 changed files
with
353 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| { | ||
| "stack": "2.5.3", | ||
| "stack": "2.6.0", | ||
| "argus-config": "1.2.3" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
|
|
||
| include ./common.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
|
|
||
| .PHONY: test | ||
| test: | ||
| @for i in $$(find . -type d); do \ | ||
| if [ -e "$$i/Chart.yaml" ]; then \ | ||
| helm unittest $$i; \ | ||
| fi; \ | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
|
|
||
| include ../common.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,179 @@ | ||
| {{ $global := . }} | ||
| {{ range $jobName, $jobValues := .Values.jobs }} | ||
| {{- $globalValuesDict := $global.Values.global | toYaml -}} | ||
| {{- $values := fromYaml $globalValuesDict -}} | ||
| {{- $values = set $values "name" $jobName -}} | ||
| {{- $values := mergeOverwrite $values $jobValues -}} | ||
| {{- $job := dict "Chart" $global.Chart "Release" $global.Release "Capabilities" $global.Capabilities "Values" $values -}} | ||
| {{- with $job -}} | ||
| --- | ||
| apiVersion: batch/v1 | ||
| kind: Job | ||
| metadata: | ||
| name: {{ include "service.fullname" . }} | ||
| labels: | ||
| {{- include "service.labels" . | nindent 4 }} | ||
| annotations: | ||
| {{- toYaml (mergeOverwrite | ||
| (dict) | ||
| (fromYaml (include "stack.annotations" $job )) | ||
| ) | nindent 4 }} | ||
| spec: | ||
| {{- if .Values.activeDeadlineSeconds }} | ||
| activeDeadlineSeconds: {{ .Values.activeDeadlineSeconds }} | ||
| {{- end }} | ||
| {{- if .Values.ttlSecondsAfterFinished }} | ||
| ttlSecondsAfterFinished: {{ .Values.ttlSecondsAfterFinished }} | ||
| {{- end }} | ||
| {{- if .Values.backoffLimit }} | ||
| backoffLimit: {{ .Values.backoffLimit }} | ||
| {{- end }} | ||
| {{- if .Values.completions }} | ||
| completions: {{ .Values.completions }} | ||
| {{- end }} | ||
| {{- if .Values.parallelism }} | ||
| parallelism: {{ .Values.parallelism }} | ||
| {{- end }} | ||
| template: | ||
| metadata: | ||
| {{- with mergeOverwrite .Values.podAnnotations (dict "linkerd.io/inject" "disabled") }} | ||
| annotations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| labels: | ||
| {{- include "service.labels" . | nindent 8 }} | ||
| {{- with .Values.podLabels }} | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| spec: | ||
| {{- with .Values.imagePullSecrets }} | ||
| imagePullSecrets: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| serviceAccountName: {{ include "service.serviceAccountName" . }} | ||
| securityContext: | ||
| {{- toYaml .Values.podSecurityContext | nindent 8 }} | ||
| shareProcessNamespace: {{ .Values.shareProcessNamespace }} | ||
| containers: | ||
| - name: {{ .Chart.Name }} | ||
| securityContext: | ||
| {{- toYaml .Values.securityContext | nindent 12 }} | ||
| image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" | ||
| imagePullPolicy: {{ .Values.image.pullPolicy }} | ||
| {{- if and .Values.args (ne (len .Values.args) 0) }} | ||
| args: | ||
| {{- toYaml .Values.args | nindent 12 }} | ||
| {{- end }} | ||
| {{- if and .Values.command (ne (len .Values.command) 0) }} | ||
| command: | ||
| {{- toYaml .Values.command | nindent 12 }} | ||
| {{- end }} | ||
| ports: | ||
| - name: http | ||
| containerPort: {{ .Values.service.port }} | ||
| protocol: TCP | ||
| livenessProbe: | ||
| {{- include "container.probe" .Values.livenessProbe | nindent 12 }} | ||
| readinessProbe: | ||
| {{- include "container.probe" .Values.readinessProbe | nindent 12 }} | ||
| {{- if eq .Values.startupProbe.enabled true }} | ||
| startupProbe: | ||
| {{- include "container.probe" (omit .Values.startupProbe "enabled") | nindent 12 }} | ||
| {{- end }} | ||
| resources: | ||
| {{- toYaml .Values.resources | nindent 12 }} | ||
| {{- if or (and .Values.persistence.enabled .Values.persistence.mountPath) .Values.volumeMounts}} | ||
| volumeMounts: | ||
| {{- if and .Values.persistence.enabled .Values.persistence.mountPath }} | ||
| - name: data | ||
| mountPath: {{ .Values.persistence.mountPath }} | ||
| {{- end }} | ||
| {{- if .Values.volumeMounts }} | ||
| {{- toYaml .Values.volumeMounts | nindent 12 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- include "service.configuration" . | nindent 10}} | ||
| {{- include "service.nonsensitiveEnvVars" (list $global.Values.global .Values) | nindent 10 }} | ||
| {{- range $i, $container := .Values.sidecars }} | ||
| {{- $imageDict := fromYaml (include "image" $container) }} | ||
| {{- $container = mergeOverwrite $container $imageDict }} | ||
| {{- with omit $container "envFrom" "env" }} | ||
| - {{- toYaml . | nindent 10 }} | ||
| {{- include "service.configuration" $job | nindent 10}} | ||
| {{- end }} | ||
| {{- include "service.nonsensitiveEnvVars" (list $global.Values.global $job.Values $container) | nindent 10 }} | ||
| {{- end }} | ||
| initContainers: | ||
| {{- range $i, $container := .Values.initContainers }} | ||
| {{- $imageDict := fromYaml (include "image" $container) }} | ||
| {{- $container = mergeOverwrite $container $imageDict }} | ||
| {{- with omit $container "envFrom" "env" }} | ||
| - {{- toYaml . | nindent 10 }} | ||
| {{- include "service.configuration" $job | nindent 10}} | ||
| {{- end }} | ||
| {{- include "service.nonsensitiveEnvVars" (list $global.Values.global $job.Values $container) | nindent 10 }} | ||
| {{- end }} | ||
| dnsPolicy: {{ .Values.dnsPolicy }} | ||
| {{- if eq .Values.restartPolicy "Always" }} | ||
| restartPolicy: OnFailure | ||
| {{- else }} | ||
| restartPolicy: {{ .Values.restartPolicy }} | ||
| {{- end }} | ||
| {{- if or .Values.persistence.enabled .Values.volumes}} | ||
| volumes: | ||
| {{- if .Values.persistence.enabled }} | ||
| - name: data | ||
| persistentVolumeClaim: | ||
| claimName: {{ include "service.claimName" . }} | ||
| {{- end }} | ||
| {{- if .Values.volumes }} | ||
| {{- toYaml .Values.volumes | nindent 8 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- with .Values.nodeSelector }} | ||
| nodeSelector: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- with .Values.affinity }} | ||
| affinity: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- if .Values.topologySpreadConstraints }} | ||
| {{- with .Values.topologySpreadConstraints }} | ||
| topologySpreadConstraints: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| {{- else }} | ||
| topologySpreadConstraints: | ||
| - maxSkew: 2 | ||
| topologyKey: topology.kubernetes.io/zone | ||
| whenUnsatisfiable: ScheduleAnyway | ||
| labelSelector: | ||
| matchLabels: | ||
| {{- include "service.selectorLabels" . | nindent 14 }} | ||
| {{- end }} | ||
| {{- with .Values.tolerations }} | ||
| tolerations: | ||
| {{- toYaml . | nindent 8 }} | ||
| {{- end }} | ||
| --- | ||
| {{ if .Values.serviceAccount.create -}} | ||
| apiVersion: v1 | ||
| kind: ServiceAccount | ||
| metadata: | ||
| name: {{ include "service.serviceAccountName" . }} | ||
| labels: | ||
| {{- include "service.labels" . | nindent 4 }} | ||
| {{- with mergeOverwrite | ||
| (dict) | ||
| .Values.annotations | ||
| .Values.serviceAccount.annotations | ||
| }} | ||
| annotations: | ||
| {{- toYaml . | nindent 4 }} | ||
| {{- end }} | ||
| automountServiceAccountToken: {{ .Values.serviceAccount.automount }} | ||
| --- | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.