Skip to content

Commit

Permalink
finish initial helm deploys
Browse files Browse the repository at this point in the history
  • Loading branch information
tamsin johnson committed Sep 3, 2020
1 parent 8c31b8f commit b5a3e29
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 5 deletions.
7 changes: 7 additions & 0 deletions .dassie/values.stage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ingress:
enabled: true
annotations: {}
hosts:
- host: "staging.dassie.dld.library.ucsb.edu"
paths: ["/"]
tls: []
97 changes: 97 additions & 0 deletions .dassie/values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Default values for hyrax.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

replicaCount: 1

image:
repository: samveralabs/dassie
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "stable"

imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""

podAnnotations: {}

podSecurityContext: {}
# fsGroup: 2000

securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000

service:
type: ClusterIP
port: 80

ingress:
enabled: true
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
hosts:
- host: "dassie.dld.library.ucsb.edu"
paths: ["/"]
tls: []

resources: {}

fcrepo:
enabled: true
fcrepoSecretName: "hyrax.fcrepo.fullname"
externalDatabaseUsername: "hyrax"
servicePort: 8080
postgresql:
enabled: false

memcached:
enabled: true

postgresql:
enabled: true
image:
repository: bitnami/postgresql
tag: 12.3.0
postgresqlUsername: hyrax
postgresqlPassword: hyrax_pass
postgresqlDatabase: hyrax
servicePort: 5432
# cpu: 1000m
# memory: 1Gi
# persistence:
# size: 10Gi

redis:
enabled: true

solr:
enabled: true

autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 100
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80

nodeSelector: {}

tolerations: []

affinity: {}
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ WORKDIR /app/samvera/hyrax-webapp

COPY --chown=1001:101 ./bin /app/samvera
ENV PATH="/app/samvera:$PATH"
ENV RAILS_SERVE_STATIC_FILES="1"

ENTRYPOINT ["hyrax-entrypoint.sh"]
CMD ["bundle", "exec", "puma", "-v", "-b", "tcp://0.0.0.0:3000"]
Expand All @@ -35,7 +36,7 @@ ARG BUNDLE_WITHOUT="development test"

ONBUILD COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
ONBUILD RUN bundle install --jobs "$(nproc)"
ONBUILD RUN DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake yarn:install assets:precompile
ONBUILD RUN DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile

FROM hyrax-base as hyrax-engine-dev

Expand All @@ -48,4 +49,4 @@ COPY --chown=1001:101 $APP_PATH /app/samvera/hyrax-webapp
COPY --chown=1001:101 . /app/samvera/hyrax-engine

RUN bundle install --jobs "$(nproc)"
RUN DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake yarn:install assets:precompile
RUN DB_ADAPTER=nulldb DATABASE_URL='postgresql://fake' bundle exec rake assets:precompile
2 changes: 1 addition & 1 deletion chart/fcrepo/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: fcrepo
description: Fedora Commons Repository 4
type: application
version: 0.3.0
version: 0.4.0
appVersion: 4.7
dependencies:
- name: postgresql
Expand Down
4 changes: 2 additions & 2 deletions chart/hyrax/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ apiVersion: v2
name: hyrax
description: An open-source, Samvera-powered digital repository system
type: application
version: 0.3.0
version: 0.4.0
appVersion: 3.0.0-rc2
dependencies:
- name: fcrepo
version: 0.3.0
version: 0.4.0
repository: file://../fcrepo
- name: memcached
version: 4.2.21
Expand Down

0 comments on commit b5a3e29

Please sign in to comment.