Update config , secrets and values.yml to include properties for File…

… Storage, nmRium & Orcid
NFDI4Chem · May 2, 2022 · de32d83 · de32d83
1 parent c35cdd9
commit de32d83
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 deletions.
diff --git a/charts/nmrxiv-app/Chart.yaml b/charts/nmrxiv-app/Chart.yaml
@@ -18,7 +18,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.2.0
 
 # 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/charts/nmrxiv-app/templates/configmap.yaml b/charts/nmrxiv-app/templates/configmap.yaml
@@ -19,7 +19,19 @@ data:
   DB_HOST: {{ printf "%s-postgresql" .Release.Name | quote }}
   DB_PORT: {{ .Values.postgresql.port | default 5432 | quote }}
   DB_DATABASE: {{ required "A valid .Values.postgresql.postgresqlDatabase entry required!" .Values.postgresql.postgresqlDatabase }}
-
+
+#File Storage Properties
+  {{ if .Values.fileStorage.enabled }}
+  FILESYSTEM_DRIVER: {{ .Values.fileStorage.fileSystemDriver }}
+  AWS_DEFAULT_REGION: {{ .Values.fileStorage.awsDefaultRegion }}
+  AWS_BUCKET: {{ .Values.fileStorage.awsBucket }}
+  AWS_ENDPOINT: {{ .Values.fileStorage.awsEndpoint }}
+  AWS_URL: {{ .Values.fileStorage.awsURL }}
+  {{ end }}
+
+#Nmrium Properties
+  NMRIUM_URL: {{ required "A valid .Values.nmrium.nmriumURL entry required!" .Values.nmrium.nmriumURL }}
+
 #PYTHON MICROSERVICE Properties
   PYTHON_WS_URL: {{ printf "%s-pythonmicroservice" .Release.Name }}
   PYTHON_WS_PORT: {{ .Values.pythonmicroservice.service.port | default 80 | quote }}
@@ -37,7 +49,7 @@ data:
 
 #RabbitMQ Properties.
   {{ if .Values.rabbitmq.enabled }}
-  QUEUE_CONNECTION: "rabbitmq"
+  QUEUE_CONNECTION: {{ .Values.rabbitmq.queueConnection }}
   RABBITMQ_HOST: {{ printf "%s-rabbitmq" .Release.Name | quote }}
   RABBITMQ_PORT: {{ .Values.rabbitmq.port | default 5672 | quote }}
   RABBITMQ_USER: {{ required "A valid .Values.rabbitmq.auth.username entry required!" .Values.rabbitmq.auth.username }}
@@ -62,6 +74,8 @@ data:
 
 #OAuth Properties
   {{ if .Values.oauthProperties.enabled }}
-  TWITTER_REDIRECT_URL: {{ required "A valid .Values.oauthProperties.twitterRedirectUrl entry required!" .Values.oauthProperties.twitterRedirectUrl }}
-  GITHUB_REDIRECT_URL: {{ required "A valid .Values.oauthProperties.githubRedirectUrl entry required!" .Values.oauthProperties.githubRedirectUrl }}
+  TWITTER_REDIRECT_URL: {{ .Values.oauthProperties.twitterRedirectUrl }}
+  GITHUB_REDIRECT_URL: {{ .Values.oauthProperties.githubRedirectUrl }}
+  ORCID_REDIRECT_URL: {{ .Values.oauthProperties.orcidRedirectUrl }}
+  ORCID_ENVIRONMENT: {{ .Values.oauthProperties.orcidEnvironment }}
   {{ end }}
diff --git a/charts/nmrxiv-app/templates/secret.yml b/charts/nmrxiv-app/templates/secret.yml
@@ -15,6 +15,10 @@ data:
   {{- else if .Values.mysql.enabled }}
   DB_PASSWORD: {{ required "A valid .Values.postgresql.postgresqlPassword entry required!" .Values.postgresql.postgresqlPassword |b64enc | quote }}
   {{- end -}}
+  {{- if .Values.fileStorage.enabled}}
+  AWS_ACCESS_KEY_ID: {{ .Values.fileStorage.awsAccessKeyID |b64enc | quote }}
+  AWS_SECRET_ACCESS_KEY: {{ .Values.fileStorage.awsSecretAccessKey |b64enc | quote }}
+  {{- end -}}
   {{- if .Values.redis.enabled }}
   REDIS_PASSWORD: {{ required "A valid .Values.redis.auth.password entry required!" .Values.redis.auth.password |b64enc | quote }}
   {{- end -}}
@@ -25,8 +29,10 @@ data:
   MEILISEARCH_KEY: {{ required "A valid .Values.meilisearch.secretKey entry required!" .Values.meilisearch.secretKey |b64enc | quote }}
   {{- end -}}
   {{- if .Values.oauthProperties.enabled }}
-  TWITTER_CLIENT_ID: {{ required "A valid .Values.oauthProperties.twitterClientID entry required!" .Values.oauthProperties.twitterClientID |b64enc | quote }}
-  TWITTER_CLIENT_SECRET: {{ required "A valid .Values.oauthProperties.twitterClientID entry required!" .Values.oauthProperties.twitterClientSecret |b64enc | quote }}
-  GITHUB_CLIENT_ID: {{ required "A valid .Values.oauthProperties.twitterClientID entry required!" .Values.oauthProperties.githubClientID |b64enc | quote }}
-  GITHUB_CLIENT_SECRET: {{ required "A valid .Values.oauthProperties.twitterClientID entry required!" .Values.oauthProperties.githubClientSecret |b64enc | quote }}
+  TWITTER_CLIENT_ID: {{ .Values.oauthProperties.twitterClientID |b64enc | quote }}
+  TWITTER_CLIENT_SECRET: {{ .Values.oauthProperties.twitterClientSecret |b64enc | quote }}
+  GITHUB_CLIENT_ID: {{ .Values.oauthProperties.githubClientID |b64enc | quote }}
+  GITHUB_CLIENT_SECRET: {{ .Values.oauthProperties.githubClientSecret |b64enc | quote }}
+  ORCID_CLIENT_ID: {{ .Values.oauthProperties.orcidClientID |b64enc | quote }}
+  ORCID_CLIENT_SECRET: {{ .Values.oauthProperties.orcidClientSecret |b64enc | quote }}
   {{- end -}}
diff --git a/charts/nmrxiv-app/values.yaml b/charts/nmrxiv-app/values.yaml
@@ -10,7 +10,7 @@ appProperties:
   key:  
   env: development
   debug: true
-  url: https://<your-url>/
+  url: https://<your-url>
 
 logProperties:
   logChannel: stack
@@ -25,6 +25,10 @@ oauthProperties:
   githubClientID: 
   githubClientSecret: 
   githubRedirectUrl: 
+  orcidClientID: 
+  orcidClientSecret:
+  orcidRedirectUrl:
+  orcidEnvironment:
 
 appImage:
   name: php
@@ -137,7 +141,19 @@ postgresql:
     requests:
       cpu: 20m
       memory: 100Mi
-
+
+fileStorage:
+# Below values are for file storage configuration.
+# You can have desired S3 compatible driver of your choice. Follow to read more https://laravel.com/docs/9.x/filesystem
+  enabled: false
+  fileSystemDriver: 
+  awsAccessKeyID: 
+  awsSecretAccessKey: 
+  awsDefaultRegion: 
+  awsBucket: 
+  awsEndpoint:
+  awsURL: 
+
 pythonmicroservice:
   image:
     name: python-microservice
@@ -150,6 +166,7 @@ pythonmicroservice:
     port: 80
 
 nmrium:
+# You can use the nmrium hosted at our server or you can host one of your own and replace below values.
   image:
     name: nmrium
     repository: europe-west3-docker.pkg.dev/nmrxiv/nmrxiv-dev/nmrium
@@ -159,6 +176,7 @@ nmrium:
   service:
     type: LoadBalancer
     port: 80
+  nmriumURL: //nmriumdev.nmrxiv.org
 
 redis:
   auth:
@@ -183,6 +201,7 @@ redis:
 
 rabbitmq: 
   enabled: false
+  queueConnection: sync
   port: 5672
   #host: nmrxiv-rabbitmq
   auth: