Add role binding to ssj dispatcher

helm/gen3/Chart.yaml

@@ -100,7 +100,7 @@ dependencies:
     repository: "file://../sheepdog"
     condition: sheepdog.enabled
   - name: ssjdispatcher
-    version: 0.1.31
+    version: 0.1.32
     repository: "file://../ssjdispatcher"
     condition: ssjdispatcher.enabled
   - name: sower
@@ -165,7 +165,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.2.40
+version: 0.2.41
 
 # 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

helm/gen3/README.md

@@ -1,6 +1,6 @@
 # gen3
 
-![Version: 0.2.40](https://img.shields.io/badge/Version-0.2.40-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.2.41](https://img.shields.io/badge/Version-0.2.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)
 
 Helm chart to deploy Gen3 Data Commons
 
@@ -49,7 +49,7 @@ Helm chart to deploy Gen3 Data Commons
 | file://../revproxy | revproxy | 0.1.42 |
 | file://../sheepdog | sheepdog | 0.1.29 |
 | file://../sower | sower | 0.1.34 |
-| file://../ssjdispatcher | ssjdispatcher | 0.1.31 |
+| file://../ssjdispatcher | ssjdispatcher | 0.1.32 |
 | file://../wts | wts | 0.1.29 |
 | https://charts.bitnami.com/bitnami | postgresql | 11.9.13 |
 | https://helm.elastic.co | elasticsearch | 7.10.2 |

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.31
+version: 0.1.32
 
 # 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

helm/ssjdispatcher/README.md

@@ -1,6 +1,6 @@
 # ssjdispatcher
 
-![Version: 0.1.31](https://img.shields.io/badge/Version-0.1.31-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.32](https://img.shields.io/badge/Version-0.1.32-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
 
@@ -33,7 +33,7 @@ A Helm chart for gen3 ssjdispatcher
 | externalSecrets.createK8sSsjdispatcherSecret | string | `false` | Will create the Helm "fence-config" secret even if Secrets Manager is enabled. This is helpful if you are wanting to use External Secrets for some, but not all secrets. |
 | externalSecrets.credsFile | string | `nil` | Will override the name of the aws secrets manager secret. Default is "credentials.json" |
 | fullnameOverride | string | `""` | Override the full name of the deployment. |
-| gen3Namespace | string | `"default"` | Namespace to deploy the job. |
+| gen3Namespace | string | `""` | Namespace to deploy the job. |
 | global.autoscaling.enabled | bool | `false` |  |
 | global.autoscaling.maxReplicas | int | `100` |  |
 | global.autoscaling.minReplicas | int | `1` |  |

helm/ssjdispatcher/templates/_helpers.tpl

@@ -73,3 +73,10 @@ Create the name of the service account to use
 {{- define "creds-file" -}}
 {{- default "credentials.json" .Values.externalSecrets.credsFile }}
 {{- end }}
+
+{{/*
+  Function to set the namespace used
+*/}}
+{{- define "ssjdispatcher.gen3Namespace" -}}
+{{- default .Release.Namespace .Values.gen3Namespace }}
+{{- end }}

helm/ssjdispatcher/templates/deployment.yaml

@@ -58,10 +58,8 @@ spec:
             - name: AWS_STS_REGIONAL_ENDPOINTS
               value: {{ . }}
             {{- end }}
-            {{- with .Values.gen3Namespace  }}
             - name: GEN3_NAMESPACE
-              value: {{ . }}
-            {{- end }}
+              value: {{ include "ssjdispatcher.gen3Namespace" . }}
             - name: JOB_IMAGES
               valueFrom:
                 configMapKeyRef:

helm/ssjdispatcher/values.yaml

@@ -86,7 +86,6 @@ global:
       # -- (bool) Whether to use s3 bucket versioning.
       versioningEnabled: false
 
-
 #  -- (map) This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/
 autoscaling: {}
 
@@ -181,7 +180,7 @@ awsRegion: us-east-1
 # -- (string) AWS STS to issue temporary credentials to users and roles that make an AWS STS request. Values regional or global.
 awsStsRegionalEndpoints: regional
 # -- (string) Namespace to deploy the job.
-gen3Namespace: default
+gen3Namespace: ""
 # -- (string) Ssjdispater job number.
 dispatcherJobNum: "10"
 # -- (string) Image to use for the "indexing" job.
@@ -262,7 +261,6 @@ selectorLabels:
 # -- (map) Will completely override the commonLabels defined in the common chart's _label_setup.tpl
 commonLabels:
 
-
 # -- (map) External secrets configuration
 externalSecrets:
   # -- (string) Will create the Helm "fence-config" secret even if Secrets Manager is enabled. This is helpful if you are wanting to use External Secrets for some, but not all secrets.