From fb6bb1eb7713476fbb15ab2f046aca48da9b73af Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Fri, 26 Apr 2024 11:45:53 -0400
Subject: [PATCH 1/5] Remove node6 for CRIB chart values

---
 .github/scripts/crib/pr-comment-crib-env.js |  1 -
 crib/devspace.yaml                          | 13 +------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/scripts/crib/pr-comment-crib-env.js b/.github/scripts/crib/pr-comment-crib-env.js
index d569587baff..cc36a9deb7b 100755
--- a/.github/scripts/crib/pr-comment-crib-env.js
+++ b/.github/scripts/crib/pr-comment-crib-env.js
@@ -11,7 +11,6 @@ function generateSubdomains(subdomainPrefix, prNumber) {
     "node3",
     "node4",
     "node5",
-    "node6",
     "geth-1337-http",
     "geth-1337-ws",
     "geth-2337-http",
diff --git a/crib/devspace.yaml b/crib/devspace.yaml
index 213fe4c24c7..06de5dc0641 100644
--- a/crib/devspace.yaml
+++ b/crib/devspace.yaml
@@ -74,7 +74,7 @@ images:
         docker push $image
 hooks:
   - command: ./scripts/check_env_vars.sh
-    events: [ "before:deploy:app" ]
+    events: ["before:deploy:app"]
   - wait:
       running: true
       terminatedWithCode: 0
@@ -217,8 +217,6 @@ deployments:
               image: ${runtime.images.app}
             - name: node-5
               image: ${runtime.images.app}
-            - name: node-6
-              image: ${runtime.images.app}
 
         # each CL node have a dedicated PostgreSQL 11.15
         # use StatefulSet by setting:
@@ -348,15 +346,6 @@ deployments:
                         name: app-node-5
                         port:
                           number: 6688
-            - host: ${DEVSPACE_NAMESPACE}-node6.${DEVSPACE_INGRESS_BASE_DOMAIN}
-              http:
-                paths:
-                  - path: /
-                    backend:
-                      service:
-                        name: app-node-6
-                        port:
-                          number: 6688
             - host: ${DEVSPACE_NAMESPACE}-geth-1337-http.${DEVSPACE_INGRESS_BASE_DOMAIN}
               http:
                 paths:

From e96f5c8c401172faac99adff5806cc0ab861f929 Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Fri, 26 Apr 2024 11:52:18 -0400
Subject: [PATCH 2/5] Use future helm chart and correct path to values-profiles
 override

---
 crib/devspace.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crib/devspace.yaml b/crib/devspace.yaml
index 06de5dc0641..f22e710f943 100644
--- a/crib/devspace.yaml
+++ b/crib/devspace.yaml
@@ -100,7 +100,7 @@ deployments:
       releaseName: "app"
       chart:
         name: ${CHAINLINK_CLUSTER_HELM_CHART_URI}
-        version: 0.5.0
+        version: 0.6.0
       # for simplicity, we define all the values here
       # they can be defined the same way in values.yml
       # devspace merges these "values" with the "values.yaml" before deploy
@@ -421,4 +421,4 @@ profiles:
         path: deployments.app.helm.values.chainlink.global.overridesToml
       - op: add
         path: deployments.app.helm.valuesFiles
-        value: ["../charts/chainlink-cluster/values-profiles/values-dev.yaml"]
+        value: ["./values-profiles/values-dev.yaml"]

From c14be6e216a706bdb803d8b579f193c0a4a7ca94 Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:02:29 -0400
Subject: [PATCH 3/5] Add back .gitignore

---
 crib/.gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 crib/.gitignore

diff --git a/crib/.gitignore b/crib/.gitignore
new file mode 100644
index 00000000000..9edd651d4db
--- /dev/null
+++ b/crib/.gitignore
@@ -0,0 +1,3 @@
+values-profiles/*
+!values-profiles/values-dev.yaml.example
+!values-profiles/README.md

From 7f618a15a9b42ff8cb9e55754141dbfed89edac2 Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Mon, 29 Apr 2024 08:49:39 -0400
Subject: [PATCH 4/5] Update unnecessary trigger on ci-scripts owrkflow

---
 .github/workflows/ci-scripts.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml
index 814c354cfe6..f9ab7c14fd8 100644
--- a/.github/workflows/ci-scripts.yml
+++ b/.github/workflows/ci-scripts.yml
@@ -1,7 +1,6 @@
 name: CI Scripts
 
 on:
-  push:
   pull_request:
 
 jobs:

From 167783646ee6d8ea664cf4a9abcfd88531ef5c80 Mon Sep 17 00:00:00 2001
From: chainchad <96362174+chainchad@users.noreply.github.com>
Date: Thu, 2 May 2024 09:09:45 -0400
Subject: [PATCH 5/5] Revert "Update unnecessary trigger on ci-scripts
 owrkflow"

This reverts commit 7f618a15a9b42ff8cb9e55754141dbfed89edac2.
---
 .github/workflows/ci-scripts.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml
index f9ab7c14fd8..814c354cfe6 100644
--- a/.github/workflows/ci-scripts.yml
+++ b/.github/workflows/ci-scripts.yml
@@ -1,6 +1,7 @@
 name: CI Scripts
 
 on:
+  push:
   pull_request:
 
 jobs: