hyrax 5.0.0.rc3 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 020c1b9b867c89474795692fb51cc03751ecfd10feb8dd300750b12891b3687c
-  data.tar.gz: 41385b0600e001653ed3eb30b239b1520125fb52192af6543d6be53ffb76d0e4
+  metadata.gz: 791fb1a29523524e62036fd25aed45e6297d4d010e4b20bbcd9abe468bb30278
+  data.tar.gz: fbfdf5b3523294fe5dff601c92412967da57fdd02ac6c28d2384f18e8033cb4e
 SHA512:
-  metadata.gz: 1c56457afe4451c9bd228ef1b45e2d431c60855ba1b744c14f4320ceefa92020d9c4bff083d0d39271c8e8cf2d3db3a79ff0630ece9f676180c21a6b928fee13
-  data.tar.gz: 144eda52bc5bee7caba33a113324e27fa5c00102c9422264758f68ab28f59844d6a1bb8ff6301d251cd17fc34e6e8cc4aa089c1b22c11249d3988070e935dcb8
+  metadata.gz: 98fbab4485f2bb977cfb0fe755a05a98f39a2ba6f575420bae41a70d5e361aae482d81da902203afc49aa9171decafa3d4b87d6d58c0ee05e14a9ff8221f545b
+  data.tar.gz: 8846f839b4040ce79e52738da5fe3585fa176041cc6805c8c124724c8db006d6fee2ff30e5d286bfc0ca76de1e10a331bf608c9f88109208b6bdffc2d90d3023

data/CONTAINERS.md

@@ -226,7 +226,7 @@ We publish several Hyrax images to the [GitHub container registry][ghcr] under
 the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-export HYRAX_VERSION=v5.0.0.rc3 # or desired version
+export HYRAX_VERSION=v5.0.0 # or desired version
 git checkout hyrax-$HYRAX_VERSION
 
 docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .

data/app/assets/javascripts/hyrax/autocomplete/linked_data.es6

@@ -18,6 +18,9 @@ export default class LinkedData {
     let result = this.element.select2("data")
     this.element.select2("destroy")
     this.element.val(result.label).attr("readonly", "readonly")
+    // Adding d-block class to the remove button to show it after a selection is made.
+    let removeButton = this.element.closest('.field-wrapper').find('.input-group-btn.field-controls .remove')
+    removeButton.addClass('d-block')
     this.setIdentifier(result.id)
   }
 

data/app/assets/javascripts/hyrax/editor/controlled_vocabulary.es6

@@ -31,6 +31,8 @@ export default class ControlledVocabulary extends FieldManager {
       this.paramKey = paramKey
       this.fieldName = this.element.data('fieldName')
       this.searchUrl = this.element.data('autocompleteUrl')
+      // Used to prevent index collisions for existing words when removing and adding back in values.
+      this.postRemovalAdjustment = 0
   }
 
   // Overrides FieldManager, because field manager uses the wrong selector
@@ -49,6 +51,15 @@ export default class ControlledVocabulary extends FieldManager {
   //         this._manageFocus()
   // }
 
+  // Overrides FieldManager in order to display Remove button for values that exist at initial load time
+  _createRemoveControl() {
+    if (this.element.find('input.multi-text-field').val()) {
+      this.remover.addClass('d-block')
+      this.remover.addClass('has-existing-value')
+    }
+    $(this.fieldWrapperClass + ' .field-controls', this.element).append(this.remover)
+  }
+
   // Overrides FieldManager in order to avoid doing a clone of the existing field
   createNewField($activeField) {
       let $newField = this._newFieldTemplate()
@@ -68,20 +79,24 @@ export default class ControlledVocabulary extends FieldManager {
   }
 
   _newFieldTemplate() {
-      let index = this._maxIndex()
+      let index = this._maxIndex() + this.postRemovalAdjustment
       let rowTemplate = this._template()
       let controls = this.controls.clone()//.append(this.remover)
       let row =  $(rowTemplate({ "paramKey": this.paramKey,
                                  "name": this.fieldName,
                                  "index": index,
-                                 "class": "controlled_vocabulary" }))
+                                 "class": "controlled_vocabulary",
+                                 "placeholder": "Search for a location..." }))
                   .append(controls)
