hyrax 3.0.0.pre.rc4 → 3.1.0

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

@@ -0,0 +1,14 @@
+{{- if and .Values.brandingVolume.enabled (not .Values.brandingVolume.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ template "hyrax.fullname" . }}-branding
+  labels:
+    {{- include "hyrax.labels" . | nindent 4 }}
+spec:
+  {{ include "hyrax.sharedPvcAccessModes" . | nindent 2 }}
+  resources:
+    requests:
+      storage: {{ .Values.brandingVolume.size }}
+  storageClassName: {{ .Values.brandingVolume.storageClass }}
+{{- end }}

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

@@ -8,25 +8,35 @@ metadata:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 data:
-  {{- if .Values.postgresql.enabled }}
-  DB_HOST: {{ template "hyrax.postgresql.fullname" . }}
+  DB_HOST: {{ template "hyrax.postgresql.host" . }}
   DB_PORT: "5432"
-  {{- end }}
+  DB_USERNAME: {{ template "hyrax.postgresql.database" . }}
   {{- if .Values.memcached.enabled }}
   MEMCACHED_HOST: {{ template "hyrax.memcached.fullname" . }}
   {{- end }}
+  {{- if .Values.derivativesVolume.enabled }}
+  HYRAX_BRANDING_PATH: "/app/samvera/branding"
+  HYRAX_DERIVATIVES_PATH: "/app/samvera/derivatives"
+  HYRAX_CACHE_PATH: "/app/samvera/file_cache"
+  HYRAX_UPLOAD_PATH: "/app/samvera/uploads"
+  {{- end }}
   RACK_ENV: production
   RAILS_ENV: production
   {{- if .Values.redis.enabled }}
-  REDIS_HOST: {{ template "hyrax.redis.fullname" . }}-master
+  REDIS_HOST: {{ template "hyrax.redis.host" . }}
   {{- end }}
-  {{- if .Values.fcrepo.enabled }}
+  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_HOST: {{ template "hyrax.fcrepo.fullname" . }}
-  FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "fcrepo/rest" }}
+  FCREPO_REST_PATH: {{ .Values.fcrepo.restPath | default "rest" }}
+  REDIS_PROVIDER: SIDEKIQ_REDIS_URL
+  {{- if .Values.minio.enabled }}
+  MINIO_ENDPOINT: {{ template "hyrax.minio.fullname" . }}
   {{- end }}
-  {{- if .Values.solr.enabled }}
-  SOLR_HOST: {{ template "hyrax.solr.fullname" . }}-svc
+  SKIP_HYRAX_ENGINE_SEED: {{  .Values.skipHyraxEngineSeed | default 0 | quote }}
+  SOLR_ADMIN_USER: {{ template "hyrax.solr.username" . }}
+  SOLR_COLLECTION_NAME: {{ template "hyrax.solr.collectionName" . }}
+  SOLR_CONFIGSET_NAME: {{ template "hyrax.fullname" . }}
+  SOLR_HOST: {{ template "hyrax.solr.host" . }}
   SOLR_PORT: "8983"
-  SOLR_URL: http://{{ template "hyrax.solr.fullname" . }}-svc:8983/solr/hyrax
-  {{- end }}
+  SOLR_URL: {{ template "hyrax.solr.url" . }}

data/chart/hyrax/templates/cron-embargo.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.embargoRelease.enabled }}
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+metadata:
+  name: {{ include "hyrax.fullname" . }}-embargo-task
+  labels:
+    {{- include "hyrax.labels" . | nindent 4 }}
+spec:
+  schedule: {{ .Values.embargoRelease.schedule | default "*0 0 * * *" | quote }}
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: embargo-release
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            command:
+            - /bin/sh
+            - -c
+            - bundle exec rake hyrax:embargo:deactivate_expired
+          restartPolicy: OnFailure
+{{- end }}

data/chart/hyrax/templates/cron-lease.yaml

