Dont include junk revision in mock resources

- causes MASSSIVE socket spam if the rancher revision exceeds it
rancher · Oct 31, 2024 · 9aaaabb · 9aaaabb
1 parent f4db933
commit 9aaaabb
Show file tree

Hide file tree

Showing 34 changed files with 207 additions and 373 deletions.
diff --git a/cypress/e2e/blueprints/cluster_management/machine-deployments-edit.yml b/cypress/e2e/blueprints/cluster_management/machine-deployments-edit.yml
@@ -24,7 +24,6 @@ metadata:
       time: '2023-12-07T18:14:50Z'
   name: e2e-machinedeployment-name-1701972886077
   namespace: default
-  resourceVersion: '22851'
   uid: f5bf052d-7bbf-483a-a20a-b2f6e48d1e15
 spec:
   clusterName: local

diff --git a/cypress/e2e/blueprints/cluster_management/machine-sets-edit.yml b/cypress/e2e/blueprints/cluster_management/machine-sets-edit.yml
@@ -25,7 +25,6 @@ metadata:
       time: '2023-12-06T23:46:28Z'
   name: e2e-machine-name-1701906098950
   namespace: default
-  resourceVersion: '647485'
   uid: 98380f64-0706-4522-8dc2-b91a7f012dcf
 spec:
   clusterName: local

diff --git a/cypress/e2e/blueprints/cluster_management/machines-edit.yml b/cypress/e2e/blueprints/cluster_management/machines-edit.yml
@@ -21,7 +21,6 @@ metadata:
       time: '2023-12-06T22:21:54Z'
   name: e2e-machine-name-1701901308645
   namespace: default
-  resourceVersion: '609444'
   uid: 7d61939a-b44a-4113-a7d1-9db2eda08811
 spec:
   bootstrap:

diff --git a/cypress/e2e/blueprints/cluster_management/pod-security-admissions-payload.ts b/cypress/e2e/blueprints/cluster_management/pod-security-admissions-payload.ts
@@ -10,10 +10,8 @@ export const createPayloadData = {
       usernames: ['admin', 'user'], runtimeClasses: ['myclass1', 'myclass2'], namespaces: ['ingress-nginx', 'kube-system']
     }
   },
-  kind:     'PodSecurityAdmissionConfigurationTemplate',
-  metadata: {
-    fields: ['e2e-pod-security-admission-1705617529465', '18s'], name: 'e2e-pod-security-admission-1705617529465', resourceVersion: '831667'
-  },
+  kind:        'PodSecurityAdmissionConfigurationTemplate',
+  metadata:    { fields: ['e2e-pod-security-admission-1705617529465', '18s'], name: 'e2e-pod-security-admission-1705617529465' },
   description: 'e2e-pod-security-admission-1705617529465-description'
 };
 
@@ -29,9 +27,7 @@ export const updatePayloadData = {
       usernames: ['admin1', 'user1'], runtimeClasses: ['myclass3', 'myclass4'], namespaces: ['cattle-system', 'cattle-epinio-system']
     }
   },
-  kind:     'PodSecurityAdmissionConfigurationTemplate',
-  metadata: {
-    fields: ['e2e-pod-security-admission-1705628550961', '7s'], name: 'e2e-pod-security-admission-1705628550961', resourceVersion: '938739'
-  },
+  kind:        'PodSecurityAdmissionConfigurationTemplate',
+  metadata:    { fields: ['e2e-pod-security-admission-1705628550961', '7s'], name: 'e2e-pod-security-admission-1705628550961' },
   description: 'e2e-pod-security-admission-1705628550961-description-edit'
 };
diff --git a/cypress/e2e/blueprints/explorer/cluster/events.ts b/cypress/e2e/blueprints/explorer/cluster/events.ts
@@ -37,11 +37,10 @@ const eventsGetResponseSmallSet = {
           1,
           'fleet-agent-0.17d80b90a6d2c7ab'
         ],
-        name:            'fleet-agent-0.17d80b90a6d2c7ab',
-        namespace:       'cattle-fleet-local-system',
-        relationships:   null,
-        resourceVersion: '0',
-        state:           {
+        name:          'fleet-agent-0.17d80b90a6d2c7ab',
+        namespace:     'cattle-fleet-local-system',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -68,11 +67,10 @@ const eventsGetResponseSmallSet = {
           1,
           'fleet-agent-0.17d80b90a6d2c7ab'
         ],
-        name:            'fleet-agent-0.17d80b90a6d2c7ab',
-        namespace:       'cattle-fleet-local-system',
-        relationships:   null,
-        resourceVersion: '0',
-        state:           {
+        name:          'fleet-agent-0.17d80b90a6d2c7ab',
+        namespace:     'cattle-fleet-local-system',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -99,11 +97,10 @@ const eventsGetResponseSmallSet = {
           1,
           'fleet-agent-0.17d80b90a6d2c7ab'
         ],
-        name:            'fleet-agent-0.17d80b90a6d2c7ab',
-        namespace:       'cattle-fleet-local-system',
-        relationships:   null,
-        resourceVersion: '0',
-        state:           {
+        name:          'fleet-agent-0.17d80b90a6d2c7ab',
+        namespace:     'cattle-fleet-local-system',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/core/service-accounts-get.ts b/cypress/e2e/blueprints/explorer/core/service-accounts-get.ts
@@ -5,7 +5,6 @@ const serviceAccGetResponseEmpty = {
   createTypes:  { serviceaccount: 'https://yonasb29.qa.rancher.space/v1/serviceaccounts' },
   actions:      {},
   resourceType: 'serviceaccount',
-  revision:     '129651',
   count:        0,
   data:         []
 };
@@ -17,7 +16,6 @@ const serviceAcctResponseSmallSet = {
   createTypes:  { serviceaccount: 'https://yonasb29.qa.rancher.space/v1/serviceaccounts' },
   actions:      {},
   resourceType: 'serviceaccount',
-  revision:     '129651',
   count:        3,
   data:         [
     {
@@ -55,8 +53,7 @@ const serviceAcctResponseSmallSet = {
             state:    'succeeded'
           }
         ],
-        resourceVersion: '7124',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -104,8 +101,7 @@ const serviceAcctResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '9344',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -165,8 +161,7 @@ const serviceAcctResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '9342',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/fleet/contents-get.ts b/cypress/e2e/blueprints/explorer/fleet/contents-get.ts
@@ -5,7 +5,6 @@ const fleetContentsGetResponseEmpty = {
   createTypes:  { 'fleet.cattle.io.content': 'https://yonasb29head.qa.rancher.space/v1/fleet.cattle.io.contents' },
   actions:      {},
   resourceType: 'fleet.cattle.io.content',
-  revision:     '123',
   count:        0,
   data:         []
 };
@@ -17,7 +16,6 @@ const fleetContentsResponseSmallSet = {
   createTypes:  { 'fleet.cattle.io.content': 'https://yonasb29head.qa.rancher.space/v1/fleet.cattle.io.contents' },
   actions:      {},
   resourceType: 'fleet.cattle.io.content',
-  revision:     '123',
   count:        2,
   data:         [
     {
@@ -38,11 +36,10 @@ const fleetContentsResponseSmallSet = {
           's-65075fe21d0e5087693027a2fdbb5ed559295ed1ffeb5957f98d77decb4a5',
           '27h'
         ],
-        generation:      1,
-        name:            's-65075fe21d0e5087693027a2fdbb5ed559295ed1ffeb5957f98d77decb4a5',
-        relationships:   null,
-        resourceVersion: '4380255',
-        state:           {
+        generation:    1,
+        name:          's-65075fe21d0e5087693027a2fdbb5ed559295ed1ffeb5957f98d77decb4a5',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -70,11 +67,10 @@ const fleetContentsResponseSmallSet = {
           's-807cc7bcb0de2dae39c913c375f676238d021519258d34913ccc842519c63',
           '9d'
         ],
-        generation:      1,
-        name:            's-807cc7bcb0de2dae39c913c375f676238d021519258d34913ccc842519c63',
-        relationships:   null,
-        resourceVersion: '8041',
-        state:           {
+        generation:    1,
+        name:          's-807cc7bcb0de2dae39c913c375f676238d021519258d34913ccc842519c63',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/more-resources/api/custom-resource-definition-get.ts b/cypress/e2e/blueprints/explorer/more-resources/api/custom-resource-definition-get.ts
@@ -25,11 +25,10 @@ const crdsGetResponseSmallSet = {
           'users.management.cattle.io',
           '2024-06-27T20:32:20Z'
         ],
-        generation:      1,
-        name:            'users.management.cattle.io',
-        relationships:   null,
-        resourceVersion: '4473',
-        state:           {
+        generation:    1,
+        name:          'users.management.cattle.io',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'CRD is established',
           name:          'active',
@@ -129,8 +128,7 @@ const crdsGetResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '1417',
-        state:           {
+        state: {
           error:         false,
           message:       'CRD is established',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/rbac/cluster-role-bindings-get.ts b/cypress/e2e/blueprints/explorer/rbac/cluster-role-bindings-get.ts
@@ -5,7 +5,6 @@ const clusterRoleBindingGetResponseEmpty = {
   createTypes:  { 'rbac.authorization.k8s.io.clusterrolebinding': 'https://yonasb29head.qa.rancher.space/v1/rbac.authorization.k8s.io.clusterrolebindings' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.clusterrolebinding',
-  revision:     '123',
   count:        0,
   data:         []
 };
@@ -17,7 +16,6 @@ const clusterRoleBindingResponseSmallSet = {
   createTypes:  { 'rbac.authorization.k8s.io.clusterrolebinding': 'https://yonasb29head.qa.rancher.space/v1/rbac.authorization.k8s.io.clusterrolebindings' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.clusterrolebinding',
-  revision:     '123',
   count:        2,
   data:         [
     {
@@ -58,8 +56,7 @@ const clusterRoleBindingResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '434584',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -118,8 +115,7 @@ const clusterRoleBindingResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '5149',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/rbac/cluster-roles-get.ts b/cypress/e2e/blueprints/explorer/rbac/cluster-roles-get.ts
@@ -5,7 +5,6 @@ const clusterRolesGetResponseEmpty = {
   createTypes:  { 'rbac.authorization.k8s.io.clusterrole': 'https://yonasb29h3.qa.rancher.space/v1/rbac.authorization.k8s.io.clusterroles' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.clusterrole',
-  revision:     '123',
   count:        0,
   data:         []
 };
@@ -17,7 +16,6 @@ const clusterRolesResponseSmallSet = {
   createTypes:  { 'rbac.authorization.k8s.io.clusterrole': 'https://yonasb29h3.qa.rancher.space/v1/rbac.authorization.k8s.io.clusterroles' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.clusterrole',
-  revision:     '123',
   count:        2,
   data:         [
     {
@@ -46,11 +44,10 @@ const clusterRolesResponseSmallSet = {
         finalizers: [
           'wrangler.cattle.io/auth-prov-v2-crole'
         ],
-        labels:          { 'kubernetes.io/bootstrapping': 'rbac-defaults' },
-        name:            'admin',
-        relationships:   null,
-        resourceVersion: '4878',
-        state:           {
+        labels:        { 'kubernetes.io/bootstrapping': 'rbac-defaults' },
+        name:          'admin',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -94,8 +91,7 @@ const clusterRolesResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '4838',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/rbac/role-bindings-get.ts b/cypress/e2e/blueprints/explorer/rbac/role-bindings-get.ts
@@ -5,7 +5,6 @@ const roleBindingGetResponseEmpty = {
   createTypes:  { 'rbac.authorization.k8s.io.rolebinding': 'https://yonasb29head.qa.rancher.space/v1/rbac.authorization.k8s.io.rolebindings' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.rolebinding',
-  revision:     '123',
   count:        0,
   data:         []
 };
@@ -17,7 +16,6 @@ const roleBindingResponseSmallSet = {
   createTypes:  { 'rbac.authorization.k8s.io.rolebinding': 'https://yonasb29head.qa.rancher.space/v1/rbac.authorization.k8s.io.rolebindings' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.rolebinding',
-  revision:     '123',
   count:        3,
   data:         [
     {
@@ -66,8 +64,7 @@ const roleBindingResponseSmallSet = {
             message:  'Resource is current'
           }
         ],
-        resourceVersion: '445143',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -134,8 +131,7 @@ const roleBindingResponseSmallSet = {
             message:  'Resource is current'
           }
         ],
-        resourceVersion: '4386433',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -203,8 +199,7 @@ const roleBindingResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '5141',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',

diff --git a/cypress/e2e/blueprints/explorer/rbac/roles-get.ts b/cypress/e2e/blueprints/explorer/rbac/roles-get.ts
@@ -16,7 +16,6 @@ const rolesResponseSmallSet = {
   createTypes:  { 'rbac.authorization.k8s.io.role': 'https://localhost:8005/v1/rbac.authorization.k8s.io.roles' },
   actions:      {},
   resourceType: 'rbac.authorization.k8s.io.role',
-  revision:     '123',
   count:        2,
   data:         [
     {
@@ -54,8 +53,7 @@ const rolesResponseSmallSet = {
             state:    'deployed'
           }
         ],
-        resourceVersion: '6958',
-        state:           {
+        state: {
           error:         false,
           message:       'Resource is current',
           name:          'active',
@@ -109,12 +107,11 @@ const rolesResponseSmallSet = {
         finalizers: [
           'wrangler.cattle.io/auth-prov-v2-role'
         ],
-        labels:          { 'kubernetes.io/bootstrapping': 'rbac-defaults' },
-        name:            'extension-apiserver-authentication-reader',
-        namespace:       'kube-system',
-        relationships:   null,
-        resourceVersion: '4825',
-        state:           {
+        labels:        { 'kubernetes.io/bootstrapping': 'rbac-defaults' },
+        name:          'extension-apiserver-authentication-reader',
+        namespace:     'kube-system',
+        relationships: null,
+        state:         {
           error:         false,
           message:       'Resource is current',
           name:          'active',