Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
7fd16c7
wistefan Jan 19, 2024
934cccb
dont skip
wistefan Jan 19, 2024
b0b3fca
try to set with yq
wistefan Jan 19, 2024
8bf2cf0
wistefan Jan 19, 2024
b757447
wistefan Jan 19, 2024
96fbffb
wistefan Jan 19, 2024
670ec53
wistefan Jan 19, 2024
586edc8
set differetn
wistefan Jan 19, 2024
cfcc418
wistefan Jan 19, 2024
1721264
wistefan Jan 19, 2024
6b4030d
wistefan Jan 19, 2024
2c2cfad
wistefan Jan 19, 2024
229303d
more echo
wistefan Jan 19, 2024
ba3b59f
wistefan Jan 19, 2024
ae56ed0
wistefan Jan 19, 2024
4ca4617
wistefan Jan 19, 2024
3ac6776
wistefan Jan 19, 2024
5b8e78c
wistefan Jan 19, 2024
7a9f90f
wistefan Jan 19, 2024
cf425cf
wistefan Jan 19, 2024
f6e9e9e
wistefan Jan 19, 2024
423ba72
change
wistefan Jan 19, 2024
8cc928e
wistefan Jan 19, 2024
45bfb43
only gh path
wistefan Jan 19, 2024
9b1e2fc
wistefan Jan 19, 2024
a1d3ca4
wistefan Jan 19, 2024
e6b3d1c
wistefan Jan 19, 2024
7cdeddc
wistefan Jan 19, 2024
81af4ae
wistefan Jan 19, 2024
e14601e
log
wistefan Jan 19, 2024
380a288
wistefan Jan 19, 2024
76578c6
wistefan Jan 19, 2024
29ababa
wistefan Jan 19, 2024
9f806db
skip
wistefan Jan 19, 2024
8ab9321
wistefan Jan 19, 2024
720349a
wistefan Jan 19, 2024
fba201f
wistefan Jan 19, 2024
59a56b4
wistefan Jan 19, 2024
f7aa82e
wistefan Jan 19, 2024
f181b95
more try
wistefan Jan 19, 2024
f241496
wistefan Jan 19, 2024
54da306
fix repo path
wistefan Jan 19, 2024
509b02e
in one step
wistefan Jan 19, 2024
93ad77c
las
wistefan Jan 19, 2024
7c2e9f0
wistefan Jan 19, 2024
71cfe54
mkdir
wistefan Jan 19, 2024
5f081fd
wistefan Jan 19, 2024
c57b4df
wistefan Jan 19, 2024
48d0b87
wistefan Jan 19, 2024
20f350b
wistefan Jan 19, 2024
6033ee3
commit
wistefan Jan 19, 2024
43dcb74
wistefan Jan 22, 2024
d5c3805
Merge branch 'main' into prepare-pre
wistefan Jan 22, 2024
feed3b5
wistefan Jan 22, 2024
501b57f
Merge remote-tracking branch 'origin/prepare-pre' into prepare-pre
wistefan Jan 22, 2024
4c97f74
wistefan Jan 22, 2024
878667e
not yet there
wistefan Jan 22, 2024
004f474
wistefan Jan 22, 2024
07755e7
use the working version
wistefan Jan 22, 2024
f788563
wistefan Jan 22, 2024
3965a2c
setup helm
wistefan Jan 22, 2024
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
70 changes: 70 additions & 0 deletions .github/workflows/pre-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Pre-Release

on:
pull_request:
types:
- opened
- synchronize
- reopened
- labeled
- unlabeled

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Fetch history
run: git fetch --prune --unshallow

- name: Configure Git
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"

- name: Install Helm
run: |
curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
chmod 700 get_helm.sh
./get_helm.sh

# prepare yaml parser
- uses: actions/setup-go@v4
- name: Install yq
run: |
go install github.com/mikefarah/yq/v4@latest
yq --version

- name: Set the version
run: |
version=$(yq e '.version' "./charts/access-node/Chart.yaml")
yq e -i '.version = "'$version'-PRE"' ./charts/access-node/Chart.yaml


- name: Run chart-releaser
uses: helm/chart-releaser-action@main
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_SKIP_EXISTING: true
with:
skip_upload: true


- name: Create index.yaml
run: |
owner=$(cut -d '/' -f 1 <<< "$GITHUB_REPOSITORY")
repo=$(cut -d '/' -f 2 <<< "$GITHUB_REPOSITORY")
git checkout --orphan gh-pages
cr index -o "$owner" -r "$repo"

mkdir pre
mv .cr-index/index.yaml pre/index.yaml