+      let removeButton = row.find('.remove');
+      removeButton.removeClass('d-block')
+      removeButton.removeClass('has-existing-value')
       return row
   }
 
   get _source() {
       return "<li class=\"field-wrapper input-group input-append\">" +
-        "<input class=\"string {{class}} optional form-control {{paramKey}}_{{name}} form-control multi-text-field\" name=\"{{paramKey}}[{{name}}_attributes][{{index}}][hidden_label]\" value=\"\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}_hidden_label\" data-attribute=\"{{name}}\" type=\"text\">" +
+        "<input class=\"string {{class}} optional form-control {{paramKey}}_{{name}} form-control multi-text-field\" name=\"{{paramKey}}[{{name}}_attributes][{{index}}][hidden_label]\" value=\"\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}_hidden_label\" data-attribute=\"{{name}}\" type=\"text\" placeholder=\"{{placeholder}}\">" +
         "<input name=\"{{paramKey}}[{{name}}_attributes][{{index}}][id]\" value=\"\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}_id\" type=\"hidden\" data-id=\"remote\">" +
         "<input name=\"{{paramKey}}[{{name}}_attributes][{{index}}][_destroy]\" id=\"{{paramKey}}_{{name}}_attributes_{{index}}__destroy\" value=\"\" data-destroy=\"true\" type=\"hidden\"></li>"
   }
@@ -114,9 +129,27 @@ export default class ControlledVocabulary extends FieldManager {
   // '_destroy' hidden parameter
   removeFromList( event ) {
       event.preventDefault()
+      // Changing behavior of the remove button to add a new field if the last field is removed
+      // Using querySelector to find elements with data-attribute="based_near"
+      const inputElements = this.element.find('input' + this.inputTypeClass)
+      const parentsArray = Array.from(inputElements).map(element => element.parentElement)
+      const nonHiddenElements = parentsArray.filter(element => element.style.display !== 'none')
+      const nonHiddenCount = nonHiddenElements.length
+      if (nonHiddenCount < 2){
+        let $listing = $(event.target).closest(this.inputTypeClass).find(this.listClass)
+        let $activeField = $listing.children('li').last()
+        $listing.append(this.createNewField($activeField))
+        this.postRemovalAdjustment += 1
+      }
       let field = $(event.target).parents(this.fieldWrapperClass)
-      field.find('[data-destroy]').val('true')
-      field.hide()
+      // Removes field if a value hasn't been selected, otherwise marks it for destruction. 
+      // Prevents bug caused by marking empty fields for destruction.
+      if (field.find('.has-existing-value').length > 0) {
+        field.find('[data-destroy]').val('true')
+        field.hide()
+      } else {
+        field.remove()
+      }
       this.element.trigger("managed_field:remove", field)
   }
 }

data/app/assets/stylesheets/hyrax/_file_upload.scss

@@ -34,3 +34,9 @@
     padding-bottom: 10px;
   }
 }
+
+// fix blueimp jQuery-File-Upload display problems under Bootstrap 4+
+// found here: https://stackoverflow.com/a/48162651
+.fade.in {
+  opacity: 1
+}

data/app/assets/stylesheets/hyrax/controlled_vocabulary.scss