@@ -0,0 +1,24 @@
+{{- if .Values.leaseRelease.enabled }}
+apiVersion: batch/v1beta1
+kind: CronJob
+metadata:
+metadata:
+  name: {{ include "hyrax.fullname" . }}-lease-task
+  labels:
+    {{- include "hyrax.labels" . | nindent 4 }}
+spec:
+  schedule: {{ .Values.leaseRelease.schedule | default "0 0 * * *" | quote }}
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: lease-release
+            image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+            imagePullPolicy: {{ .Values.image.pullPolicy }}
+            command:
+            - /bin/sh
+            - -c
+            - bundle exec rake hyrax:lease:deactivate_expired
+          restartPolicy: OnFailure
+{{- end }}

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

@@ -0,0 +1,129 @@
+{{- if .Values.worker.enabled }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "hyrax.fullname" . }}-worker
+  labels:
+    {{- include "hyrax.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.worker.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "hyrax.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+    {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      labels:
+        {{- include "hyrax.selectorLabels" . | nindent 8 }}
+    spec:
+      initContainers:
+        - name: db-wait
+          image: "{{ .Values.worker.image.repository }}:{{ .Values.worker.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.worker.image.pullPolicy }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "hyrax.fullname" . }}-env
+            - secretRef:
+                name: {{ template "hyrax.fullname" . }}
+          env:
+            {{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
+          command:
+            - sh
+            - -c
+            - 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.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:
+            - configMapRef:
+                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
+            - name: uploads
+              subPath: file_cache
+              mountPath: /app/samvera/file_cache
+            - 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 }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.derivativesVolume.existingClaim }}
+          {{- else if .Values.derivativesVolume.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "hyrax.fullname" . }}-derivatives
+          {{ else }}
+          emptyDir: {}
+          {{ end }}
+        - name: "uploads"
+          {{- if and .Values.uploadsVolume.enabled .Values.uploadsVolume.existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.uploadsVolume.existingClaim }}
+          {{- else if .Values.uploadsVolume.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "hyrax.fullname" . }}-uploads
+          {{ 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 }}
+      {{- end }}
+      {{- with .Values.worker.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.worker.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}

data/chart/hyrax/templates/deployment.yaml

@@ -21,6 +21,29 @@ spec:
         {{- include "hyrax.selectorLabels" . | nindent 8 }}
     spec:
       initContainers:
+        {{- if .Values.loadSolrConfigSet }}
+        - name: load-solr-config
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "hyrax.fullname" . }}-env
+            - secretRef:
+                name: {{ include "hyrax.fullname" . }}
+            {{- if .Values.solrExistingSecret }}
+            - secretRef:
+                name: {{ .Values.solrExistingSecret }}
+            {{- end }}
+          env:
+            {{- toYaml .Values.extraEnvVars | nindent 12 }}
+          command:
+            - sh
+            - -c
+            - >
+              solrcloud-upload-configset.sh /app/samvera/hyrax-webapp/solr/conf &&
+              solrcloud-assign-configset.sh
+        {{- end }}
+        {{- if not .Values.skipDbMigrateSeed }}
         - name: db-setup
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -29,10 +52,23 @@ spec:
                 name: {{ include "hyrax.fullname" . }}-env
             - secretRef:
                 name: {{ template "hyrax.fullname" . }}
+            {{- if .Values.solrExistingSecret }}
+            - secretRef:
+                name: {{ .Values.solrExistingSecret }}
+            {{- end }}
+            {{- with .Values.extraEnvFrom }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+          env:
+            {{- toYaml .Values.extraEnvVars | nindent 12 }}
           command:
             - sh
             - -c
             - db-migrate-seed.sh
+        {{- end }}
+        {{- if .Values.extraInitContainers }}
+        {{- toYaml .Values.extraInitContainers | nindent 8 }}
+        {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
@@ -51,20 +87,105 @@ spec:
                 name: {{ include "hyrax.fullname" . }}-env
             - secretRef:
                 name: {{ template "hyrax.fullname" . }}
+            {{- if .Values.solrExistingSecret }}
+            - secretRef:
+                name: {{ .Values.solrExistingSecret }}
+            {{- end }}
+            {{- with .Values.extraEnvFrom }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+          env:
+            {{- toYaml .Values.extraEnvVars | nindent 12 }}
           ports:
             - name: http
               containerPort: 3000
               protocol: TCP
+          {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 5 }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds | default 5 }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 10}}
+            successThreshold: {{ .Values.livenessProbe.successThreshold | default 1 }}
             httpGet:
-              path: /
-              port: http
+              scheme: "HTTP"
+              path: {{ .Values.livenessProbe.path | default "/" }}
+              port: 3000
+          {{- end }}
+          {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 5 }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds | default 5 }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold | default 3 }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 10 }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold | default 1 }}
             httpGet:
