hyrax 3.0.1 → 3.3.0

data/app/views/hyrax/my/collections/index.html.erb

@@ -21,7 +21,7 @@
     <!-- Page tabs -->
     <nav><%= render 'tabs' if @managed_collection_count > 0 %></nav>
 
-    <% if can?(:create_any, Collection) && @collection_type_list_presenter.any? %>
+    <% if can?(:create_any, Hyrax.config.collection_class) && @collection_type_list_presenter.any? %>
       <% if @collection_type_list_presenter.many? %>
         <% # modal to select type %>
         <button type="button"

data/app/views/hyrax/stats/_downloads.html.erb

@@ -0,0 +1,18 @@
+<script>
+  Morris.Bar({
+      element: 'downloads',
+      data: [
+        <% @downloads.list.take(30).reverse.each do |result| %>
+          { date: "<%= result[0] %>", metric: <%= result[1] %>},
+        <% end %>
+      ],  
+      xkey: 'date',
+      ykeys: ['metric'],
+      labels: ["<%= t('.downloads') %>"],
+      gridTextSize: '12px',
+      gridLineColor: '#E5E5E5',
+      gridIntegers: true,
+      ymin: 0,
+      resize: true
+    });
+</script>

data/app/views/hyrax/stats/_pageviews.html.erb

@@ -0,0 +1,18 @@
+<script>
+  Morris.Bar({
+      element: 'pageviews',
+      data: [
+        <% @pageviews.list.take(30).reverse.each do |result| %>
+          { date: "<%= result[0] %>", metric: <%= result[1] %>},
+        <% end %>
+      ],  
+      xkey: 'date',
+      ykeys: ['metric'],
+      labels: ["<%= t('.pageviews') %>"],
+      gridTextSize: '12px',
+      gridLineColor: '#E5E5E5',
+      gridIntegers: true,
+      ymin: 0,
+      resize: true
+    });
+</script>

data/app/views/hyrax/stats/work.html.erb

@@ -1,26 +1,34 @@
 <!-- Adapted from jquery-flot examples https://github.com/flot/flot/blob/master/examples/visitors/index.html -->
 <script>
 //<![CDATA[
-
-  var hyrax_item_stats = <%= raw json_escape @stats.to_flot.to_json %>;
-
+  var hyrax_item_stats = <%= raw json_escape @pageviews.to_flot.to_json %>;
 //]]>
 </script>
 
-<%= content_tag :h1, @stats, class: "lower" %>
+<%= content_tag :h1, @document, class: "lower" %>
 
 <div class="row">
   <div class="col-sm-12">
-    <%= content_tag :h2, "Work Analytics" %>
+    <%= content_tag :h2, "#{t('.header')}" %>
     <div class="alert alert-info">
       <span class="glyphicon glyphicon-signal large-icon"></span>
