Skip to content

Commit

Permalink
Merge pull request #194 from uc-cdis/feat/usersync-fix
Browse files Browse the repository at this point in the history
adding a backoff limit to the usersync cron to avoid generating an endless amount of failing jobs
  • Loading branch information
EliseCastle23 authored Sep 9, 2024
2 parents f2207fb + a5dced9 commit 619ecba
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2024-09-06T15:19:06Z",
"generated_at": "2024-09-09T20:23:45Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -686,7 +686,7 @@
"hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
"is_secret": false,
"is_verified": false,
"line_number": 55,
"line_number": 54,
"type": "Secret Keyword"
},
{
Expand Down
2 changes: 1 addition & 1 deletion helm/fence/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.22
version: 0.1.23

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion helm/fence/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# fence

![Version: 0.1.22](https://img.shields.io/badge/Version-0.1.22-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
![Version: 0.1.23](https://img.shields.io/badge/Version-0.1.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)

A Helm chart for gen3 Fence

Expand Down
5 changes: 4 additions & 1 deletion helm/fence/templates/presigned-url-fence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ spec:
app: presigned-url-fence
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.metricsEnabled }}
{{- include "common.grafanaAnnotations" . | nindent 8 }}
{{- end }}
labels:
app: presigned-url-fence
spec:
Expand Down
4 changes: 4 additions & 0 deletions helm/fence/templates/usersync-cron.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,12 @@ metadata:
name: usersync
spec:
schedule: {{ .Values.usersync.schedule | quote }}
successfulJobsHistoryLimit: 3
failedJobsHistoryLimit: 1
concurrencyPolicy: Forbid
jobTemplate:
spec:
backoffLimit: 4
template:
metadata:
labels:
Expand Down
2 changes: 1 addition & 1 deletion helm/fence/templates/useryaml-job.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{{ if not .Values.usersync.usersync }}
kind: ConfigMap
apiVersion: v1
metadata:
name: useryaml
data:
useryaml: {{ .Values.USER_YAML | toYaml | nindent 4}}
---
{{ if not .Values.usersync.usersync }}
apiVersion: batch/v1
kind: Job
metadata:
Expand Down
10 changes: 5 additions & 5 deletions helm/gen3/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies:
repository: "file://../frontend-framework"
condition: frontend-framework.enabled
- name: fence
version: 0.1.22
version: 0.1.23
repository: "file://../fence"
condition: fence.enabled
- name: guppy
Expand Down Expand Up @@ -68,7 +68,7 @@ dependencies:
repository: "file://../pidgin"
condition: pidgin.enabled
- name: portal
version: 0.1.16
version: 0.1.17
repository: "file://../portal"
condition: portal.enabled
- name: requestor
Expand All @@ -84,11 +84,11 @@ dependencies:
repository: "file://../sheepdog"
condition: sheepdog.enabled
- name: ssjdispatcher
version: 0.1.10
version: 0.1.11
repository: "file://../ssjdispatcher"
condition: ssjdispatcher.enabled
- name: sower
version: 0.1.12
version: 0.1.13
condition: sower.enabled
repository: "file://../sower"
- name: wts
Expand Down Expand Up @@ -128,7 +128,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.41
version: 0.1.42

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
10 changes: 5 additions & 5 deletions helm/gen3/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# gen3

![Version: 0.1.41](https://img.shields.io/badge/Version-0.1.41-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
![Version: 0.1.42](https://img.shields.io/badge/Version-0.1.42-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)

Helm chart to deploy Gen3 Data Commons

Expand All @@ -25,7 +25,7 @@ Helm chart to deploy Gen3 Data Commons
| file://../aws-es-proxy | aws-es-proxy | 0.1.10 |
| file://../common | common | 0.1.14 |
| file://../etl | etl | 0.1.1 |
| file://../fence | fence | 0.1.22 |
| file://../fence | fence | 0.1.23 |
| file://../frontend-framework | frontend-framework | 0.1.3 |
| file://../guppy | guppy | 0.1.13 |
| file://../hatchery | hatchery | 0.1.10 |
Expand All @@ -35,12 +35,12 @@ Helm chart to deploy Gen3 Data Commons
| file://../neuvector | neuvector | 0.1.0 |
| file://../peregrine | peregrine | 0.1.14 |
| file://../pidgin | pidgin | 0.1.11 |
| file://../portal | portal | 0.1.16 |
| file://../portal | portal | 0.1.17 |
| file://../requestor | requestor | 0.1.12 |
| file://../revproxy | revproxy | 0.1.17 |
| file://../sheepdog | sheepdog | 0.1.15 |
| file://../sower | sower | 0.1.12 |
| file://../ssjdispatcher | ssjdispatcher | 0.1.10 |
| file://../sower | sower | 0.1.13 |
| file://../ssjdispatcher | ssjdispatcher | 0.1.11 |
| file://../wts | wts | 0.1.14 |
| https://charts.bitnami.com/bitnami | postgresql | 11.9.13 |
| https://helm.elastic.co | elasticsearch | 7.10.2 |
Expand Down
1 change: 0 additions & 1 deletion helm/gen3/templates/global-manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ data:
"tier_access_limit": {{ .Values.global.tierAccessLimit | quote }}
"netpolicy": {{ .Values.global.netPolicy | quote }}
"dispatcher_job_num": {{ .Values.global.dispatcherJobNum | quote }}
"dd_enabled": {{ .Values.global.ddEnabled | quote }}
"frontend_root": {{ .Values.global.frontendRoot | quote }}
{{- with .Values.global.origins_allow_credentials }}
"origins_allow_credentials": {{ . | toJson | quote }}
Expand Down
2 changes: 1 addition & 1 deletion helm/portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.16
version: 0.1.17

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion helm/portal/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# portal

![Version: 0.1.16](https://img.shields.io/badge/Version-0.1.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
![Version: 0.1.17](https://img.shields.io/badge/Version-0.1.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)

A Helm chart for gen3 data-portal

Expand Down
4 changes: 4 additions & 0 deletions helm/portal/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ spec:
{{- include "common.extraLabels" . | nindent 8 }}
public: "yes"
spec:
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/sower/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.12
version: 0.1.13

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion helm/sower/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# sower

![Version: 0.1.12](https://img.shields.io/badge/Version-0.1.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
![Version: 0.1.13](https://img.shields.io/badge/Version-0.1.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)

A Helm chart for gen3 sower

Expand Down
1 change: 0 additions & 1 deletion helm/sower/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ spec:
selector:
matchLabels:
{{- include "sower.selectorLabels" . | nindent 8 }}
{{- include "common.extraLabels" . | nindent 8 }}
revisionHistoryLimit: 2
strategy:
{{- toYaml .Values.strategy | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion helm/ssjdispatcher/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.10
version: 0.1.11

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion helm/ssjdispatcher/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ssjdispatcher

![Version: 0.1.10](https://img.shields.io/badge/Version-0.1.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)
![Version: 0.1.11](https://img.shields.io/badge/Version-0.1.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: master](https://img.shields.io/badge/AppVersion-master-informational?style=flat-square)

A Helm chart for gen3 ssjdispatcher

Expand Down
1 change: 0 additions & 1 deletion helm/ssjdispatcher/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ spec:
selector:
matchLabels:
{{- include "ssjdispatcher.selectorLabels" . | nindent 8 }}
{{- include "common.extraLabels" . | nindent 8 }}
revisionHistoryLimit: 2
strategy:
{{- toYaml .Values.strategy | nindent 8 }}
Expand Down

0 comments on commit 619ecba

Please sign in to comment.