Skip to content

Fix Hyperledger Image Refs and Migration Job's Postgres URL in Helm Chart #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2021
Merged

Fix Hyperledger Image Refs and Migration Job's Postgres URL in Helm Chart #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15f5da0
Fix Postgres URL in Helm Migration Job
onelapahead Nov 30, 2021
a3d9686
Latest releases; other comments / notes
onelapahead Dec 1, 2021
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
9 changes: 5 additions & 4 deletions deploy/charts/firefly/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apiVersion: v2
name: firefly
description: A Helm chart for Kubernetes
description: A Helm chart for deploying FireFly and FireFly HTTPS Dataexchange onto Kubernetes.
type: application
# TODO appVersion and version might be the same once an official FireFly release is made
appVersion: "0.0.1"
version: "0.0.1"
appVersion: "0.11.1"
version: "0.1.0"

maintainers:
- name: hfuss
email: hayden.fuss@kaleido.io
- name: drewmarshburn
email: drew.marshburn@kaleido.io
- name: peterbroadhurst
email: peter.broadhurst@kaleido.io
3 changes: 3 additions & 0 deletions deploy/charts/firefly/templates/core/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ metadata:
labels:
{{- include "firefly.coreLabels" . | nindent 4 }}
stringData:
{{- if and .Values.config.postgresUrl .Values.config.postgresMigrationJob -}}
psql_url: {{ tpl .Values.config.postgresUrl . }}
{{- end }}
firefly.core: |
{{- if .Values.config.templateOverride }}
{{- toYaml (tpl .Values.config.templateOverride .) | nindent 4 }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/firefly/templates/core/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- name: firefly
securityContext:
{{- toYaml .Values.core.securityContext | nindent 12 }}
image: "{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Chart.AppVersion }}"
image: "{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
imagePullPolicy: {{ .Values.core.image.pullPolicy }}
env:
- name: FIREFLY_NODE_NAME
Expand Down
15 changes: 8 additions & 7 deletions deploy/charts/firefly/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ config:
# Configures the properties of the StatefulSet, Service, and optionally Ingress used to deploy and expose FireFly
core:
image:
repository: ghcr.io/hyperledger-labs/firefly
repository: ghcr.io/hyperledger/firefly
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: latest
# tag: latest

extraEnv: []
# - name: FIREFLY_LOG_LEVEL
Expand Down Expand Up @@ -187,10 +187,10 @@ dataexchange:
# value: DEBUG

image:
repository: ghcr.io/hyperledger-labs/firefly-dataexchange-https
repository: ghcr.io/hyperledger/firefly-dataexchange-https
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: latest
tag: v0.9.2

imagePullSecrets: []
nameOverride: ""
Expand All @@ -215,13 +215,14 @@ dataexchange:
p2pPort: 5001

# The Ingress templated will only expose the HTTPS DataExchange P2P endpoint, as its API will only need to be accessible to FireFly
# NOTE: tls is not templatable for the Ingress since it is provided as part of the mTLS certificate above.
# NOTE: TLS is not templatable for the Ingress since it is provided as part of the mTLS certificate above. TLS passthrough
# must be enabled for the Ingress in order for mTLS to work, make sure to set the appropriate annotation for your
# respective Ingress controller. See below for an example of the passthrough annotation for ingress-nginx.
ingress:
enabled: false
className: ""
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# nginx.ingress.kubernetes.io/ssl-passthrough: "true"
hosts:
- host: chart-example.local

Expand Down
2 changes: 1 addition & 1 deletion internal/i18n/en_translations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ var (
MsgUnknownDataExchangePlugin = ffm("FF10213", "Unknown Data Exchange plugin '%s'")
MsgParentIdentityNotFound = ffm("FF10214", "Organization with identity '%s' not found in identity chain for %s '%s'")
MsgInvalidSigningIdentity = ffm("FF10215", "Invalid signing identity")
MsgNodeAndOrgIDMustBeSet = ffm("FF10216", "node.name, org.name and org.identity must be configured first", 409)
MsgNodeAndOrgIDMustBeSet = ffm("FF10216", "node.name, org.name and org.key must be configured first", 409)
Copy link
Contributor Author

@onelapahead onelapahead Nov 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to the chart changes, but this error message confused me a bit since this is whats displayed when neither org.key nor org.identity are set (which was happening w/ my chart installation due to a bug on my end). It should references the new config key instead rather than the deprecated one.

MsgBlobStreamingFailed = ffm("FF10217", "Blob streaming terminated with error", 500)
MsgMultiPartFormReadError = ffm("FF10218", "Error reading multi-part form input", 400)
MsgGroupMustHaveMembers = ffm("FF10219", "Group must have at least one member", 400)
Expand Down