Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/taginfo/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ process_data() {
./update_all.sh $DATADIR
mv $DATADIR/*.db $DATADIR/
mv $DATADIR/*/*.db $DATADIR/
# if BUCKET_NAME is set upload data
if ! aws s3 ls "s3://$BUCKET_NAME/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
# if AWS_S3_BUCKET is set upload data
if ! aws s3 ls "s3://$AWS_S3_BUCKET/$ENVIRONMENT" 2>&1 | grep -q 'An error occurred'; then
aws s3 sync $DATADIR/ s3://$AWS_S3_BUCKET/$ENVIRONMENT/ --exclude "*" --include "*.db"
fi
}
Expand Down
17 changes: 14 additions & 3 deletions osm-seed/templates/taginfo/taginfo-cronJob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
spec:
template:
spec:
serviceAccountName: {{ .Values.taginfo.serviceAccount.name }}
containers:
- name: {{ .Release.Name }}-taginfo-job
image: "{{ .Values.taginfo.image.name }}:{{ .Values.taginfo.image.tag }}"
Expand All @@ -41,9 +42,19 @@ spec:
cpu: {{ .Values.taginfo.cronjob.resources.limits.cpu }}
{{- end }}
restartPolicy: Never
{{- if .Values.taginfo.cronjob.nodeSelector.enabled }}
nodeSelector:
{{ .Values.taginfo.cronjob.nodeSelector.label_key }}: {{ .Values.taginfo.cronjob.nodeSelector.label_value }}
# Affinity settings
{{- if .Values.taginfo.cronjob.nodeAffinity.enabled }}
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: {{ .Values.taginfo.cronjob.nodeAffinity.key }}
operator: In
values:
{{- range .Values.taginfo.cronjob.nodeAffinity.values }}
- {{ . | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
4 changes: 4 additions & 0 deletions osm-seed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,10 @@ taginfo:
limits:
memory: "14Gi"
cpu: "3800m"
nodeAffinity:
enabled: false
key: "nodegroup_type"
values: ["job"]
nodeSelector:
enabled: false
label_key: nodegroup_type
Expand Down
Loading