Remove node6 for CRIB chart values in CCIP (#764)

## Motivation See title. ## Solution See title. Co-authored-by: Gheorghe Strimtu <studentcuza@gmail.com>
smartcontractkit · Apr 30, 2024 · aa3b219 · aa3b219
1 parent f22ed2e
commit aa3b219
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 52 deletions.
diff --git 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/charts/ccip-scripts/values.yaml b/charts/ccip-scripts/values.yaml
@@ -74,8 +74,7 @@ chainlink:
     - name: node-3
     - name: node-4
     - name: node-5
-    - name: node-6
 geth:
   wsRpcPort: 8546
 networkPolicies:
-  enabled: true
+  enabled: true
diff --git a/charts/chainlink-cluster/values.yaml b/charts/chainlink-cluster/values.yaml
@@ -58,7 +58,6 @@ chainlink:
     - name: node-3
     - name: node-4
     - name: node-5
-    - name: node-6
 
 # each CL node have a dedicated PostgreSQL 11.15
 # use StatefulSet by setting:
@@ -299,16 +298,6 @@ ingress:
                 name: chainlink-node-5
                 port:
                   number: 6688
-    - host: chainlink-node-6.local
-      http:
-        paths:
-          - path: /
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: chainlink-node-6
-                port:
-                  number: 6688
     - host: chainlink-geth-http.local
       http:
         paths:

diff --git a/charts/root/values.yaml b/charts/root/values.yaml
@@ -41,7 +41,6 @@ chainlink-cluster:
       - name: node-3
       - name: node-4
       - name: node-5
-      - name: node-6
 
   # each CL node have a dedicated PostgreSQL 11.15
   # use StatefulSet by setting:
@@ -283,16 +282,6 @@ chainlink-cluster:
                   name: chainlink-node-5
                   port:
                     number: 6688
-      - host: chainlink-node-6.local
-        http:
-          paths:
-            - path: /
-              pathType: ImplementationSpecific
-              backend:
-                service:
-                  name: chainlink-node-6
-                  port:
-                    number: 6688
       - host: chainlink-geth-http.local
         http:
           paths:
@@ -411,6 +400,5 @@ ccip-scripts:
       - name: node-3
       - name: node-4
       - name: node-5
-      - name: node-6
   geth:
     wsRpcPort: 8546
diff --git a/crib/devspace.yaml b/crib/devspace.yaml
@@ -208,8 +208,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:
           #
@@ -324,15 +322,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:

diff --git a/integration-tests/ccip-tests/testconfig/tomls/ccip-crib.toml b/integration-tests/ccip-tests/testconfig/tomls/ccip-crib.toml
@@ -140,12 +140,6 @@ Email = 'notreal@fakeemail.ch'
 Password = 'fj293fbBnlQ!f9vNs'
 InternalIP = 'app-node-5'
 
-[[CCIP.Env.ExistingCLCluster.NodeConfigs]]
-URL = 'https://skudasov-crib-ccip-node6.main.stage.cldev.sh/'
-Email = 'notreal@fakeemail.ch'
-Password = 'fj293fbBnlQ!f9vNs'
-InternalIP = 'app-node-6'
-
 [CCIP.Groups]
 [CCIP.Groups.smoke]
 LocalCluster = false

diff --git a/integration-tests/ccip-tests/testconfig/tomls/db-compatibility.toml b/integration-tests/ccip-tests/testconfig/tomls/db-compatibility.toml
@@ -27,8 +27,3 @@ DBTag = '14.8'
 Name = 'node5'
 DBImage = 'postgres'
 DBTag = '15.6'
-
-[[CCIP.Env.NewCLCluster.Nodes]]
-Name = 'node6'
-DBImage = 'postgres'
-DBTag = '15.6'
diff --git a/integration-tests/ccip-tests/testconfig/tomls/node-post-upgrade-compatibility.toml b/integration-tests/ccip-tests/testconfig/tomls/node-post-upgrade-compatibility.toml
@@ -25,10 +25,6 @@ NeedsUpgrade = true
 Name = 'node-5'
 NeedsUpgrade = true
 
-[[CCIP.Env.NewCLCluster.Nodes]]
-Name = 'node-6'
-NeedsUpgrade = true
-
 [CCIP.Groups]
 [CCIP.Groups.load]
 LocalCluster = false