Skip to content

Commit

Permalink
fixed naming nuances. getting chart to work in docker desktop
Browse files Browse the repository at this point in the history
  • Loading branch information
artntek committed May 7, 2024
1 parent 939360d commit 1fcf6ad
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
6 changes: 3 additions & 3 deletions helm/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
version: 10.1.14
version: 14.1.0
- name: solr
repository: https://charts.bitnami.com/bitnami
version: 6.2.3
digest: sha256:8a0c7f616956207f7a5161ec1f5f3b58c432b8c8051ad4ef927dacee81c52be9
generated: "2022-10-26T16:58:14.484158-08:00"
digest: sha256:2d4c537383443f6a46dc8c4aa9d3967bad13cc8ac290e22abc3e7850e7c6f464
generated: "2024-05-06T17:40:27.189768-07:00"
8 changes: 5 additions & 3 deletions helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type: application
# 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: 1.0.0
version: 1.0.1-develop

# 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 @@ -31,9 +31,11 @@ appVersion: "3.0.0"

# Chart dependencies
dependencies:
- name: rabbitmq # rabbitmq version 3.10.5 is deployed by chart version 10.1.14
- name: rabbitmq
repository: https://charts.bitnami.com/bitnami
version: 10.1.14
# version: 10.1.14 # rabbitmq version 3.10.5 is deployed by chart version 10.1.14
# version: 10.1.19 # rabbitmq version 3.10.7 is deployed by chart version 10.1.19
version: 14.1.0 # rabbitmq version 3.13.1 is deployed by chart version 14.1.0
condition: rabbitmq.enabled, global.rabbitmq.enabled
- name: solr
repository: https://charts.bitnami.com/bitnami
Expand Down
6 changes: 3 additions & 3 deletions helm/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -71,20 +71,20 @@ If connecting to an instance outside the cluster, should use https;
{{- define "idxworker.mn.url" -}}
{{- $mn_url := .Values.idxworker.mn_url }}
{{- if not $mn_url }}
{{- $mn_url = printf "http://%s-hl:8080/%s/d1/mn" .Release.Name .Values.global.metacatAppContext }}
{{- $mn_url = printf "http://%s-hl:8080/%s/d1/mn" (include "idxworker.fullname" .) .Values.global.metacatAppContext }}
{{- end }}
{{- $mn_url }}
{{- end }}
{{/*
set Claim Name of existing PVC to use (typically the volume that is shared with metacat)
Either use the value set in .Values.persistence.claimName, or if blank, autopopulate with
{podname}-metacat-{releaseName}-0 (e.g. metacatbrooke-metacat-metacatbrooke-0)
{podname}-metacat-{releaseName}-0 (e.g. metacatbrooke-metacat-metacatbrooke-metacat-0)
*/}}
{{- define "idxworker.shared.claimName" -}}
{{- $claimName := .Values.persistence.claimName }}
{{- if not $claimName }}
{{- $claimName = printf "%s-metacat-%s-0" .Release.Name .Release.Name }}
{{- $claimName = printf "%s-metacat-%s-0" .Release.Name (include "idxworker.fullname" .) }}
{{- end }}
{{- $claimName }}
{{- end }}
Expand Down

0 comments on commit 1fcf6ad

Please sign in to comment.