-      <%= content_tag :strong, @stats.total_pageviews %> views since <%= @stats.created.strftime("%B %-d, %Y") %>
+        <%= t('total_view', count: @pageviews.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
+        <%= t('download', count: @downloads.range(Hyrax.config.analytics_start_date.to_date, Time.zone.today)) %>
     </div>
+
     <div class="stats-container">
-      <div id="usage-stats" class="stats-placeholder"></div>
+      <h3 class="text-center"><%= t('.pageviews') %></h3>
+      <div id="pageviews">
+        <%= render 'pageviews' %>
+      </div>
     </div>
-    <div class="stats-container" style="height:150px;">
-      <div id="overview" class="stats-placeholder"></div>
+
+    <div class="stats-container">
+      <h3 class="text-center"><%= t('.downloads') %></h3>
+      <div id="downloads">
+        <%= render 'downloads' %>
+      </div>
     </div>
+
   </div>
 </div>

data/app/views/layouts/_head_tag_content.html.erb

@@ -25,8 +25,13 @@ signed in %>
 
 <%= render 'shared/appearance_styles' %>
 
-<!-- Google Analytics -->
-<%= render partial: '/ga', formats: [:html] %>
+<% if Hyrax.config.analytics? %>
+  <% if Hyrax.config.analytics_provider == 'google' %>
+    <%= render partial: 'shared/ga', formats: [:html]  %>
+  <% elsif Hyrax.config.analytics_provider == 'matomo' %>
+    <%= render partial: 'shared/matomo', formats: [:html] %>
+  <% end %>
+<% end %>
 
 <!-- for extras, e.g., a favicon -->
 <%= render partial: '/head_tag_extras', formats: [:html] %>

data/app/views/layouts/hyrax/dashboard.html.erb

@@ -27,6 +27,7 @@
         <% end %>
 
           <a name="skip-to-content" id="skip-to-content"></a>
+          <%= render 'shared/read_only' if Flipflop.read_only? %>
           <%= content_for?(:content) ? yield(:content) : yield %>
 
       </div>

data/app/views/layouts/hyrax.html.erb

@@ -24,6 +24,7 @@
       <% end %>
 
       <a name="skip-to-content" id="skip-to-content"></a>
+      <%= render 'shared/read_only' if Flipflop.read_only? %>
       <%= content_for?(:content) ? yield(:content) : yield %>
     </div><!-- /#content-wrapper -->
     <%= render 'shared/footer' %>

data/app/views/{_ga.html.erb → shared/_ga.html.erb}

@@ -1,20 +1,16 @@
-<%
-if Hyrax.config.google_analytics_id?
-tracking_id = Hyrax.config.google_analytics_id
-%>
 <script type="text/javascript">
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= tracking_id %>']);
+  _gaq.push(['_setAccount', '<%= Hyrax::Analytics.config.analytics_id %>']);
   <% if Rails.env.development? %>
     // This allows us to look at GA data live from locahost
     _gaq.push(['_setDomainName', 'none']);
   <% end %>
-  _gaq.push(['_trackPageview']);
 
   (function() {
     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
   })();
+  window.analytics = _gaq;
 </script>
-<% end %>
+<meta name="analytics-provider" content="google">

data/app/views/shared/_matomo.html.erb

@@ -0,0 +1,15 @@
+<script type="text/javascript">
+  var _paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  // _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="<%= Hyrax::Analytics.config.base_url %>";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', "<%= Hyrax::Analytics.config.site_id %>"]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+  window.analytics = _paq;
+</script>
+<meta name="analytics-provider" content="matomo">

data/app/views/shared/_read_only.html.erb

@@ -0,0 +1,5 @@
+<div class="row">
+    <div class="col-md-12 read-only text-center alert alert-warning">
+        <%= t('hyrax.read_only') %>
+    </div>
+</div>

data/bin/db-migrate-seed.sh

@@ -5,7 +5,9 @@ db-wait.sh "$DB_HOST:$DB_PORT"
 bundle exec rails db:create
 bundle exec rails db:migrate
 
-db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
+if [ "$FCREPO_HOST" ]; then
+  db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
+fi
 db-wait.sh "$SOLR_HOST:$SOLR_PORT"
 
 bundle exec rails db:seed

data/bin/hyrax-entrypoint.sh

@@ -1,20 +1,6 @@
 #!/bin/sh
 set -e
 
-# Make sure common volume points have the app permission
-chown -fR app:app /app/samvera/hyrax-webapp/tmp
-chown -fR app:app /app/samvera/hyrax-webapp/public
-
-if [ -v HYRAX_DERIVITIVES_PATH ]; then
-  mkdir -p $HYRAX_DERIVITIVES_PATH
-  chown -f -R app:app $HYRAX_DERIVATIVES_PATH
-fi
-
-if [ -v HYRAX_UPLOAD_PATH ]; then
-  mkdir -p $HYRAX_UPLOAD_PATH
-  chown -f -R app:app $HYRAX_UPLOAD_PATH
-fi
-
 mkdir -p /app/samvera/hyrax-webapp/tmp/pids
 rm -f /app/samvera/hyrax-webapp/tmp/pids/*
 

data/bin/solrcloud-assign-configset.sh

@@ -5,17 +5,25 @@ if [ "$SOLR_ADMIN_USER" ]; then
   solr_user_settings="--user $SOLR_ADMIN_USER:$SOLR_ADMIN_PASSWORD"
 fi
 
+solr_config_name="${SOLR_CONFIGSET_NAME:-solrconfig}"
+solr_collection_name="${SOLR_COLLECTION_NAME:-hyrax}"
+
 # Solr Cloud Collection API URLs
 solr_collection_list_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=LIST"
-solr_collection_modify_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=MODIFYCOLLECTION&collection=$SOLR_COLLECTION_NAME&collection.configName=$SOLR_CONFIGSET_NAME"
+solr_collection_modify_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=MODIFYCOLLECTION&collection=${solr_collection_name}&collection.configName=${solr_config_name}"
 
 while [ $COUNTER -lt 30 ]; do
   if nc -z "${SOLR_HOST}" "${SOLR_PORT}"; then
-    if curl --silent $solr_user_settings "$solr_collection_list_url" | grep -q "$SOLR_COLLECTION_NAME"; then
-      echo "-- Collection ${SOLR_COLLECTION_NAME} exists; setting ${SOLR_CONFIGSET_NAME} ConfigSet ..."
+    if curl --silent $solr_user_settings "$solr_collection_list_url" | grep -q "$solr_collection_name"; then
+      echo "-- Collection ${solr_collection_name} exists; setting ${solr_config_name} ConfigSet ..."
       echo $solr_collection_modify_url
       curl $solr_user_settings "$solr_collection_modify_url"
       exit
+    else
+      echo "-- Collection ${solr_collection_name} does not exist; creating and setting ${solr_config_name} ConfigSet ..."
+      solr_collection_create_url="$SOLR_HOST:$SOLR_PORT/solr/admin/collections?action=CREATE&name=${solr_collection_name}&collection.configName=${solr_config_name}&numShards=1"
+      curl $solr_user_settings "$solr_collection_create_url"
+      exit
     fi
   fi
   echo "-- Looking for Solr (${SOLR_HOST}:${SOLR_PORT})..."

data/bin/solrcloud-upload-configset.sh

@@ -8,20 +8,31 @@ if [ "$SOLR_ADMIN_USER" ]; then
   solr_user_settings="--user $SOLR_ADMIN_USER:$SOLR_ADMIN_PASSWORD"
 fi
 
+solr_config_name="${SOLR_CONFIGSET_NAME:-solrconfig}"
+
 # Solr Cloud ConfigSet API URLs
 solr_config_list_url="http://$SOLR_HOST:$SOLR_PORT/api/cluster/configs?omitHeader=true"
-solr_config_upload_url="http://$SOLR_HOST:$SOLR_PORT/solr/admin/configs?action=UPLOAD&name=$SOLR_CONFIGSET_NAME"
+solr_config_upload_url="http://$SOLR_HOST:$SOLR_PORT/solr/admin/configs?action=UPLOAD&name=${solr_config_name}"
 
 while [ $COUNTER -lt 30 ]; do
   echo "-- Looking for Solr (${SOLR_HOST}:${SOLR_PORT})..."
   if nc -z "${SOLR_HOST}" "${SOLR_PORT}"; then
-    if curl --silent $solr_user_settings "$solr_config_list_url" | grep -q "$SOLR_CONFIGSET_NAME"; then
-      echo "-- ConfigSet already exists; skipping creation ...";
+    # shellcheck disable=SC2143,SC2086
+    if curl --silent --user 'fake:fake' "$solr_config_list_url" | grep -q '401'; then
+      # the solr pods come up and report available before they are ready to accept trusted configs
+      # only try to upload the config if auth is on.
+      if curl --silent $solr_user_settings "$solr_config_list_url" | grep -q "$solr_config_name"; then
+        echo "-- ConfigSet already exists; skipping creation ...";
+      else
+        echo "-- ConfigSet for ${CONFDIR} does not exist; creating ..."
+        (cd "$CONFDIR" && zip -r - *) | curl -X POST $solr_user_settings --header "Content-Type:application/octet-stream" --data-binary @- "$solr_config_upload_url"
+      fi
+      exit
     else
-      echo "-- ConfigSet for ${CONFDIR} does not exist; creating ..."
-      (cd "$CONFDIR" && zip -r - *) | curl -X POST $solr_user_settings --header "Content-Type:application/octet-stream" --data-binary @- "$solr_config_upload_url"
+      echo "-- Solr at $solr_config_list_url is accepting unauthorized connections; we can't upload a trusted ConfigSet."
+      echo "--   It's possible SolrCloud is bootstrapping its configuration, so this process will retry."
+      echo "--   see: https://solr.apache.org/guide/8_6/configsets-api.html#configsets-upload"
     fi
-    exit
   fi
   COUNTER=$(( COUNTER+1 ));
   sleep 5s

data/chart/hyrax/Chart.yaml

@@ -2,17 +2,21 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 0.7.0
-appVersion: 3.0.1
+version: 1.0.2
+appVersion: 3.1.0
 dependencies:
   - name: fcrepo
-    version: 0.6.0
-    repository: https://samvera-labs.github.com/fcrepo-charts
+    version: 0.8.0
+    repository: oci://ghcr.io/samvera
     condition: fcrepo.enabled
   - name: memcached
     version: 4.2.21
     repository: https://charts.bitnami.com/bitnami
     condition: memcached.enabled
+  - name: minio
+    version: 6.7.2
+    repository: https://charts.bitnami.com/bitnami
+    condition: minio.enabled
   - name: postgresql
     version: 10.3.13
     repository: https://charts.bitnami.com/bitnami
@@ -22,6 +26,6 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
   - name: solr
-    version: 0.2.2
+    version: 1.0.1
     repository: https://charts.bitnami.com/bitnami
     condition: solr.enabled

data/chart/hyrax/README.md

@@ -30,11 +30,12 @@ production environments.
 
 The chart populates the following environment variables:
 
-|-------------------|--------------------------------|------------------------|
 | Variable          | Description                    | Condition              |
 |-------------------|--------------------------------|------------------------|
-| DB_HOST           | Postgresql hostname            | `postgresql.enabled`   |
-| DB_PORT           | Postgresql service port        | `postgresql.enabled`   |
+| DB_PASSWORD       | Postgresql password            | n/a                    |
+| DB_PORT           | Postgresql service port        | n/a                    |
+| DB_HOST           | Postgresql hostname            | n/a                    |
+| DB_USERNAME       | Postgresql username            | n/a                    |
 | MEMCACHED_HOST    | Memcached host                 | `memcached.enabled`    |
 | RACK_ENV          | app environment ('production') | n/a                    |
 | RAILS_ENV         | app environment ('production') | n/a                    |
@@ -43,6 +44,7 @@ The chart populates the following environment variables:
 | FCREPO_HOST       | Fedora Commons host            | n/a                    |
 | FCREPO_PORT       | Fedora Commons port            | n/a                    |
 | FCREPO_REST_PATH  | Fedora Commons REST endpoint   | n/a                    |
+| SKIP_HYRAX_ENGINE_SEED   | Flag to load Hyrax engine seed file | n/a                    |
 | SOLR_ADMIN_USER   | Solr user for basic auth       | n/a                    |
 | SOLR_ADMIN_PASSWORD | Solr password for basic auth | n/a                    |
 | SOLR_COLLECTION_NAME | The name of the solr collection to use | n/a         |
@@ -50,7 +52,6 @@ The chart populates the following environment variables:
 | SOLR_HOST         | Solr service host              | n/a                    |
 | SOLR_PORT         | Solr service port              | n/a                    |
 | SOLR_URL          | Solr service full URL          | n/a                    |
-|----------------- -|--------------------------------|------------------------|
 
 ## With an external SolrCloud
 
@@ -89,12 +90,58 @@ For those interested in trying out or contributing to this Chart, it's helpful
 to setup a simple cluster locally. Various projects exist to make this easy; we
 recommend [`k3d`][k3d] or [minikube][minikube].
 
-For example, with `k3d`:
+### Getting Started with K3D
+
+Make sure you have `docker`, `k3d`, and `helm` installed (e.g., for OSX run `brew install k3d` and `brew install helm`; and install `Docker Desktop`).
+
+Make sure you have Docker up and running.
+
+Run the following command; it will pull images and when finished you'll have a Kubernetes cluster running across a number of Docker containers.
 
 ```sh
 k3d cluster create dev-cluster --api-port 6550 -p 80:80@loadbalancer --agents 3
 ```
 
+When it's done, you should see something like the following output:
+
+```sh
+INFO[0251] You can now use it like this:
+kubectl config use-context k3d-dev-cluster
+kubectl cluster-info
+```
+
+Then update the helm charts with the following:
+
+```sh
+HELM_EXPERIMENTAL_OCI=1 helm dependency update chart/hyrax
+```
+
+Without the `HELM_EXPERIMENTAL_OCI=1` switch you might see the following error:
+
+```sh
+repository oci://ghcr.io/samvera is an OCI registry: this feature has been marked as experimental and is not enabled by default. Please set HELM_EXPERIMENTAL_OCI=1 in your environment to use this feature”
+```
+
+With the following command, you'll next want to install hyrax into a namespace.  The namespace directive helps convey the meaning of the kubernetes cluster; and helps you manage all of the resources for that namespace (e.g., "production" or "testing").
+
+```sh
+helm install --create-namespace --namespace hyrax dassie chart/hyrax
+```
+
+This creates the Helm release named `dassie`, in the namespace `hyrax`.  This command will echo instructions for exposing the running application URL.
+
+You'll be downloading a lot of packages, and this will take quite a bit of time (depending on your bandwidth, and depending on how your ISP allocates resources, you may experience network connectivity issues that are VERY hard to troubleshoot; at least that was Jeremy's experience as he kept getting `ImagePullBackOff` errors.  The recommendation, find a different network to install Kubernetes).
+
+You can check the status by running `kubectl --namespace hyrax get pods --watch`.  To learn more about a failed pod, you can run `kubectl describe pod <named pod> --namespace hyrax`.  The events section (at the bottom of the output) will be useful for troubleshooting.
+
+Some shell commands of house cleaning and destruction:
+
+*  To stop the cluster: `k3d cluster stop dev-cluster`.
+*  To delete the cluster: `k3d cluster delete dev-cluster`.
+*  Remove existing docker instances: `docker rm $(docker ps -q -f status=exited)`
+*  Remove hanging docker instances: `docker rm $(docker ps -a -q) -f`
+*  Removing dangling docker images: `docker rmi $(docker images -f "dangling=true" -q)`
+
 [containers]: ../../CONTAINERS.md#hyrax-image
 [dassie]: ../../.dassie/README.md
 [dassie-image]: https://hub.docker.com/r/samveralabs/dassie

data/chart/hyrax/templates/_helpers.tpl

@@ -74,7 +74,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- if .Values.fcrepo.enabled }}
 {{- include "hyrax.fcrepo.fullname" . }}
 {{- else }}
-{{- .Values.externalFcrepoHost }}
+{{- .Values.externalFcrepoHost | default "NO_FCREPO_HOST_DEFINED" }}
 {{- end }}
 {{- end -}}
 
@@ -82,6 +82,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name "memcached" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{- define "hyrax.minio.fullname" -}}
+{{- printf "%s-%s" .Release.Name "minio" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{- define "hyrax.postgresql.fullname" -}}
 {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -174,3 +178,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- define "hyrax.redis.url" -}}
 {{- printf "redis://:%s@%s:%s" .Values.redis.password (include "hyrax.redis.host" .) "6379/0" -}}
 {{- end -}}
+
+{{- define "hyrax.sharedPvcAccessModes" -}}
+{{- if .Values.worker.enabled }}
+accessModes:
+  - ReadWriteMany
+{{- else }}
+accessModes:
+  - ReadWriteOnce
+{{- end }}
+{{- end -}}

data/chart/hyrax/templates/branding-pvc.yaml

@@ -6,9 +6,9 @@ metadata:
   labels:
     {{- include "hyrax.labels" . | nindent 4 }}
 spec:
-  accessModes:
-    - ReadWriteMany
+  {{ include "hyrax.sharedPvcAccessModes" . | nindent 2 }}
   resources:
     requests:
       storage: {{ .Values.brandingVolume.size }}
+  storageClassName: {{ .Values.brandingVolume.storageClass }}
 {{- end }}

data/chart/hyrax/templates/configmap-env.yaml

@@ -10,6 +10,7 @@ metadata:
 data:
   DB_HOST: {{ template "hyrax.postgresql.host" . }}
   DB_PORT: "5432"
+  DB_USERNAME: {{ template "hyrax.postgresql.database" . }}
   {{- if .Values.memcached.enabled }}
   MEMCACHED_HOST: {{ template "hyrax.memcached.fullname" . }}
   {{- end }}
@@ -24,13 +25,16 @@ data:
   {{- if .Values.redis.enabled }}
   REDIS_HOST: {{ template "hyrax.redis.host" . }}
   {{- end }}
-  FCREPO_BASE_PATH: {{ .Values.fcrepoBasePathOverride | default (printf "/%s" (include "hyrax.fullname" .)) | quote }}
   FCREPO_HOST: {{ template "hyrax.fcrepo.host" . }}
+  FCREPO_BASE_PATH: {{ .Values.fcrepoBasePathOverride | default (printf "/%s" (include "hyrax.fullname" .)) | quote }}
   FCREPO_PORT: {{ .Values.fcrepo.servicePort | default 8080 | quote }}
   FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "rest" }}
   REDIS_PROVIDER: SIDEKIQ_REDIS_URL
+  {{- if .Values.minio.enabled }}
+  MINIO_ENDPOINT: {{ template "hyrax.minio.fullname" . }}
+  {{- end }}
+  SKIP_HYRAX_ENGINE_SEED: {{  .Values.skipHyraxEngineSeed | default 0 | quote }}
   SOLR_ADMIN_USER: {{ template "hyrax.solr.username" . }}
-  SOLR_ADMIN_PASSWORD: {{ template "hyrax.solr.password" . }}
   SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
   SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
   SOLR_HOST: {{ template "hyrax.solr.host" . }}

data/chart/hyrax/templates/deployment-worker.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.worker.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -27,17 +28,26 @@ spec:
                 name: {{ include "hyrax.fullname" . }}-env
             - secretRef:
                 name: {{ template "hyrax.fullname" . }}
+          env:
+            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
           command:
             - sh
             - -c
-            - db-wait.sh "$DB_HOST:$DB_PORT"
-            - db-wait.sh "$FCREPO_HOST:$FCREPO_PORT"
-            - db-wait.sh "$SOLR_HOST:$SOLR_PORT"
+            - db-wait.sh "$REDIS_HOST:6379"
+        {{- if .Values.worker.extraInitContainers }}
+        {{- toYaml .Values.worker.extraInitContainers | nindent 8 }}
+        {{- end }}
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: {{ include "hyrax.serviceAccountName" . }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml .Values.worker.podSecurityContext | nindent 8 }}
       containers:
         - name: {{ .Chart.Name }}-worker
+          securityContext:
+            {{- toYaml .Values.worker.securityContext | nindent 12 }}
           image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
           envFrom:
@@ -45,6 +55,15 @@ spec:
                 name: {{ include "hyrax.fullname" . }}-env
             - secretRef:
                 name: {{ template "hyrax.fullname" . }}
+            {{- if .Values.solrExistingSecret }}
+            - secretRef:
+                name: {{ .Values.solrExistingSecret }}
+            {{- end }}
+            {{- with .Values.worker.extraEnvFrom }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+          env:
+            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
           volumeMounts:
             - name: derivatives
               mountPath: /app/samvera/derivatives
@@ -54,8 +73,18 @@ spec:
             - name: uploads
               subPath: uploads
               mountPath: /app/samvera/uploads
+            {{- if .Values.applicationExistingClaim }}
+            - name: application
+              mountPath: /app/samvera/hyrax-webapp
+            {{- end }}
+            {{- with .Values.worker.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           resources:
             {{- toYaml .Values.worker.resources | nindent 12 }}
+          {{- with .Values.extraContainerConfiguration }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
       volumes:
         - name: "derivatives"
           {{- if and .Values.derivativesVolume.enabled .Values.derivativesVolume.existingClaim }}
@@ -77,7 +106,14 @@ spec:
           {{ else }}
           emptyDir: {}
           {{ end }}
-
+        {{- if .Values.applicationExistingClaim }}
+        - name: "application"
+          persistentVolumeClaim:
+            claimName: {{ .Values.applicationExistingClaim }}
+        {{- end }}
+        {{- with .Values.worker.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.worker.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -90,3 +126,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}