@@ -1,7 +1,7 @@
 .controlled_vocabulary {
   @extend .multi_value;
 
-  .listing li:only-of-type .remove {
-    display: block;
+  .listing li .remove {
+    display: none;
   }
 }

data/app/controllers/hyrax/dashboard/collections_controller.rb

@@ -26,9 +26,6 @@ module Hyrax
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied, with: :deny_collection_access
 
-      # actions: index, create, new, edit, show, update, destroy, permissions, citation
-      before_action :authenticate_user!, except: [:index]
-
       class_attribute :presenter_class,
                       :form_class,
                       :single_item_search_builder_class,

data/app/controllers/hyrax/file_sets_controller.rb

@@ -292,7 +292,7 @@ module Hyrax
     end
 
     def file_metadata
-      @file_metadata ||= Hyrax.query_service.custom_queries.find_file_metadata_by(id: curation_concern.original_file_id)
+      @file_metadata ||= Hyrax.config.file_set_file_service.primary_file_for(file_set: file_set)
     end
 
     # Override this method to add additional response formats to your local app

data/app/controllers/hyrax/single_use_links_viewer_controller.rb

@@ -84,7 +84,13 @@ module Hyrax
     end
 
     def current_ability
-      @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
+      link_instance = nil
+      begin
+        link_instance = single_use_link
+      rescue ActiveRecord::RecordNotFound
+        Rails.logger.debug("Single user link was not found while getting current ability")
+      end
+      @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, link_instance
     end
 
     def render_single_use_error(exception)
@@ -102,9 +108,10 @@ module Hyrax
       include CanCan::Ability
 
       attr_reader :single_use_link
+      attr_reader :current_user
 
       def initialize(user, single_use_link)
-        @user = user || ::User.new
+        @current_user = user || ::User.new
         return unless single_use_link
 
         @single_use_link = single_use_link

data/app/models/collection.rb

@@ -2,4 +2,16 @@
 
 # Provide plain collection model if not defined by the application.
 # Needed until Hyrax internals do not assume its existence.
-class ::Collection < Hyrax.config.collection_class; end unless '::Collection'.safe_constantize
+class ::Collection < Hyrax.config.collection_class; end unless ActiveSupport::Dependencies.then do |deps|
+  # In autoloading environments, when referencing +::Collection+ from the
+  # initializer, make sure that +safe_constantize+ wouldn’t just try loading
+  # this file again (which would produce a runtime error). Do this by manually
+  # searching for the file which should define +::Collection+ and checking if it
+  # is the one being currently loaded.
+  break true if Object.const_defined?(:Collection)
+  file_path = deps.search_for_file("collection")
+  expanded = File.expand_path(file_path)
+  expanded.delete_suffix!(".rb")
+  break false if deps.loading.include?(expanded)
+  '::Collection'.safe_constantize
+end

data/app/models/hyrax/model_registry.rb

@@ -99,7 +99,7 @@ module Hyrax
     end
 
     def self.classes_from(strings)
-      strings.map(&:safe_constantize).flatten.uniq
+      strings.map(&:safe_constantize).compact.uniq
     end
     private_class_method :classes_from
 

data/app/presenters/hyrax/pcdm_member_presenter_factory.rb

@@ -98,9 +98,9 @@ module Hyrax
     def presenter_for(document:, ability:)
       case document['has_model_ssim'].first
       when *Hyrax::ModelRegistry.file_set_rdf_representations
-        Hyrax::FileSetPresenter.new(document, ability)
+        file_presenter_class.new(document, ability)
       else
-        Hyrax::WorkShowPresenter.new(document, ability)
+        work_presenter_class.new(document, ability)
       end
     end
 

data/app/presenters/hyrax/work_show_presenter.rb

@@ -63,10 +63,10 @@ module Hyrax
 
     # @return [Boolean] render a IIIF viewer
     def iiif_viewer?
-      representative_id.present? &&
+      Hyrax.config.iiif_image_server? &&
+        representative_id.present? &&
         representative_presenter.present? &&
         representative_presenter.image? &&
-        Hyrax.config.iiif_image_server? &&
         members_include_viewable_image?
     end
 

data/app/search_builders/hyrax/catalog_search_builder.rb

@@ -80,6 +80,12 @@ class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
 
   # join from file id to work relationship solrized member_ids_ssim
   def join_for_works_from_files
-    "{!join from=#{Hyrax.config.id_field} to=member_ids_ssim v=has_model_ssim:*FileSet}#{dismax_query}"
+    "{!join from=#{Hyrax.config.id_field} to=member_ids_ssim}#{file_set_filter}#{dismax_query}"
+  end
+
+  # Query segment to filter out non-FileSet documents
+  # A wildcard * is used to avoid attempting to escape the :: in Hyrax::FileSet
+  def file_set_filter
+    "{!lucene q.op=AND}has_model_ssim:*FileSet"
   end
 end

data/app/services/hyrax/file_set_file_service.rb

@@ -32,7 +32,16 @@ module Hyrax
     end
 
     ##
-    # Return the Hyrax::FileMetadata which should be considered “primary” for
+    # Return the {Hyrax::FileMetadata} which should be considered “primary” for
+    # indexing and version‐tracking.
+    #
+    # @return [Hyrax::FileMetadata]
+    def self.primary_file_for(file_set:, query_service: Hyrax.query_service)
+      new(file_set: file_set, query_service: query_service).primary_file
+    end
+
+    ##
+    # Return the {Hyrax::FileMetadata} which should be considered “primary” for
     # indexing and version‐tracking.
     #
     # If +file_set.original_file_id+ is defined, it will be used; otherwise,

data/app/services/hyrax/listeners/file_listener.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Hyrax
+  module Listeners
+    ##
+    # Listens for events related to Files ({Valkyrie::StorageAdapter::File})
+    class FileListener
+      ##
+      # Called when 'file.characterized' event is published;
+      # allows post-characterization handling, like derivatives generation.
+      #
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_characterized(event)
+        file_set = event[:file_set]
+
+        case file_set
+        when ActiveFedora::Base # ActiveFedora
+          CreateDerivativesJob
+            .perform_later(file_set, event[:file_id], event[:path_hint])
+        else
+          ValkyrieCreateDerivativesJob
+            .perform_later(file_set.id.to_s, event[:file_id])
+        end
+      end
+
+      ##
+      # Called when 'file.uploaded' event is published
+      # @param [Dry::Events::Event] event
+      # @return [void]
+      def on_file_uploaded(event)
+        # Run characterization for original file only
+        return unless event[:metadata]&.original_file?
+
+        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
+      end
+    end
+  end
+end

data/app/services/hyrax/listeners/file_metadata_listener.rb

@@ -5,25 +5,6 @@ module Hyrax
     ##
     # Listens for events related to {Hyrax::FileMetadata}
     class FileMetadataListener
-      ##
-      # Called when 'file.characterized' event is published;
-      # allows post-characterization handling, like derivatives generation.
-      #
-      # @param [Dry::Events::Event] event
-      # @return [void]
-      def on_file_characterized(event)
-        file_set = event[:file_set]
-
-        case file_set
-        when ActiveFedora::Base # ActiveFedora
-          CreateDerivativesJob
-            .perform_later(file_set, event[:file_id], event[:path_hint])
-        else
-          ValkyrieCreateDerivativesJob
-            .perform_later(file_set.id.to_s, event[:file_id])
-        end
-      end
-
       ##
       # Called when 'file.metadata.updated' event is published; reindexes a
       # {Hyrax::FileSet} when a file claiming to be its `pcdm_use:OriginalFile`
@@ -41,17 +22,6 @@ module Hyrax
                           "encountered an error #{err.message}. should this " \
                           "object be in a FileSet #{event[:metadata]}"
       end
-
-      ##
-      # Called when 'file.uploaded' event is published
-      # @param [Dry::Events::Event] event
-      # @return [void]
-      def on_file_uploaded(event)
-        # Run characterization for original file only
-        return unless event[:metadata]&.original_file?
-
-        ValkyrieCharacterizationJob.perform_later(event[:metadata].id.to_s)
-      end
     end
   end
 end

data/app/services/hyrax/lock_manager.rb

@@ -30,8 +30,8 @@ module Hyrax
     rescue ConnectionPool::TimeoutError => err
       Hyrax.logger.error(err.message)
       raise(ConnectionPool::TimeoutError,
-            "Failed to aquire a lock from Redlock due to a Redis connection " /
-            "timeout: #{err}. If you are using Redis via `ConnectionPool` " /
+            "Failed to acquire a lock from Redlock due to a Redis connection " \
+            "timeout: #{err}. If you are using Redis via `ConnectionPool` " \
             "you may wish to increase the pool size.")
     end
 

data/app/services/hyrax/valkyrie_upload.rb

@@ -30,8 +30,10 @@ class Hyrax::ValkyrieUpload
   attr_reader :storage_adapter
   ##
   # @param [Valkyrie::StorageAdapter] storage_adapter
-  def initialize(storage_adapter: Hyrax.storage_adapter)
+  # @param [Class] file_set_file_service implementer of {Hyrax::FileSetFileService}
+  def initialize(storage_adapter: Hyrax.storage_adapter, file_set_file_service: Hyrax.config.file_set_file_service)
     @storage_adapter = storage_adapter
+    @file_set_file_service = file_set_file_service
   end
 
   def upload(filename:, file_set:, io:, use: Hyrax::FileMetadata::Use::ORIGINAL_FILE, user: nil, mime_type: nil) # rubocop:disable Metrics/AbcSize
@@ -67,7 +69,8 @@ class Hyrax::ValkyrieUpload
   end
 
   def version_upload(file_set:, io:, user:)
-    file_metadata = Hyrax.query_service.custom_queries.find_file_metadata_by(id: file_set.original_file_id)
+    file_metadata = @file_set_file_service.primary_file_for(file_set: file_set)
+
     Hyrax::VersioningService.create(file_metadata, user, io)
     Hyrax.publisher.publish("file.uploaded", metadata: file_metadata)
     ContentNewVersionEventJob.perform_later(file_set, user)

data/app/views/hyrax/uploads/_js_templates.html.erb

@@ -1,20 +1,20 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
+<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">
-        <span>
+        <td>
             <span class="preview"></span>
-        </span>
-        <span>
+        </td>
+        <td>
             <p class="name">{%=file.name%}</p>
             <strong class="error text-danger"></strong>
-        </span>
-        <span>
+        </td>
+        <td>
             <p class="size">Processing...</p>
             <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-striped progress-bar-animated bg-success" style="width:0%;"></div></div>
-        </span>
-        <span class="text-right">
+        </td>
+        <td class="text-right">
             {% if (!i && !o.options.autoUpload) { %}
                 <button class="btn btn-primary start" disabled>
                     <span class="fa fa-upload"></span>
@@ -27,7 +27,7 @@
                     <span><%= t('helpers.action.cancel') %></span>
                 </button>
             {% } %}
-        </span>
+        </td>
     </tr>
 {% } %}
 </script>

