From e429fbb54809cee210756316d199424e007e85cc Mon Sep 17 00:00:00 2001 From: skudasov Date: Thu, 30 Nov 2023 21:56:49 +0100 Subject: [PATCH] cleanup & verify --- charts/chainlink-cluster/Chart.yaml | 8 +- charts/chainlink-cluster/README.md | 6 +- charts/chainlink-cluster/devspace.yaml | 109 +++++------------- .../{values-raw-helm.yaml => values.yaml} | 8 +- 4 files changed, 40 insertions(+), 91 deletions(-) rename charts/chainlink-cluster/{values-raw-helm.yaml => values.yaml} (95%) diff --git a/charts/chainlink-cluster/Chart.yaml b/charts/chainlink-cluster/Chart.yaml index f242ef84cbd..b80d1f74a61 100644 --- a/charts/chainlink-cluster/Chart.yaml +++ b/charts/chainlink-cluster/Chart.yaml @@ -2,10 +2,4 @@ apiVersion: v1 name: chainlink-cluster description: Chainlink nodes cluster version: 0.1.3 -appVersion: "2.6.0" - -dependencies: - - name: mockserver - version: "5.14.0" - repository: "@mockserver" - condition: mockserver.enabled +appVersion: "2.6.0" \ No newline at end of file diff --git a/charts/chainlink-cluster/README.md b/charts/chainlink-cluster/README.md index e3cec129a91..5fb55536635 100644 --- a/charts/chainlink-cluster/README.md +++ b/charts/chainlink-cluster/README.md @@ -74,10 +74,10 @@ After that all the changes will be synced automatically Check `.profiles` to understand what is uploaded in profiles `runner` and `node` # Helm -If you would like to use `helm` directly, please uncomment data in `values-raw-helm.yaml` +If you would like to use `helm` directly, please uncomment data in `values.yaml` ## Install from local files ``` -helm install -f values-raw-helm.yaml cl-cluster . +helm install -f values.yaml cl-cluster . ``` Forward all apps (in another terminal) ``` @@ -99,7 +99,7 @@ kubectl config set-context --current --namespace cl-cluster Install ``` -helm install -f values-raw-helm.yaml cl-cluster chainlink-cluster/chainlink-cluster --version v0.1.2 +helm install -f values.yaml cl-cluster . ``` ## Create a new release diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml index 9c39209ff5c..cb4c8bfce49 100644 --- a/charts/chainlink-cluster/devspace.yaml +++ b/charts/chainlink-cluster/devspace.yaml @@ -58,6 +58,38 @@ deployments: - name: node-1 image: ${DEVSPACE_IMAGE} version: latest + # override default config per node + # for example, use OCRv2 P2P setup, the whole config + # toml: | + # RootDir = './clroot' + # [Log] + # JSONConsole = true + # Level = 'debug' + # [WebServer] + # AllowOrigins = '*' + # SecureCookies = false + # SessionTimeout = '999h0m0s' + # [OCR2] + # Enabled = true + # [P2P] + # [P2P.V2] + # Enabled = false + # AnnounceAddresses = [] + # DefaultBootstrappers = [] + # DeltaDial = '15s' + # DeltaReconcile = '1m0s' + # ListenAddresses = [] + # [[EVM]] + # ChainID = '1337' + # MinContractPayment = '0' + # [[EVM.Nodes]] + # Name = 'node-0' + # WSURL = 'ws://geth:8546' + # HTTPURL = 'http://geth:8544' + # [WebServer.TLS] + # HTTPSPort = 0 + # or use overridesToml to override some part of configuration + # overridesToml: | - name: node-2 image: ${DEVSPACE_IMAGE} version: latest @@ -192,83 +224,6 @@ deployments: nodeSelector: tolerations: affinity: -# podSecurityContext: -# fsGroup: 999 -# runner: -# image: ${DEVSPACE_IMAGE} -# stateful: false -# geth: -# podSecurityContext: -# fsGroup: 999 -# securityContext: -# capabilities: -# drop: -# - ALL -# readOnlyRootFilesystem: false -# runAsNonRoot: true -# runAsUser: 999 -# runAsGroup: 999 -# version: v1.12.0 -# wsrpc-port: 8546 -# httprpc-port: 8544 -# networkid: 1337 -# blocktime: 1 -# mockserver: -# enabled: true -# releasenameOverride: mockserver -# app: -# runAsUser: 999 -# readOnlyRootFilesystem: false -# port: 1080 -# db: -# podSecurityContext: -# fsGroup: 999 -# securityContext: -# capabilities: -# drop: -# - ALL -# readOnlyRootFilesystem: false -# runAsNonRoot: true -# runAsUser: 999 -# runAsGroup: 999 -# stateful: false -# chainlink: -# podSecurityContext: -# fsGroup: 14933 -# securityContext: -# capabilities: -# drop: -# - ALL -# readOnlyRootFilesystem: false -# runAsNonRoot: true -# runAsUser: 14933 -# runAsGroup: 14933 -# web_port: 6688 -# p2p_port: 6690 -# nodes: -# - name: node-1 -# image: ${DEVSPACE_IMAGE} -# version: latest -# - name: node-2 -# image: ${DEVSPACE_IMAGE} -# version: latest -# - name: node-3 -# image: ${DEVSPACE_IMAGE} -# version: latest -# - name: node-4 -# image: ${DEVSPACE_IMAGE} -# version: latest -# - name: node-5 -# image: ${DEVSPACE_IMAGE} -# version: latest -# - name: node-6 -# image: ${DEVSPACE_IMAGE} -# version: latest -# prometheusMonitor: "true" -# podAnnotations: {} -# nodeSelector: {} -# tolerations: [] -# affinity: {} profiles: # this replaces only "runner" pod, usable when you'd like to run some system level tests inside k8s diff --git a/charts/chainlink-cluster/values-raw-helm.yaml b/charts/chainlink-cluster/values.yaml similarity index 95% rename from charts/chainlink-cluster/values-raw-helm.yaml rename to charts/chainlink-cluster/values.yaml index 99f52e82c2d..646cb631490 100644 --- a/charts/chainlink-cluster/values-raw-helm.yaml +++ b/charts/chainlink-cluster/values.yaml @@ -26,8 +26,8 @@ chainlink: nodes: - name: node-1 image: "public.ecr.aws/chainlink/chainlink:latest" - # override default config per node - # for example, use OCRv2 P2P setup, the whole config + # override default config per node + # for example, use OCRv2 P2P setup, the whole config # toml: | # RootDir = './clroot' # [Log] @@ -56,8 +56,8 @@ chainlink: # HTTPURL = 'http://geth:8544' # [WebServer.TLS] # HTTPSPort = 0 -# or use overridesToml to override some part of configuration -# overridesToml: | + # or use overridesToml to override some part of configuration + # overridesToml: | - name: node-2 - name: node-3 - name: node-4