Skip to content

Commit

Permalink
Fix service variable
Browse files Browse the repository at this point in the history
  • Loading branch information
akoptelov committed Nov 16, 2023
1 parent 825056f commit 929daac
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 21 deletions.
2 changes: 1 addition & 1 deletion mina-common/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: mina-test-common
description: Common templates for Mina test nodes
type: library
version: 0.0.1
version: 0.0.2
appVersion: "0.0.0"
2 changes: 1 addition & 1 deletion mina-common/templates/_ip.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ External service address
*/}}
{{- define "mina-common.service-external-ip" }}
{{- $name := include "mina-common.fullname" . | upper }}
{{- printf "$(%s_SERVICE_HOST)" (regexReplaceAll "[^A-Z_]" $name "_") }}
{{- printf "$(%s_SERVICE_HOST)" (regexReplaceAll "-" $name "_") }}
{{- end }}
6 changes: 3 additions & 3 deletions ocaml-test-node/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: mina-test-common
repository: file://../mina-common
version: 0.0.1
digest: sha256:c13c24e4a92368b1f1015144292e55432c5e0a23c1a2b6fa63c9b2e8bdfe3ff4
generated: "2023-11-13T12:34:00.297609804+03:00"
version: 0.0.2
digest: sha256:06b9035c0407b0125c921251a176d591944cd8abcabab5ff525c4e411303eda2
generated: "2023-11-16T12:51:57.76816585+03:00"
4 changes: 2 additions & 2 deletions ocaml-test-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: ocaml-test-node
description: A Helm chart for OCaml Mina test node.
type: application
version: 0.0.1
version: 0.0.2

# 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 @@ -13,4 +13,4 @@ appVersion: "2.0.0rampup4"
dependencies:
- name: mina-test-common
repository: file://../mina-common
version: ">=0.0.0"
version: ">=0.0.2"
9 changes: 2 additions & 7 deletions ocaml-test-node/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Expand the name of the chart.
*/}}
{{- define "ocaml-test-node.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- include "mina-common.name" . }}
{{- end }}

{{/*
Expand All @@ -11,12 +11,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
If release name contains chart name it will be used as a full name.
*/}}
{{- define "ocaml-test-node.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
{{- $name := default .Chart.Name .Values.nameOverride }}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
{{- end }}
{{- include "mina-common.fullname" . }}
{{- end }}

{{/*
Expand Down
8 changes: 4 additions & 4 deletions peers-discovery-3-nodes/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: ocaml-test-node
repository: file://../ocaml-test-node
version: 0.0.1
version: 0.0.2
- name: ocaml-test-node
repository: file://../ocaml-test-node
version: 0.0.1
version: 0.0.2
- name: rust-test-node
repository: file://../rust-test-node
version: 0.0.1
digest: sha256:53de8064ee1edab206f3a112bc82d64d6316dfec5a33305822c9be4e7da8db81
generated: "2023-11-15T21:05:02.976309468+03:00"
digest: sha256:5ad99b514c4ba2afa14e99d3643705f5f3d939abd6253ad4f5a3cb793a2d50c3
generated: "2023-11-16T12:49:09.832980503+03:00"
6 changes: 3 additions & 3 deletions peers-discovery-3-nodes/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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: 0.0.1
version: 0.0.2

# 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 @@ -28,11 +28,11 @@ dependencies:
- name: ocaml-test-node
repository: file://../ocaml-test-node
alias: seed
version: ">=0.0.0"
version: ">=0.0.2"
- name: ocaml-test-node
alias: ocaml
repository: file://../ocaml-test-node
version: ">=0.0.0"
version: ">=0.0.2"
- name: rust-test-node
alias: rust
repository: file://../rust-test-node
Expand Down

0 comments on commit 929daac

Please sign in to comment.