@rancher/shell 3.0.5-rc.6 → 3.0.5-rc.8

package/components/google/AccountAccess.vue

@@ -106,57 +106,55 @@ export default defineComponent({
 </script>
 
 <template>
-  <div>
+  <div
+    :class="{'showing-form': !credential}"
+    class="credential-project"
+  >
     <div
-      :class="{'showing-form': !credential}"
-      class="credential-project"
+      v-show="!!credential"
+      class="project mb-10"
     >
-      <div
-        v-show="!!credential"
-        class="project mb-10"
-      >
-        <LabeledInput
-          :disabled="isAuthenticated"
-          :value="project"
-          label-key="gke.project.label"
-          required
-          @update:value="(val) => $emit('update:project', val.trim())"
-        />
-      </div>
-      <div
-        :class="{'view': isView}"
-        class="select-credential-container mb-10"
-      >
-        <SelectCredential
-          :value="credential"
-          data-testid="crugke-select-credential"
-          :mode="(isView|| isAuthenticated) ? VIEW : CREATE"
-          provider="gcp"
-          :default-on-cancel="true"
-          :showing-form="!credential"
-          class="select-credential"
-          :cancel="()=>$emit('cancel-credential')"
-          @update:value="$emit('update:credential', $event)"
-          @credential-created="parseNewCredential"
-        />
-      </div>
+      <LabeledInput
+        :disabled="isAuthenticated"
+        :value="project"
+        label-key="gke.project.label"
+        required
+        @update:value="(val) => $emit('update:project', val.trim())"
+      />
     </div>
     <div
-      v-if="!isView && !isAuthenticated"
-      class="row mt-10"
+      :class="{'view': isView}"
+      class="select-credential-container"
     >
-      <div
-        v-show="!!credential"
-        class="auth-button-container mb-10"
-      >
-        <AsyncButton
-          :disabled="!credential || !project || isAuthenticated"
-          type="button"
-          class="btn"
-          mode="authenticate"
-          @click="testProjectId"
-        />
-      </div>
+      <SelectCredential
+        :value="credential"
+        data-testid="crugke-select-credential"
+        :mode="(isView|| isAuthenticated) ? VIEW : CREATE"
+        provider="gcp"
+        :default-on-cancel="true"
+        :showing-form="!credential"
+        class="select-credential"
+        :cancel="()=>$emit('cancel-credential')"
+        @update:value="$emit('update:credential', $event)"
+        @credential-created="parseNewCredential"
+      />
+    </div>
+  </div>
+  <div
+    v-if="!isView && !isAuthenticated && !!credential"
+    class="row mt-10"
+  >
+    <div
+      v-show="!!credential"
+      class="auth-button-container mb-10"
+    >
+      <AsyncButton
+        :disabled="!credential || !project || isAuthenticated"
+        type="button"
+        class="btn"
+        mode="authenticate"
+        @click="testProjectId"
+      />
     </div>
   </div>
 </template>

package/components/nav/Favorite.vue

@@ -56,5 +56,9 @@ export default {
     &.icon-star-closed {
       color: var(--body-text);
     }
+
+    &:focus-visible {
+      @include focus-outline;
+    }
   }
 </style>

package/components/nav/Group.vue

@@ -226,7 +226,10 @@ export default {
     class="accordion"
     :class="{[`depth-${depth}`]: true, 'expanded': isExpanded, 'has-children': hasChildren, 'group-highlight': isGroupActive }"
   >
-    <div class="accordion-item">
+    <div
+      v-if="showHeader || (!onlyHasOverview && canCollapse)"
+      class="accordion-item"
+    >
       <div
         v-if="showHeader"
         class="header"

package/components/nav/NotificationCenter/Notification.vue

@@ -31,7 +31,7 @@ const unreadCount = computed<number>(() => store.getters['notifications/unreadCo
 const dateFormat = escapeHtml( store.getters['prefs/get'](DATE_FORMAT));
 const timeFormat = escapeHtml( store.getters['prefs/get'](TIME_FORMAT));
 
-const { close } = useDropdownItem();
+const { close, scrollIntoView } = useDropdownItem();
 
 // Outer element for the notification
 const dropdownMenuItem = ref<HTMLElement>();
@@ -217,32 +217,6 @@ const findNewIndex = (shouldAdvance: boolean, activeIndex: number, itemsArr: Ele
 
   return newIndex;
 };
-
-/**
- * Ensure we scroll the item into view smoothly
- * @param event FocusIn Event
- */
-const scrollIntoView = (event: Event) => {
-  const target = event.target;
-
-  if (target instanceof HTMLElement) {
-    const t = target as HTMLElement;
-
-    // If a button was clicked, then do not scroll into view, as this will scroll to make the button
-    // visible and the click will be ignored - so just return, so that the click works as expected
-    if (t.tagName === 'BUTTON') {
-      return;
-    }
-  }
-
-  if (target instanceof HTMLElement) {
-    target?.scrollIntoView({
-      behavior: 'smooth',
-      block:    'center',
-      inline:   'nearest',
-    });
-  }
-};
 </script>
 
 <template>

package/components/nav/WindowManager/index.vue

@@ -383,7 +383,7 @@ export default {
         <span class="tab-label"> {{ tab.label }}</span>
         <i
           data-testid="wm-tab-close-button"
-          class="closer icon icon-fw icon-x wm-closer-button"
+          class="closer icon icon-x wm-closer-button"
           :alt="t('wm.containerShell.closeShellTab', { tab: tab.label })"
           tabindex="0"
           :aria-label="t('windowmanager.closeTab', { tabId: tab.id })"
@@ -428,9 +428,9 @@ export default {
       </div>
     </div>
     <div
-      v-for="(tab, i) in tabs"
+      v-for="tab in tabs"
       :id="`panel-${tab.id}`"
-      :key="i"
+      :key="tab.id"
       class="body"
       :class="{'active': tab.id === active}"
       draggable="false"

package/composables/resources.ts

@@ -21,7 +21,7 @@ export const useResourceIdentifiers = (type: ResourceType) => {
   };
 };
 
-export const useFetchResourceWithId = async(type: ResourceType, id: IdType) => {
+export const useFetchResourceWithId = async(type: ResourceType, id: IdType, inStore = 'cluster') => {
   const store = useStore();
   const i18n = useI18n(store);
 
@@ -29,7 +29,7 @@ export const useFetchResourceWithId = async(type: ResourceType, id: IdType) => {
   const idValue = toValue(id);
 
   try {
-    return await store.dispatch('cluster/find', { type: typeValue, id: idValue });
+    return await store.dispatch(`${ inStore }/find`, { type: typeValue, id: idValue });
   } catch (ex: any) {
     if (ex.status === 404 || ex.status === 403) {
       store.dispatch('loadingError', new Error(i18n.t('nav.failWhale.resourceIdNotFound', { resource: type, fqid: id }, true)));

package/config/labels-annotations.js

@@ -17,6 +17,8 @@ export const AZURE_MIGRATED = 'auth.cattle.io/azuread-endpoint-migrated';
 export const WORKSPACE_ANNOTATION = 'objectset.rio.cattle.io/id';
 export const NODE_ARCHITECTURE = 'kubernetes.io/arch';
 export const IMPORTED_CLUSTER_VERSION_MANAGEMENT = 'rancher.io/imported-cluster-version-management';
+export const UI_PROJECT_SECRET = 'management.cattle.io/project-scoped-secret';
+export const UI_PROJECT_SECRET_COPY = 'management.cattle.io/project-scoped-secret-copy';
 
 export const KUBERNETES = {
   SERVICE_ACCOUNT_UID:  'kubernetes.io/service-account.uid',
@@ -163,6 +165,7 @@ export const HCI = {
   NETWORK_TYPE:        'network.harvesterhci.io/type',
   CLUSTER_NETWORK:     'network.harvesterhci.io/clusternetwork',
   PRIMARY_SERVICE:     'cloudprovider.harvesterhci.io/primary-service',
+  CPU_MANAGER:         'cpumanager',
 };
 
 // Annotations that can be on management.cattle.io.cluster to configure a custom badge
@@ -192,8 +195,6 @@ export const SYSTEM_LABELS = [
   'egress.rke2.io'
 ];
 
-export const CLOUD_CREDENTIALS = { EXPIRATION: 'rancher.io/expiration-timestamp' };
-
 export const OIDC_CLIENT_SECRET_ANNOTATIONS = {
   CREATE: 'cattle.io/oidc-client-secret-create',
   REGEN:  'cattle.io/oidc-client-secret-regenerate',

package/config/pagination-table-headers.js

@@ -1,7 +1,9 @@
+import { UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import {
   STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT,
   EVENT_LAST_SEEN_TIME,
-  EVENT_TYPE
+  EVENT_TYPE,
+  SECRET_CLONE
 } from '@shell/config/table-headers';
 
 // This file contains table headers
@@ -78,3 +80,8 @@ export const STEVE_LIST_GROUPS = [{
   tooltipKey:    'resourceTable.groupBy.namespace',
   groupLabelKey: 'groupByLabel',
 }];
+
+export const STEVE_SECRET_CLONE = {
+  ...SECRET_CLONE,
+  sort: `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`,
+};

package/config/product/explorer.js

@@ -21,7 +21,7 @@ import {
   HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA,
   ACCESS_KEY, DESCRIPTION, EXPIRES, EXPIRY_STATE, LAST_USED, SUB_TYPE, AGE_NORMAN, SCOPE_NORMAN, PERSISTENT_VOLUME_CLAIM, RECLAIM_POLICY, PV_REASON, WORKLOAD_HEALTH_SCALE, POD_RESTARTS,
   DURATION, MESSAGE, REASON, EVENT_TYPE, OBJECT, ROLE, ROLES, VERSION, INTERNAL_EXTERNAL_IP, KUBE_NODE_OS, CPU, RAM, SECRET_DATA,
-  EVENT_LAST_SEEN_TIME
+  EVENT_LAST_SEEN_TIME,
 } from '@shell/config/table-headers';
 
 import { DSL } from '@shell/store/type-map';
@@ -94,6 +94,7 @@ export function init(store) {
     PVC,
     STORAGE_CLASS,
     SECRET,
+    VIRTUAL_TYPES.PROJECT_SECRETS,
     CONFIG_MAP
   ], 'storage');
   basicType([
@@ -187,7 +188,12 @@ export function init(store) {
   configureType(NORMAN.CLUSTER_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(NORMAN.PROJECT_ROLE_TEMPLATE_BINDING, { depaginate: dePaginateNormanBindings });
   configureType(SNAPSHOT, { depaginate: true });
-  configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
+
+  configureType(SECRET, { showListMasthead: false });
+  weightType(SECRET, 1, false);
+
+  configureType(VIRTUAL_TYPES.PROJECT_SECRETS, { showListMasthead: false });
+  weightType(VIRTUAL_TYPES.PROJECT_SECRETS, 2, false);
 
   configureType(EVENT, { limit: 500 });
   weightType(EVENT, -1, true);
@@ -624,6 +630,25 @@ export function init(store) {
     exact:            true,
   });
 
+  virtualType({
+    label:            store.getters['i18n/t'](`typeLabel.${ VIRTUAL_TYPES.PROJECT_SECRETS }`, { count: 2 }),
+    group:            'storage',
+    icon:             'globe',
+    namespaced:       false,
+    ifRancherCluster: true,
+    name:             VIRTUAL_TYPES.PROJECT_SECRETS,
+    weight:           -1,
+    route:            {
+      name:   'c-cluster-product-resource',
+      params: { resource: VIRTUAL_TYPES.PROJECT_SECRETS }
+    },
+    exact:      true,
+    ifHaveType: [{
+      store: 'management',
+      type:  SECRET
+    }],
+  });
+
   // Ignore these types as they are managed through the settings product
   ignoreType(MANAGEMENT.FEATURE);
   ignoreType(MANAGEMENT.SETTING);

package/config/product/manager.js

@@ -67,7 +67,6 @@ export function init(store) {
   ]);
 
   configureType(SNAPSHOT, { depaginate: true });
-  configureType(NORMAN.ETCD_BACKUP, { depaginate: true });
 
   configureType(CAPI.RANCHER_CLUSTER, {
     showListMasthead: false, namespaced: false, alias: [HCI.CLUSTER]

package/config/query-params.js

@@ -80,5 +80,15 @@ export const CLOUD_CREDENTIAL = 'cloud';
 export const PROJECT_ID = 'projectId';
 export const FLAT_VIEW = 'flatView';
 
+/**
+ * Used on the secret create/edit page to determine
+ * 1. if the user is creating a normal secret, or a project scoped secret
+ * 2. where to return the user on cancel/save
+ */
+export const SECRET_QUERY_PARAMS = {
+  NAMESPACED:     'namespaced',
+  PROJECT_SCOPED: 'project-scoped'
+};
+export const SECRET_SCOPE = 'scope';
 // RANCHER OIDC CLIENT
 export const RANCHER_AS_OIDC_QUERY_PARAMS = ['scope', 'client_id', 'redirect_uri', 'response_type'];

package/config/router/routes.js

@@ -1,7 +1,9 @@
 import { NAME as APPS } from '@shell/config/product/apps';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { NAME as MANAGER } from '@shell/config/product/manager';
-import { CAPI, MANAGEMENT, BACKUP_RESTORE, COMPLIANCE } from '@shell/config/types';
+import {
+  CAPI, MANAGEMENT, BACKUP_RESTORE, COMPLIANCE, VIRTUAL_TYPES
+} from '@shell/config/types';
 import { NAME as AUTH } from '@shell/config/product/auth';
 
 // All these imports are related to the install-redirect.js navigation guard.
@@ -313,6 +315,20 @@ export default [
             component: () => interopDefault(import('@shell/pages/c/_cluster/apps/charts/install.vue')),
             name:      'c-cluster-apps-charts-install',
           },
+          {
+            path: '/c/:cluster/apps/catalog.cattle.io.clusterrepo',
+            name: 'c-cluster-apps-catalog-repo',
+            redirect(to) {
+              return {
+                name:   'c-cluster-product-resource',
+                params: {
+                  ...to.params,
+                  product:  APPS,
+                  resource: 'catalog.cattle.io.clusterrepo',
+                }
+              };
+            },
+          },
         ]
       },
       {
@@ -493,6 +509,10 @@ export default [
         component: () => interopDefault(import('@shell/pages/c/_cluster/_product/_resource/_id.vue')),
         name:      'c-cluster-product-resource-id',
         meta:      { asyncSetup: true }
+      }, {
+        path:      `/c/:cluster/:product/${ VIRTUAL_TYPES.PROJECT_SECRETS }/:namespace/:id`,
+        component: () => interopDefault(import(`@shell/pages/c/_cluster/explorer/${ VIRTUAL_TYPES.PROJECT_SECRETS }.vue`)),
+        name:      `c-cluster-product-${ VIRTUAL_TYPES.PROJECT_SECRETS }-namespace-id`,
       }, {
         path:      '/c/:cluster/:product/:resource/:namespace/:id',
         component: () => interopDefault(import('@shell/pages/c/_cluster/_product/_resource/_namespace/_id.vue')),

package/config/system-namespaces.js

@@ -12,7 +12,7 @@ export default [
   'linkerd',
   'security-scan',
   'tekton-pipelines',
-  'rancher-compliance-system',
+  'compliance-operator-system',
   'istio-system',
   'longhorn-system',
 ];

package/config/table-headers.js

@@ -1,4 +1,4 @@
-import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
+import { CATTLE_PUBLIC_ENDPOINTS, UI_PROJECT_SECRET_COPY } from '@shell/config/labels-annotations';
 import { NODE as NODE_TYPE } from '@shell/config/types';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
@@ -383,6 +383,29 @@ export const SECRET_DATA = {
   formatter: 'SecretData'
 };
 
+export const SECRET_CLONE = {
+  name:      'secret-clone',
+  labelKey:  'tableHeaders.secret.project-clone',
+  tooltip:   'tableHeaders.secret.project-clone-tooltip',
+  value:     'isProjectSecretCopy',
+  sort:      `metadata.annotations."${ UI_PROJECT_SECRET_COPY }"`,
+  search:    false,
+  formatter: 'Checked',
+};
+
+export const SECRET_PROJECT_SCOPED = {
+  name:     'secret-project-scoped',
+  labelKey: 'tableHeaders.secret.project-scoped',
+  tooltip:  'tableHeaders.secret.project-scoped-tooltip',
+  value:    'clusterAndProjectLabel',
+  // Cannot _sort_ upstream secrets by if they are cluster scoped
+  // https://github.com/rancher/rancher/issues/51001
+  // metadata.labels[management.cattle.io/project-scoped-secret] - covers both cluster scoped AND clones
+  // metadata.annotations[management.cattle.io/project-scoped-secret-copy]
+  // sort:     [`metadata.labels[${ UI_PROJECT_SECRET }]`, `metadata.annotations[${ UI_PROJECT_SECRET_COPY }]`],
+  search:   false,
+};
+
 export const TARGET_KIND = {
   name:     'target-kind',
   labelKey: 'tableHeaders.targetKind',
@@ -1145,3 +1168,9 @@ export const UI_PLUGIN_CATALOG = [
     value:    'repo.metadata.name'
   }
 ];
+
+// SECRETS
+export const PROJECT = {
+  name:     'project',
+  labelKey: 'tableHeaders.project',
+};

package/config/types.js

@@ -14,7 +14,6 @@ export const STEVE = {
 export const NORMAN = {
   APP:                           'app',
   AUTH_CONFIG:                   'authconfig',
-  ETCD_BACKUP:                   'etcdbackup',
   CLUSTER:                       'cluster',
   CLUSTER_TOKEN:                 'clusterregistrationtoken',
   CLUSTER_ROLE_TEMPLATE_BINDING: 'clusterroletemplatebinding',
@@ -316,6 +315,7 @@ export const VIRTUAL_TYPES = {
   CLUSTER_MEMBERS:    'cluster-members',
   PROJECT_NAMESPACES: 'projects-namespaces',
   NAMESPACES:         'namespaces',
+  PROJECT_SECRETS:    'projectsecret',
   JWT_AUTHENTICATION: 'jwt.authentication'
 };
 

package/config/version.js

@@ -30,4 +30,4 @@ export function setKubeVersionData(v) {
   _kubeVersionData = JSON.parse(JSON.stringify(v));
 }
 
-export const CURRENT_RANCHER_VERSION = '2.11';
+export const CURRENT_RANCHER_VERSION = '2.12';

package/detail/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -1,11 +1,22 @@
 import { shallowMount } from '@vue/test-utils';
 import ProvisioningCattleIoCluster from '@shell/detail/provisioning.cattle.io.cluster.vue';
+import * as MastheadComposable from '@shell/components/Resource/Detail/Masthead/composable';
 
 jest.mock('@shell/utils/clipboard', () => {
   return { copyTextToClipboard: jest.fn(() => Promise.resolve({})) };
 });
 
+jest.mock('@shell/components/Resource/Detail/Masthead/composable');
+
 describe('view: provisioning.cattle.io.cluster', () => {
+  const useDefaultMastheadPropsSpy = jest.spyOn(MastheadComposable, 'useDefaultMastheadProps');
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    useDefaultMastheadPropsSpy.mockReturnValue({} as any);
+  });
+
   const mockStore = {
     getters: {
       'management/canList':      () => true,

package/detail/__tests__/workload.test.ts

@@ -0,0 +1,164 @@
+import Workload from '@shell/detail/workload/index.vue';
+
+const { findMatchingIngresses } = Workload.methods;
+
+describe('findMatchingIngresses', () => {
+  it('should do nothing if ingress schema is not present', () => {
+    const mockThis = {
+      ingressSchema:     undefined,
+      matchingIngresses: [],
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toStrictEqual([]);
+  });
+
+  it('should not find any ingresses if there are none', () => {
+    const mockThis = {
+      ingressSchema:     true,
+      allIngresses:      [],
+      matchingServices:  [],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toStrictEqual([]);
+  });
+
+  it('should find matching ingresses', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        { // matching
+          metadata: { namespace: 'test' },
+          spec:     { rules: [{ http: { paths: [{ backend: { service: { name: 'service1' } } }] } }] }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(1);
+    expect(mockThis.matchingIngresses[0]).toStrictEqual(mockThis.allIngresses[0]);
+  });
+
+  it('should not match ingresses from other namespaces', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        { // not matching
+          metadata: { namespace: 'other' },
+          spec:     { rules: [{ http: { paths: [{ backend: { service: { name: 'service1' } } }] } }] }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(0);
+  });
+
+  it('should not match ingresses pointing to other services', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        { // not matching
+          metadata: { namespace: 'test' },
+          spec:     { rules: [{ http: { paths: [{ backend: { service: { name: 'service2' } } }] } }] }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(0);
+  });
+
+  it('should handle ingresses with no rules', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        {
+          metadata: { namespace: 'test' },
+          spec:     { }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(0);
+  });
+
+  it('should handle ingress rules with no paths', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        {
+          metadata: { namespace: 'test' },
+          spec:     { rules: [{ http: {} }] }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(0);
+  });
+
+  it('should handle ingress paths with no backend service', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        {
+          metadata: { namespace: 'test' },
+          spec:     { rules: [{ http: { paths: [{ backend: {} }] } }] }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(0);
+  });
+
+  it('should find one of many ingresses', () => {
+    const mockThis = {
+      ingressSchema: true,
+      allIngresses:  [
+        { // not matching
+          metadata: { namespace: 'other' },
+          spec:     { rules: [{ http: { paths: [{ backend: { service: { name: 'service1' } } }] } }] }
+        },
+        { // matching
+          metadata: { namespace: 'test' },
+          spec:     { rules: [{ http: { paths: [{ backend: { service: { name: 'service1' } } }] } }] }
+        },
+        { // not matching
+          metadata: { namespace: 'test' },
+          spec:     { rules: [{ http: { paths: [{ backend: { service: { name: 'service2' } } }] } }] }
+        }
+      ],
+      matchingServices:  [{ metadata: { name: 'service1' } }],
+      matchingIngresses: [],
+      value:             { metadata: { namespace: 'test' } }
+    };
+
+    findMatchingIngresses.call(mockThis);
+    expect(mockThis.matchingIngresses).toHaveLength(1);
+    expect(mockThis.matchingIngresses[0]).toStrictEqual(mockThis.allIngresses[1]);
+  });
+});