-              path: /
-              port: http
+              scheme: "HTTP"
+              path: {{ .Values.readinessProbe.path | default "/" }}
+              port: 3000
+          {{- end }}
+          volumeMounts:
+            - name: branding
+              mountPath: /app/samvera/branding
+            - name: derivatives
+              mountPath: /app/samvera/derivatives
+            - name: uploads
+              subPath: file_cache
+              mountPath: /app/samvera/file_cache
+            - name: uploads
+              subPath: uploads
+              mountPath: /app/samvera/uploads
+            {{- if .Values.applicationExistingClaim }}
+            - name: application
+              mountPath: /app/samvera/hyrax-webapp
+            {{- end }}
+            {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- with .Values.extraContainerConfiguration }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+      volumes:
+        - name: "branding"
+          {{- if and .Values.brandingVolume.enabled .Values.brandingVolume.existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.brandingVolume.existingClaim }}
+          {{- else if .Values.brandingVolume.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "hyrax.fullname" . }}-branding
+          {{ else }}
+          emptyDir: {}
+          {{ end }}
+        - name: "derivatives"
+          {{- if and .Values.derivativesVolume.enabled .Values.derivativesVolume.existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.derivativesVolume.existingClaim }}
+          {{- else if .Values.derivativesVolume.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "hyrax.fullname" . }}-derivatives
+          {{ else }}
+          emptyDir: {}
+          {{ end }}
+        - name: "uploads"
+          {{- if and .Values.uploadsVolume.enabled .Values.uploadsVolume.existingClaim }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.uploadsVolume.existingClaim }}
+          {{- else if .Values.uploadsVolume.enabled }}
+          persistentVolumeClaim:
+            claimName: {{ template "hyrax.fullname" . }}-uploads
+          {{ else }}
+          emptyDir: {}
+          {{ end }}
+        {{- if .Values.applicationExistingClaim }}
+        - name: "application"
+          persistentVolumeClaim:
+            claimName: {{ .Values.applicationExistingClaim }}
+        {{- end }}
+        {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

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

@@ -0,0 +1,14 @@
+{{- if and .Values.derivativesVolume.enabled (not .Values.derivativesVolume.existingClaim) }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ template "hyrax.fullname" . }}-derivatives
+  labels:
+    {{- include "hyrax.labels" . | nindent 4 }}
+spec:
+  {{ include "hyrax.sharedPvcAccessModes" . | nindent 2 }}
+  resources:
+    requests:
+      storage: {{ .Values.derivativesVolume.size }}
+  storageClassName: {{ .Values.derivativesVolume.storageClass }}
+{{- end }}

data/chart/hyrax/templates/ingress.yaml

@@ -1,10 +1,11 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "hyrax.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $beta := semverCompare "<1.19-0" (default .Capabilities.KubeVersion.Version .Values.kubeVersion) -}}
+{{- if $beta }}
 apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
+{{- else }}
+apiVersion: networking.k8s.io/v1
 {{- end }}
 kind: Ingress
 metadata:
@@ -32,10 +33,18 @@ spec:
       http:
         paths:
           {{- range .paths }}
-          - path: {{ . }}
+          - path: {{ .path  }}
+            pathType: {{ .pathType | default "ImplementationSpecific" }}
             backend:
+              {{- if $beta }}
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
+              {{- else }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- end }}
           {{- end }}
     {{- end }}
   {{- end }}