git add pre/index.yaml
git commit -m "add pre-index"
git push --force --set-upstream origin gh-pages


2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_SKIP_EXISTING: true
with:
pages_branch: chart-repo
pages_branch: gh-pages
2 changes: 2 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
with:
java-version: '17'
java-package: jdk

- uses: azure/setup-helm@v3

- name: Execute tests
id: test
Expand Down
8 changes: 4 additions & 4 deletions charts/access-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ appVersion: 0.0.1
dependencies:
- name: blockchain-connector
condition: blockchain-connector.enabled
repository: file://../blockchain-connector
repository: https://wistefan.github.io/access-node/pre
version: 0.1.0
- name: broker-adapter
condition: broker-adapter.enabled
repository: file://../broker-adapter
repository: https://wistefan.github.io/access-node/pre
version: 0.1.0
- name: dlt-adapter
condition: dlt-adapter.enabled
repository: file://../dlt-adapter
version: 1.0.0
repository: https://wistefan.github.io/access-node/pre
version: 1.0.3
- name: kafka
condition: kafka.enabled
repository: oci://registry-1.docker.io/bitnamicharts
Expand Down
2 changes: 1 addition & 1 deletion charts/dlt-adapter/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: dlt-adapter
description: A Helm chart for DLT Adapter component

type: application
version: 1.0.0
version: 1.0.3
appVersion: "1.2.1"

sources:
Expand Down
10 changes: 5 additions & 5 deletions charts/dlt-adapter/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ spec:
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
successThreshold: {{ .Values.readinessProbe.successThreshold }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
env:
- name: PRIVATE_KEY
value: {{ .Values.deployment.privateKey }}
- name: CONTRACT_ADDRESS
value: {{ .Values.deployment.contractAddress }}
env:
- name: PRIVATE_KEY
value: {{ .Values.deployment.privateKey }}
- name: CONTRACT_ADDRESS
value: {{ .Values.deployment.contractAddress }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
Expand Down
94 changes: 84 additions & 10 deletions charts/dlt-adapter/values.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,88 @@
deployment:
image:
repository: quay.io/wi_stefan/dlt-adapter
# -- tag of the image to be used
tag: latest
# -- specification of the image pull policy
pullPolicy: Always
logLevel: DEBUG
# Default values for dltAdapter.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

replicaCount: 2

image:
repository: quay.io/digitelts/dlt-adapter
pullPolicy: Always
tag: ""
port: 8080

service:
port: 8080
type: ClusterIP
port: 8080

livenessProbe:
initialDelaySeconds: 30
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 30
readinessProbe:
initialDelaySeconds: 31
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 30

autoscaling:
enabled: false
minReplicas: 1
maxReplicas: 100
targetCPUUtilizationPercentage: 80
# targetMemoryUtilizationPercentage: 80

## configuration for prometheus monitoring
prometheus:
# -- should prometheus scrape be enabled
enabled: false
# -- path for prometheus scrape
path: /prometheus
# -- port prometheus scrape is available at
port: 8081

imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""

serviceAccount:
# Specifies whether a service account should be created
create: false
# Annotations to add to the service account
annotations: {}
# The name of the service account to use.
# If not set and create is true, a name is generated using the fullname template
name: ""

podAnnotations: {}

podSecurityContext: {}
# fsGroup: 2000

securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000

resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user.
# If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi



nodeSelector: {}

tolerations: []

fullnameOverride: dlt-adapter
affinity: {}
15 changes: 15 additions & 0 deletions it/consumer-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,21 @@ dlt-adapter:
deployment:
privateKey: 0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f
contractAddress: 0x37532a3dbf29942d10fb8ba57dc35d2134fe494d
replicaCount: 1
image:
repository: quay.io/wi_stefan/dlt-adapter
# -- tag of the image to be used
tag: latest
# -- specification of the image pull policy
pullPolicy: Always
logLevel: DEBUG
fullnameOverride: dlt-adapter

service:
port: 8080
type: ClusterIP

fullnameOverride: dlt-adapter

tm-forum-api:
defaultConfig:
Expand Down
9 changes: 9 additions & 0 deletions it/provider-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ dlt-adapter:
deployment:
privateKey: 0x304d170fb355df65cc17ef7934404fe9baee73a1244380076436dec6fafb1e1f
contractAddress: 0x37532a3dbf29942d10fb8ba57dc35d2134fe494d
replicaCount: 1
image:
repository: quay.io/wi_stefan/dlt-adapter
# -- tag of the image to be used
tag: latest
# -- specification of the image pull policy
pullPolicy: Always
logLevel: DEBUG
fullnameOverride: dlt-adapter

tm-forum-api:
defaultConfig:
Expand Down