feat(dashboard): merge conflict

smartcontractkit · Feb 28, 2024 · 7e63148 · 7e63148
2 parents cfff9d3 + 24c3718
commit 7e63148
Show file tree

Hide file tree

Showing 276 changed files with 5,090 additions and 2,002 deletions.
diff --git a/.github/actions/setup-create-base64-config-live-testnets/action.yml b/.github/actions/setup-create-base64-config-live-testnets/action.yml
@@ -94,7 +94,7 @@ runs:
         enabled=$pyroscope_enabled
         server_url="$PYROSCOPE_SERVER"
         environment="$PYROSCOPE_ENVIRONMENT"
-        key="$PYROSCOPE_KEY"
+        key_secret="$PYROSCOPE_KEY"
 
         [Logging]
         run_id="$RUN_ID"
@@ -105,7 +105,7 @@ runs:
         [Logging.Loki]
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_URL"
-        basic_auth="$LOKI_BASIC_AUTH"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
 
         [Logging.Grafana]
         base_url="$GRAFANA_URL"

diff --git a/.github/actions/setup-create-base64-config/action.yml b/.github/actions/setup-create-base64-config/action.yml
@@ -96,7 +96,7 @@ runs:
         enabled=$pyroscope_enabled
         server_url="$PYROSCOPE_SERVER"
         environment="$PYROSCOPE_ENVIRONMENT"
-        key="$PYROSCOPE_KEY"
+        key_secret="$PYROSCOPE_KEY"
 
         [Logging]
         test_log_collect=$test_log_collect
@@ -108,7 +108,7 @@ runs:
         [Logging.Loki]
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_ENDPOINT"
-        basic_auth="$LOKI_BASIC_AUTH"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
 
         [Logging.Grafana]
         base_url="$GRAFANA_URL"

diff --git a/.github/actions/setup-merge-base64-config/action.yml b/.github/actions/setup-merge-base64-config/action.yml
@@ -42,9 +42,9 @@ runs:
         [Logging.Loki]
         tenant_id="$LOKI_TENANT_ID"
         endpoint="$LOKI_URL"
-        basic_auth="$LOKI_BASIC_AUTH"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
         # legacy, you only need this to access the cloud version
-        # bearer_token="bearer_token"
+        # bearer_token_secret="bearer_token"
         EOF
 
         echo "$decoded_toml" >> final_config.toml

diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml
@@ -53,7 +53,7 @@ jobs:
           cat << EOF > config.toml
           server_url="$PYROSCOPE_SERVER"
           environment="$PYROSCOPE_ENVIRONMENT"
-          key="$PYROSCOPE_KEY"
+          key_secret="$PYROSCOPE_KEY"
           EOF
 
           echo "$decoded_toml" >> final_config.toml

diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
@@ -147,7 +147,7 @@ jobs:
       - name: Debug Result
         run: echo ${{ join(needs.*.result, ',') }}
       - name: Main Slack Notification
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         id: slack
         with:
           channel-id: C03KJ5S7KEK
@@ -245,7 +245,7 @@ jobs:
           echo results=$CLEAN_RESULTS >> $GITHUB_OUTPUT
 
       - name: Test Details
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         with:
           channel-id: C03KJ5S7KEK
           payload: |

diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml
@@ -232,7 +232,7 @@ jobs:
           enabled=$pyroscope_enabled
           server_url="$PYROSCOPE_SERVER"
           environment="$PYROSCOPE_ENVIRONMENT"
-          key="$PYROSCOPE_KEY"          
+          key_secret="$PYROSCOPE_KEY"          
           EOF
           
           BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -30,7 +30,7 @@ jobs:
           gc-host: ${{ secrets.GRAFANA_CLOUD_HOST }}
       - name: Notify Slack
         if: ${{ failure() && (github.event_name == 'merge_group' || github.event.branch == 'develop')}}
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
@@ -50,7 +50,7 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup node
-        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
       - name: Setup NodeJS
         uses: ./.github/actions/setup-nodejs
         with:
@@ -122,7 +122,7 @@ jobs:
             ./postgres_logs.txt
       - name: Notify Slack
         if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') }}
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
@@ -151,7 +151,7 @@ jobs:
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup node
-        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v4.0.1
+        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
       - name: Setup NodeJS
         uses: ./.github/actions/setup-nodejs
         with:

diff --git a/.github/workflows/client-compatibility-tests.yml b/.github/workflows/client-compatibility-tests.yml
@@ -202,7 +202,7 @@ jobs:
           enabled=$pyroscope_enabled
           server_url="$PYROSCOPE_SERVER"
           environment="$PYROSCOPE_ENVIRONMENT"
-          key="$PYROSCOPE_KEY"
+          key_secret="$PYROSCOPE_KEY"
 
           [PrivateEthereumNetwork]
           consensus_type="pos"
@@ -258,7 +258,7 @@ jobs:
       - name: Debug Result
         run: echo ${{ join(needs.*.result, ',') }}
       - name: Main Slack Notification
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         id: slack
         with:
           channel-id: ${{ secrets.QA_SLACK_CHANNEL }}

diff --git a/.github/workflows/goreleaser-build-publish-develop.yml b/.github/workflows/goreleaser-build-publish-develop.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Configure aws credentials
-        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_IAM_ROLE_ARN }}
           role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }}
@@ -59,7 +59,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Configure aws credentials
-        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN_GATI }}
           role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }}

diff --git a/.github/workflows/helm-chart-publish.yml b/.github/workflows/helm-chart-publish.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Configure aws credentials
-        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_ROLE_ARN_GATI }}
           role-duration-seconds: ${{ secrets.AWS_ROLE_DURATION_SECONDS }}

diff --git a/.github/workflows/integration-staging-tests.yml b/.github/workflows/integration-staging-tests.yml
@@ -89,7 +89,7 @@ jobs:
           enabled=$pyroscope_enabled
           server_url="$PYROSCOPE_SERVER"
           environment="$PYROSCOPE_ENVIRONMENT"
-          key="$PYROSCOPE_KEY"
+          key_secret="$PYROSCOPE_KEY"
 
           [Logging]
           run_id="$RUN_ID"
@@ -100,7 +100,7 @@ jobs:
           [Logging.Loki]
           tenant_id="$LOKI_TENANT_ID"
           endpoint="$LOKI_URL"
-          basic_auth="$LOKI_BASIC_AUTH"
+          basic_auth_secret="$LOKI_BASIC_AUTH"
 
           [Logging.Grafana]
           base_url="$GRAFANA_URL"

diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Notify Slack
         # Only run this notification for merge to develop failures
         if: failure() && github.event_name != 'workflow_dispatch'
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -110,7 +110,7 @@ jobs:
           go build ./...
           go test -run=^# ./...
       - name: Lint Go
-        uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
+        uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
         with:
           version: v1.55.2
           # We already cache these directories in setup-go

diff --git a/.github/workflows/lint-gh-workflows.yml b/.github/workflows/lint-gh-workflows.yml
@@ -9,7 +9,7 @@ jobs:
       - name: Check out Code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Run actionlint
-        uses: reviewdog/action-actionlint@82693e9e3b239f213108d6e412506f8b54003586 # v1.39.1
+        uses: reviewdog/action-actionlint@6a38513dd4d2e818798c5c73d0870adbb82de4a4 # v1.41.0
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics

diff --git a/.github/workflows/live-testnet-tests.yml b/.github/workflows/live-testnet-tests.yml
@@ -122,7 +122,7 @@ jobs:
       - name: Debug Result
         run: echo ${{ join(needs.*.result, ',') }}
       - name: Main Slack Notification
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         id: slack
         with:
           channel-id: ${{ secrets.QA_SLACK_CHANNEL }}

diff --git a/.github/workflows/operator-ui-cd.yml b/.github/workflows/operator-ui-cd.yml
@@ -25,7 +25,7 @@ jobs:
         run: ./operator_ui/check.sh
 
       - name: Assume role capable of dispatching action
-        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_CHAINLINK_CI_AUTO_PR_TOKEN_ISSUER_ROLE_ARN }}
           role-duration-seconds: ${{ secrets.aws-role-duration-seconds }}
@@ -39,7 +39,7 @@ jobs:
           url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
 
       - name: Open PR
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2
+        uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0
         with:
           title: Update Operator UI from ${{ steps.update.outputs.current_tag }} to ${{ steps.update.outputs.latest_tag }}
           token: ${{ steps.get-gh-token.outputs.access-token }}

diff --git a/.github/workflows/operator-ui-ci.yml b/.github/workflows/operator-ui-ci.yml
@@ -23,7 +23,7 @@ jobs:
         continue-on-error: true
 
       - name: Assume role capable of dispatching action
-        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
         with:
           role-to-assume: ${{ secrets.AWS_OIDC_CHAINLINK_CI_OPERATOR_UI_ACCESS_TOKEN_ISSUER_ROLE_ARN }}
           role-duration-seconds: 3600

diff --git a/GNUmakefile b/GNUmakefile
@@ -145,7 +145,7 @@ config-docs: ## Generate core node configuration documentation
 .PHONY: golangci-lint
 golangci-lint: ## Run golangci-lint for all issues.
 	[ -d "./golangci-lint" ] || mkdir ./golangci-lint && \
-	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.55.2 golangci-lint run --max-issues-per-linter 0 --max-same-issues 0 > ./golangci-lint/$(shell date +%Y-%m-%d_%H:%M:%S).txt
+	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:v1.56.2 golangci-lint run --max-issues-per-linter 0 --max-same-issues 0 > ./golangci-lint/$(shell date +%Y-%m-%d_%H:%M:%S).txt
 
 
 GORELEASER_CONFIG ?= .goreleaser.yaml

diff --git a/charts/chainlink-cluster/Chart.lock b/charts/chainlink-cluster/Chart.lock
@@ -4,12 +4,12 @@ dependencies:
   version: 5.14.0
 - name: opentelemetry-collector
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.81.2
+  version: 0.82.0
 - name: tempo
   repository: https://grafana.github.io/helm-charts
   version: 1.7.2
 - name: grafana
   repository: https://grafana.github.io/helm-charts
   version: 7.3.2
-digest: sha256:fb13a8a7b490fd1e388a6b082e50d65a39f44a28030d66559d4640c687a70e20
-generated: "2024-02-23T15:22:09.284013-06:00"
+digest: sha256:37722063f68689c42ac1d6549ddfae4756370c1659b8ac1c0d7da8916c6fad3d
+generated: "2024-02-27T11:04:29.920915-06:00"
diff --git a/charts/chainlink-cluster/Chart.yaml b/charts/chainlink-cluster/Chart.yaml
@@ -1,15 +1,15 @@
 apiVersion: v2
 name: chainlink-cluster
 description: Chainlink nodes cluster
-version: 0.3.0
+version: 0.4.0
 appVersion: "2.6.0"
 dependencies:
   - name: mockserver
     version: "5.14.0"
     repository: "https://www.mock-server.com"
     condition: mockserver.enabled
   - name: opentelemetry-collector
-    version: "0.81.2"
+    version: "0.82.0"
     repository: "https://open-telemetry.github.io/opentelemetry-helm-charts"
     condition: opentelemetry-collector.enabled
   - name: tempo

diff --git a/charts/chainlink-cluster/README.md b/charts/chainlink-cluster/README.md
@@ -31,6 +31,13 @@ Build and deploy current commit
 devspace deploy
 ```
 
+Default `ttl` is `72h`, use `ttl` command to update if you need more time
+
+Valid values are `1h`, `2m`, `3s`, etc. Go time format is invalid `1h2m3s`
+```
+devspace run ttl ${namespace} 120h
+```
+
 If you don't need a build use
 ```
 devspace deploy --skip-build

diff --git a/charts/chainlink-cluster/devspace.yaml b/charts/chainlink-cluster/devspace.yaml
@@ -89,6 +89,8 @@ pipelines:
 commands:
   connect: |-
     sudo kubefwd svc -n $1
+  ttl: |-
+    kubectl annotate namespace $1 janitor/ttl=$2 --overwrite
 
 images:
   app:
@@ -300,12 +302,6 @@ deployments:
         # monitoring.coreos.com/v1 PodMonitor for each node
         prometheusMonitor: true
 
-        networkPolicy:
-          ingress:
-            # Should be a comma separated list of CIDR blocks. To include
-            # AWS ALB private CIDRs and optionally other custom CIDRs.
-            # Example format: 10.0.0.0/16,192.168.0.1/24
-            allowCustomCidrs: ${DEVSPACE_INGRESS_CIDRS}
         # These ingresses create AWS ALB resources and Route 53 Records.
         ingress:
           enabled: true
@@ -411,7 +407,13 @@ deployments:
                         name: mockserver
                         port:
                           number: 1080
-
+        networkPolicyDefault:
+          ingress:
+            allowCustomCidrs: true
+            # Should be a comma separated list of CIDR blocks. To include
+            # AWS ALB private CIDRs and optionally other custom CIDRs.
+            # Example format: 10.0.0.0/16,192.168.0.1/24
+            customCidrs: ${DEVSPACE_INGRESS_CIDRS}
         # deployment placement, standard helm stuff
         podAnnotations:
         nodeSelector:

diff --git a/charts/chainlink-cluster/templates/ingress.yaml b/charts/chainlink-cluster/templates/ingress.yaml
@@ -15,6 +15,7 @@ metadata:
     alb.ingress.kubernetes.io/group.name: {{ $.Values.ingress.annotation_group_name | quote }}
     alb.ingress.kubernetes.io/scheme: internal
     alb.ingress.kubernetes.io/target-type: ip
+    external-dns.alpha.kubernetes.io/ttl: "120"
   {{- if .Values.ingress.extra_annotations }}
   {{- range $key, $value := .Values.ingress.extra_annotations }}
     {{ $key }}: {{ $value | quote }}