Merge pull request #67 from formancehq/fix/portal_tag_on_previous_repo

fix: portal tag
formancehq · Oct 29, 2024 · 1b4b03b · 1b4b03b
2 parents df165c6 + 4786341
commit 1b4b03b
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/Earthfile b/Earthfile
@@ -47,9 +47,7 @@ pre-commit:
   # Can be done like `+validate`
   BUILD +tests 
   BUILD +package
-  WAIT
-    BUILD +template --TEMPLATE_FILE=contributing.tpl --OUTPUT_FILE=CONTRIBUTING.md
-  END
+  BUILD +template --TEMPLATE_FILE=contributing.tpl --OUTPUT_FILE=CONTRIBUTING.md
   BUILD +template --TEMPLATE_FILE=readme.tpl --OUTPUT_FILE=README.md
 
 # releaser target to upload the helm chart to the github release

diff --git a/README.md b/README.md
@@ -5,12 +5,12 @@
 | Readme | Chart Version | App Version | Description | Hub |
 |--------|---------------|-------------|-------------|-----|
 | [Agent](./charts/agent/README.md) | v2.1.0 |v2.0.18 | Formance Membership Agent Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/agent)](https://artifacthub.io/packages/search?repo=agent) |
-| [Cloudprem](./charts/cloudprem/README.md) | v2.0.0-beta.33 |v0.35.3 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
+| [Cloudprem](./charts/cloudprem/README.md) | v2.0.0-beta.34 |v0.35.3 | Formance control-plane | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem) |
 | [Console](./charts/console/README.md) | v1.0.0-beta.12 |fccc26c5b568781b86fbd06c651399c0edd67bac | Formance Console | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/console)](https://artifacthub.io/packages/search?repo=console) |
 | [Core](./charts/core/README.md) | v1.0.0-beta.7 |latest | Formance Core Library | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/core)](https://artifacthub.io/packages/search?repo=core) |
 | [Demo](./charts/demo/README.md) | 2.0.0 |latest | Formance Private Regions Demo | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/demo)](https://artifacthub.io/packages/search?repo=demo) |
 | [Membership](./charts/membership/README.md) | v1.0.0-beta.20 |v0.35.3 | Formance Membership API. Manage stacks, organizations, regions, invitations, users, roles, and permissions. | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/membership)](https://artifacthub.io/packages/search?repo=membership) |
-| [Portal](./charts/portal/README.md) | v1.0.0-beta.12 |191a441519a65dae56a5b2cf56fe64eee03fc059 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
+| [Portal](./charts/portal/README.md) | v1.0.0-beta.13 |191a441519a65dae56a5b2cf56fe64eee03fc059 | Formance Portal | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/portal)](https://artifacthub.io/packages/search?repo=portal) |
 | [Regions](./charts/regions/README.md) | v2.2.0 |latest | Formance Private Regions Helm Chart | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/regions)](https://artifacthub.io/packages/search?repo=regions) |
 | [Stargate](./charts/stargate/README.md) | 0.5.5 |latest | Formance Stargate gRPC Gateway | [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/stargate)](https://artifacthub.io/packages/search?repo=stargate) |
 

diff --git a/charts/cloudprem/Chart.lock b/charts/cloudprem/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: v1.0.0-beta.20
 - name: portal
   repository: file://../portal
-  version: v1.0.0-beta.12
+  version: v1.0.0-beta.13
 - name: console
   repository: file://../console
   version: v1.0.0-beta.12
-digest: sha256:969a7cea8e559e056033744d0d7bfb198223398c95e5025cd7bb958a30f5c615
-generated: "2024-10-29T13:20:04.239318308Z"
+digest: sha256:bf4d736d40f46cfa7078aee7f9d3d22cdc5bc8701cbb1e10836d2046bc37acd5
+generated: "2024-10-29T14:37:12.618907396Z"
diff --git a/charts/cloudprem/Chart.yaml b/charts/cloudprem/Chart.yaml
@@ -32,7 +32,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: "v2.0.0-beta.33"
+version: "v2.0.0-beta.34"
 
 # 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
@@ -49,7 +49,7 @@ dependencies:
     repository: file://../membership
     condition: membership.enabled
   - name: portal
-    version: v1.0.0-beta.12
+    version: v1.0.0-beta.13
     repository: file://../portal
     condition: portal.enabled
   - name: console

diff --git a/charts/cloudprem/README.md b/charts/cloudprem/README.md
@@ -1,5 +1,5 @@
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cloudprem)](https://artifacthub.io/packages/search?repo=cloudprem)
-![Version: v2.0.0-beta.33](https://img.shields.io/badge/Version-v2.0.0--beta.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
+![Version: v2.0.0-beta.34](https://img.shields.io/badge/Version-v2.0.0--beta.34-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.35.3](https://img.shields.io/badge/AppVersion-v0.35.3-informational?style=flat-square)
 
 # Formance Cloudprem Helm Chart
 

diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
@@ -23,7 +23,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: "v1.0.0-beta.12"
+version: "v1.0.0-beta.13"
 
 # 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

diff --git a/charts/portal/README.md b/charts/portal/README.md
@@ -1,6 +1,6 @@
 # portal
 
-![Version: v1.0.0-beta.12](https://img.shields.io/badge/Version-v1.0.0--beta.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 191a441519a65dae56a5b2cf56fe64eee03fc059](https://img.shields.io/badge/AppVersion-191a441519a65dae56a5b2cf56fe64eee03fc059-informational?style=flat-square)
+![Version: v1.0.0-beta.13](https://img.shields.io/badge/Version-v1.0.0--beta.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 191a441519a65dae56a5b2cf56fe64eee03fc059](https://img.shields.io/badge/AppVersion-191a441519a65dae56a5b2cf56fe64eee03fc059-informational?style=flat-square)
 
 Formance Portal
 

diff --git a/charts/portal/templates/deployment.yaml b/charts/portal/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
         - name: {{ include "core.fullname" . }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{.Values.image.pullPolicy}}
           ports:
             - containerPort: 3000

diff --git a/tools/readme/Earthfile b/tools/readme/Earthfile
@@ -19,7 +19,8 @@ template:
   FROM +sources  
   WORKDIR /src
   COPY --dir (root+sources/*/* --PATH=assets) assets
-  COPY --dir (root+sources/*/* --PATH=charts) charts
+  COPY --dir (root+validate/*) .
+
   DO --pass-args +GENERATE
 
 GENERATE: