Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ scripts/keycloak/data/*

# ignore clowder chart deps
charts/clowder2/charts
charts/clowder2/*clowder2-software-dev.yaml
12 changes: 6 additions & 6 deletions charts/clowder2/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ dependencies:
version: 12.1.31
- name: minio
repository: https://charts.bitnami.com/bitnami
version: 11.10.3
version: 12.4.1
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
version: 10.3.6
version: 10.3.9
- name: elasticsearch
repository: https://charts.bitnami.com/bitnami
version: 19.4.2
version: 19.6.0
- name: keycloak
repository: https://charts.bitnami.com/bitnami
version: 10.1.2
digest: sha256:0c0e022885173885dfd6097d9a39dc22082515c41b93cda8cf9756a5d019a84f
generated: "2022-09-30T15:19:12.308156-05:00"
version: 10.1.8
digest: sha256:d52221818b2233d275b91bda548e754aefe1de44398cd11ae9de0b1e2b4de60a
generated: "2023-04-27T12:21:59.835914-05:00"
4 changes: 2 additions & 2 deletions charts/clowder2/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ description: >
# 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.0
version: 0.1.1

# 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
Expand All @@ -40,7 +40,7 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
condition: mongodb.enabled
- name: minio
version: ~11
version: ~12
repository: https://charts.bitnami.com/bitnami
condition: minio.enabled
- name: rabbitmq
Expand Down
9 changes: 4 additions & 5 deletions charts/clowder2/templates/backend/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@ spec:
imagePullPolicy: {{ .Values.backend.image.pullPolicy }}
env:
- name: WEB_CONCURRENCY
value: "4"
value: "1"
- name: MINIO_SERVER_URL
value: {{ include "clowder2.name" . }}-minio-headless:9000
value: {{ include "clowder2.name" . }}-minio:9000
# value: {{ include "clowder2.name" . }}-minio-headless:9000
- name: MINIO_BUCKET_NAME
value: clowder
- name: MINIO_ACCESS_KEY
Expand Down Expand Up @@ -87,9 +88,7 @@ spec:
name: clowder2-rabbitmq
key: rabbitmq-password
- name: RABBITMQ_HOST
value: {{ include "clowder2.name" . }}
- name: RABBITMQ_URL
value: amqp://$(RABBITMQ_USER):$(RABBITMQ_PASS)@$(RABBITMQ_HOST)/
value: {{ include "clowder2.name" . }}-rabbitmq
- name: HEARTBEAT_EXCHANGE
value: "extractors"
ports:
Expand Down
8 changes: 6 additions & 2 deletions charts/clowder2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ minio:
hostname: minio.clowder2.localhost

# enabled distributed mode (or standalone)
mode: distributed
# mode: distributed
mode: standalone

# if you pick distributed, this needs to be >= 4
statefulset:
replicaCount: 4
# replicaCount: 4
replicaCount: 1

# persistence
persistence:
Expand All @@ -90,6 +92,8 @@ minio:

# where to store data, can be network storage
#storageClass: nfs-taiga
service:
type: ClusterIP

# ----------------------------------------------------------------------
# MONGODB
Expand Down