Merge pull request #194 from uc-cdis/feat/usersync-fix

adding a backoff limit to the usersync cron to avoid generating an endless amount of failing jobs
uc-cdis · Sep 9, 2024 · 619ecba · 619ecba
2 parents f2207fb + a5dced9
commit 619ecba
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 25 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -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"
@@ -686,7 +686,7 @@
         "hashed_secret": "d84ce25b0f9bc2cc263006ae39453efb22cc2900",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 55,
+        "line_number": 54,
         "type": "Secret Keyword"
       },
       {

diff --git a/helm/fence/Chart.yaml b/helm/fence/Chart.yaml
@@ -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

diff --git a/helm/fence/README.md b/helm/fence/README.md
@@ -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
 

diff --git a/helm/fence/templates/presigned-url-fence.yaml b/helm/fence/templates/presigned-url-fence.yaml
@@ -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:

diff --git a/helm/fence/templates/usersync-cron.yaml b/helm/fence/templates/usersync-cron.yaml
@@ -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:

diff --git a/helm/fence/templates/useryaml-job.yaml b/helm/fence/templates/useryaml-job.yaml
@@ -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:

diff --git a/helm/gen3/Chart.yaml b/helm/gen3/Chart.yaml
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/helm/gen3/README.md b/helm/gen3/README.md
@@ -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
 
@@ -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 |
@@ -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 |

diff --git a/helm/gen3/templates/global-manifest.yaml b/helm/gen3/templates/global-manifest.yaml
@@ -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 }}

diff --git a/helm/portal/Chart.yaml b/helm/portal/Chart.yaml
@@ -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

diff --git a/helm/portal/README.md b/helm/portal/README.md
@@ -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
 

diff --git a/helm/portal/templates/deployment.yaml b/helm/portal/templates/deployment.yaml
@@ -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 }}

diff --git a/helm/sower/Chart.yaml b/helm/sower/Chart.yaml
@@ -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

diff --git a/helm/sower/README.md b/helm/sower/README.md
@@ -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
 

diff --git a/helm/sower/templates/deployment.yaml b/helm/sower/templates/deployment.yaml
@@ -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 }}  

diff --git a/helm/ssjdispatcher/Chart.yaml b/helm/ssjdispatcher/Chart.yaml
@@ -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

diff --git a/helm/ssjdispatcher/README.md b/helm/ssjdispatcher/README.md
@@ -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
 

diff --git a/helm/ssjdispatcher/templates/deployment.yaml b/helm/ssjdispatcher/templates/deployment.yaml
@@ -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 }}