data/app/views/hyrax/uploads/_js_templates_branding.html.erb

@@ -1,7 +1,7 @@
 <!-- The template to display files available for upload -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade show">
+    <tr class="template-upload fade">
       <td>
         <span class="preview"></span>
       </td>
@@ -37,7 +37,7 @@
 <!-- The template to display the banner once upload is complete -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-        <span class="template-download fade show">
+        <span class="template-download fade">
           <div id="banner">
             <div class="row branding-banner-row">
               <div class="col-sm-3">
@@ -69,7 +69,7 @@
 <!-- The template to display logo in the table once upload is complete -->
 <script id="logo-template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-            <span class="template-download fade show">
+            <span class="template-download fade">
             <div class="row branding-logo-row">
               <div class="col-sm-3">
                 <span class="preview">

data/app/views/hyrax/uploads/_js_templates_versioning.html.erb

@@ -1,5 +1,5 @@
 <!-- The template to display files available for upload -->
-<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %>
+<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="versioning-template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
     <tr class="template-upload <%= fade_class_if_not_test %>">

data/chart/hyrax/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: hyrax
 description: An open-source, Samvera-powered digital repository system
 type: application
-version: 3.6.0
+version: 3.7.0
 appVersion: 5.0.0
 dependencies:
   - name: fcrepo

data/chart/hyrax/templates/_tmplvalues.tpl

@@ -0,0 +1,38 @@
+{{/*
+Copyright VMware, Inc.
+SPDX-License-Identifier: APACHE-2.0
+*/}}
+
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Renders a value that contains template perhaps with scope if the scope is present.
+Usage:
+{{ include "hyrax.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ ) }}
+{{ include "hyrax.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $ "scope" $app ) }}
+*/}}
+{{- define "hyrax.tplvalues.render" -}}
+{{- $value := typeIs "string" .value | ternary .value (.value | toYaml) }}
+{{- if contains "{{" (toJson .value) }}
+  {{- if .scope }}
+      {{- tpl (cat "{{- with $.RelativeScope -}}" $value "{{- end }}") (merge (dict "RelativeScope" .scope) .context) }}
+  {{- else }}
+    {{- tpl $value .context }}
+  {{- end }}
+{{- else }}
+    {{- $value }}
+{{- end }}
+{{- end -}}
+
+{{/*
+Merge a list of values that contains template after rendering them.
+Merge precedence is consistent with http://masterminds.github.io/sprig/dicts.html#merge-mustmerge
+Usage:
+{{ include "hyrax.tplvalues.merge" ( dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $ ) }}
+*/}}
+{{- define "hyrax.tplvalues.merge" -}}
+{{- $dst := dict -}}
+{{- range .values -}}
+{{- $dst = include "hyrax.tplvalues.render" (dict "value" . "context" $.context "scope" $.scope) | fromYaml | merge $dst -}}
+{{- end -}}
+{{ $dst | toYaml }}
+{{- end -}}

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

@@ -29,7 +29,9 @@ spec:
             - secretRef:
                 name: {{ template "hyrax.fullname" . }}
           env:
-            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           command:
             - sh
             - -c
@@ -63,7 +65,9 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           {{- if .Values.worker.readinessProbe.enabled }}
           readinessProbe:
             exec:

data/chart/hyrax/templates/deployment.yaml

@@ -38,7 +38,9 @@ spec:
                 name: {{ .Values.solrExistingSecret }}
             {{- end }}
           env:
-            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           command:
             - sh
             - -c
@@ -66,7 +68,9 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           command:
             - sh
             - -c
@@ -101,11 +105,25 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+            {{- if .Values.extraEnvVars }}
+            {{- include "hyrax.tplvalues.render" (dict "value" .Values.extraEnvVars "context" $) | nindent 12 }}
+            {{- end }}
           ports:
             - name: http
               containerPort: 3000
               protocol: TCP
+          {{- if .Values.startupProbe.enabled }}
+          startupProbe:
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds | default 5 }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds | default 5 }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds | default 10}}
+            successThreshold: {{ .Values.startupProbe.successThreshold | default 1 }}
+            httpGet:
+              scheme: "HTTP"
+              path: {{ .Values.startupProbe.path | default "/" }}
+              port: 3000
+          {{- end }}
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5 }}

data/chart/hyrax/values.yaml

@@ -188,6 +188,16 @@ readinessProbe:
   # failureThreshold: 6
   # successThreshold: 1
 
+# consider enabling if you are experiencing slow startup times
+startupProbe:
+  enabled: false
+  # path: "/healthz"
+  # initialDelaySeconds: 30
+  # periodSeconds: 30
+  # timeoutSeconds: 5
+  # failureThreshold: 3
+  # successThreshold: 1
+
 resources: {}
 
 worker: