Testing new indexed fields with dev image

rancher · Dec 18, 2024 · 096d290 · 096d290
1 parent 182eded
commit 096d290
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 42 deletions.
diff --git a/shell/components/formatter/Endpoints.vue b/shell/components/formatter/Endpoints.vue
@@ -27,7 +27,7 @@ export default {
       const nodeWithExternal = nodes.find((node) => !!node.externalIp) || {};
       const externalIp = nodeWithExternal.externalIp;
 
-      if ( this.value && this.value.length ) {
+      if ( this.value?.length ) {
         let out ;
 
         try {

diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
@@ -48,7 +48,7 @@ const DEFAULT_SORT: Array<PaginationSort> = [
   },
   // {
   //   asc:   true,
-  //   field: 'status.conditions[0].status' // Pending API changes https://github.com/rancher/rancher/issues/48092
+  //   field: 'status.conditions[0].status' // Pending API support https://github.com/rancher/rancher/issues/48092
   // },
   {
     asc:   true,

diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
@@ -278,11 +278,12 @@ export function init(store) {
     [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE],
     [
       STEVE_STATE_COL,
+      STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
       {
         ...INGRESS_TARGET,
-        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-        search: 'spec.rules', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
+        search: false, // This is broken in normal world, so disable here
       },
       {
         ...INGRESS_DEFAULT_BACKEND,
@@ -292,7 +293,7 @@ export function init(store) {
       {
         ...INGRESS_CLASS,
         sort:   'spec.ingressClassName',
-        search: 'spec.ingressClassName', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
       },
       STEVE_AGE_COL
     ]
@@ -302,12 +303,9 @@ export function init(store) {
     [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE],
     [
       STEVE_STATE_COL,
+      STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
-      {
-        ...TARGET_PORT,
-        sort:   'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-        search: 'spec.targetPort', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      },
+      TARGET_PORT,
       {
         // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
         ...SELECTOR,
@@ -316,8 +314,8 @@ export function init(store) {
       },
       {
         ...SPEC_TYPE,
-        sort:   'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-        search: 'spec.type', // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+        sort:   'spec.type', // TODO: RC REGRESSION - shell/components/formatter/ServiceType.vue & shell/models/service.js show mangle value which we do not sort/filter on
+        search: 'spec.type',
       },
       STEVE_AGE_COL
     ]
@@ -357,17 +355,17 @@ export function init(store) {
       STEVE_STATE_COL,
       STEVE_NAME_COL,
       STEVE_NAMESPACE_COL,
-      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
     ]
   );
 
   const STEVE_WORKLOAD_ENDPOINTS = {
     ...WORKLOAD_ENDPOINTS,
-    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`], // Pending API support https://github.com/rancher/rancher/issues/48256
-    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`], // Pending API support https://github.com/rancher/rancher/issues/48256
+    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
+    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
   };
 
   const createSteveWorkloadImageCol = (resourceFieldPos) => ({
@@ -507,8 +505,8 @@ export function init(store) {
       },
       {
         ...STORAGE_CLASS_DEFAULT,
-        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
-        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`],
+        sort:   [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        search: [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
       },
       STEVE_AGE_COL
     ]

diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
@@ -663,8 +663,8 @@ export const TARGET_PORT = {
   formatter: 'ServiceTargets',
   labelKey:  'tableHeaders.targetPort',
   name:      'targetPort',
-  sort:      `$['spec']['targetPort']`,
-  value:     `$['spec']['targetPort']`,
+  sort:      false,
+  value:     false,
 };
 
 export const SELECTOR = {

diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
@@ -140,8 +140,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.CLUSTER]: [
       { field: 'spec.internal' },
       { field: 'spec.displayName' },
-      // { field: `status.provider` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
-      // { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      { field: `status.provider` },
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
 
     ],
     [CONFIG_MAP]: [
@@ -175,19 +175,16 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'status.clusterName' },
     ],
     [SERVICE]: [
-      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.type' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      { field: 'spec.type' },
     ],
     [INGRESS]: [
-      // { field: 'spec.targetPort' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.rules' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.ingressClassName' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.ingressClassName' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields) --> https://github.com/rancher/rancher/issues/48384 (service crash)
     ],
     [HPA]: [
-      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
-      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48103 (blocked https://github.com/rancher/rancher/issues/48384)
+      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
     ],
     [PVC]: [
       { field: 'spec.volumeName' },
@@ -198,25 +195,25 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     ],
     [STORAGE_CLASS]: [
       { field: 'provisioner' },
-      // { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API Support - https://github.com/rancher/rancher/issues/48453
     ],
     [CATALOG.APP]: [
-      // { field: 'spec.chart.metadata.name' }, // Pending API support https://github.com/rancher/rancher/issues/48256
+      { field: 'spec.chart.metadata.name' }
     ],
     [WORKLOAD_TYPES.CRON_JOB]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.DAEMON_SET]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.DEPLOYMENT]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.JOB]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ],
     [WORKLOAD_TYPES.STATEFUL_SET]: [
-      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // Pending API support https://github.com/rancher/rancher/issues/48256
+      // { field: `metadata.annotations[CATTLE_PUBLIC_ENDPOINTS]` } // // Pending API support https://github.com/rancher/rancher/issues/48256 (index fields)
     ]
 
   }

diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
@@ -79,13 +79,13 @@ export function paginationFilterOnlyKubernetesClusters(store) {
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`,
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      field:  `status.provider`,
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true