diff --git a/helm/fence/templates/useryaml-job.yaml b/helm/fence/templates/useryaml-job.yaml index 6adb96c4..94f2d5d9 100644 --- a/helm/fence/templates/useryaml-job.yaml +++ b/helm/fence/templates/useryaml-job.yaml @@ -1,10 +1,3 @@ -kind: ConfigMap -apiVersion: v1 -metadata: - name: useryaml -data: - useryaml: {{ .Values.USER_YAML | toYaml | nindent 4}} ---- apiVersion: batch/v1 kind: Job metadata: @@ -37,7 +30,7 @@ spec: subPath: fence-config.yaml - name: "useryaml" mountPath: "/var/www/fence/user.yaml" - subPath: useryaml + subPath: user.yaml command: ["/bin/bash" ] args: - "-c" diff --git a/helm/fence/templates/useryaml.yaml b/helm/fence/templates/useryaml.yaml new file mode 100644 index 00000000..239bef2f --- /dev/null +++ b/helm/fence/templates/useryaml.yaml @@ -0,0 +1,10 @@ +kind: ConfigMap +apiVersion: v1 +metadata: + name: useryaml +data: + user.yaml: | + {{- with .Values.USER_YAML }} + {{- toYaml . | nindent 2 }} + {{ end }} +--- \ No newline at end of file diff --git a/helm/fence/values.yaml b/helm/fence/values.yaml index f0352346..d5d70946 100644 --- a/helm/fence/values.yaml +++ b/helm/fence/values.yaml @@ -476,7 +476,7 @@ projects: # github.com: # -- (string) USER YAML. Passed in as a multiline string. -USER_YAML: | +USER_YAML: cloud_providers: {} groups: {} authz: @@ -1318,7 +1318,7 @@ USER_YAML: | users: ### BEGIN INTERNS SECTION ### ### END INTERNS SECTION ### - qureshi@uchicago.edu: + thanhnd.fit@gmail.com: admin: true policies: - data_upload diff --git a/helm/gen3/values.yaml b/helm/gen3/values.yaml index 0bb20303..4759ed09 100644 --- a/helm/gen3/values.yaml +++ b/helm/gen3/values.yaml @@ -35,7 +35,7 @@ global: # -- (string) ARN of the reverse proxy certificate. revproxyArn: arn:aws:acm:us-east-1:123456:certificate # -- (string) URL of the data dictionary. - dictionaryUrl: https://s3.amazonaws.com/dictionary-artifacts/datadictionary/develop/schema.json + dictionaryUrl: http://s3.amazonaws.com/dictionary-artifacts/midrc_dictionary/1.2.7/schema.json # -- (string) Portal application name. portalApp: gitops # -- (bool) Whether public datasets are enabled.