@rancher/shell 0.1.0 → 0.1.1

package/detail/workload/index.vue

@@ -1,9 +1,9 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
+import { NAMESPACE as NAMESPACE_COL } from '@shell/config/table-headers';
 import {
-  STATE, NAME, NODE, POD_IMAGES, POD_RESTARTS
-} from '@shell/config/table-headers';
-import { POD, WORKLOAD_TYPES, SCALABLE_WORKLOAD_TYPES } from '@shell/config/types';
+  POD, WORKLOAD_TYPES, SCALABLE_WORKLOAD_TYPES, SERVICE, INGRESS, NODE
+} from '@shell/config/types';
 import SortableTable from '@shell/components/SortableTable';
 import Tab from '@shell/components/Tabbed/Tab';
 import Loading from '@shell/components/Loading';
@@ -15,6 +15,7 @@ import V1WorkloadMetrics from '@shell/mixins/v1-workload-metrics';
 import { mapGetters } from 'vuex';
 import { allDashboardsExist } from '@shell/utils/grafana';
 import PlusMinus from '@shell/components/form/PlusMinus';
+import { matches } from '~shell/utils/selector';
 
 const SCALABLE_TYPES = Object.values(SCALABLE_WORKLOAD_TYPES);
 const WORKLOAD_METRICS_DETAIL_URL = '/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/d/rancher-workload-pods-1/rancher-workload-pods?orgId=1';
@@ -52,7 +53,25 @@ export default {
   mixins: [CreateEditView, V1WorkloadMetrics],
 
   async fetch() {
-    const hash = { allPods: this.$store.dispatch('cluster/findAll', { type: POD }) };
+    let hasNodes = false;
+
+    try {
+      const inStore = this.$store.getters['currentStore']();
+      const schema = this.$store.getters[`${ inStore }/schemaFor`](NODE);
+
+      if (schema) {
+        hasNodes = true;
+      }
+    } catch {}
+
+    const hash = {
+      allPods:      this.$store.dispatch('cluster/findAll', { type: POD }),
+      allServices:  this.$store.dispatch('cluster/findAll', { type: SERVICE }),
+      allIngresses: this.$store.dispatch('cluster/findAll', { type: INGRESS }),
+      // Nodes should be fetched because they may be referenced in the target
+      // column of a service list item.
+      allNodes:     hasNodes ? this.$store.dispatch('cluster/findAll', { type: NODE }) : []
+    };
 
     if (this.value.type === WORKLOAD_TYPES.CRON_JOB) {
       hash.allJobs = this.$store.dispatch('cluster/findAll', { type: WORKLOAD_TYPES.JOB });
@@ -66,15 +85,23 @@ export default {
     const isMetricsSupportedKind = METRICS_SUPPORTED_KINDS.includes(this.value.type);
 
     this.showMetrics = isMetricsSupportedKind && await allDashboardsExist(this.$store, this.currentCluster.id, [WORKLOAD_METRICS_DETAIL_URL, WORKLOAD_METRICS_SUMMARY_URL]);
+
+    this.findMatchingServices();
+    this.findMatchingIngresses();
   },
 
   data() {
     return {
-      allPods:     null,
-      allJobs:     [],
+      allPods:           [],
+      allServices:       [],
+      allIngresses:      [],
+      matchingServices:  [],
+      matchingIngresses: [],
+      allJobs:           [],
+      allNodes:          [],
       WORKLOAD_METRICS_DETAIL_URL,
       WORKLOAD_METRICS_SUMMARY_URL,
-      showMetrics: false,
+      showMetrics:       false,
     };
   },
 
@@ -97,6 +124,14 @@ export default {
       return this.$store.getters['cluster/schemaFor'](POD);
     },
 
+    ingressSchema() {
+      return this.$store.getters['cluster/schemaFor'](INGRESS);
+    },
+
+    serviceSchema() {
+      return this.$store.getters['cluster/schemaFor'](SERVICE);
+    },
+
     podTemplateSpec() {
       const isCronJob = this.value.type === WORKLOAD_TYPES.CRON_JOB;
 
@@ -118,6 +153,12 @@ export default {
     jobHeaders() {
       return this.$store.getters['type-map/headersFor'](this.jobSchema);
     },
+    ingressHeaders() {
+      return this.$store.getters['type-map/headersFor'](this.ingressSchema);
+    },
+    serviceHeaders() {
+      return this.$store.getters['type-map/headersFor'](this.serviceSchema);
+    },
 
     totalRuns() {
       if (!this.value.jobs) {
@@ -152,13 +193,7 @@ export default {
     },
 
     podHeaders() {
-      return [
-        STATE,
-        NAME,
-        NODE,
-        POD_IMAGES,
-        POD_RESTARTS
-      ];
+      return this.$store.getters['type-map/headersFor'](this.podSchema).filter(h => h !== NAMESPACE_COL);
     },
 
     graphVarsWorkload() {
@@ -213,6 +248,71 @@ export default {
     async scaleUp() {
       await this.scale(true);
     },
+    findMatchingServices() {
+      if (!this.serviceSchema) {
+        return [];
+      }
+      const matchingPods = this.value.pods;
+
+      // Find Services that have selectors that match this
+      // workload's Pod(s).
+      const matchingServices = this.allServices.filter((service) => {
+        const selector = service.spec.selector;
+
+        for (let i = 0; i < matchingPods.length; i++) {
+          const pod = matchingPods[i];
+
+          if (service.metadata?.namespace === this.value.metadata?.namespace && matches(pod, selector)) {
+            return true;
+          }
+        }
+
+        return false;
+      });
+
+      this.matchingServices = matchingServices;
+    },
+    findMatchingIngresses() {
+      if (!this.ingressSchema) {
+        return [];
+      }
+
+      // Find Ingresses that forward traffic to Services
+      // that select this workload.
+      const matchingIngresses = this.allIngresses.filter((ingress) => {
+        const rules = ingress.spec.rules;
+
+        if (rules) {
+          for (let i = 0; i < rules.length; i++) {
+            const rule = rules[i];
+
+            const paths = rule.http.paths;
+
+            if (paths) {
+              // For each Ingress, check if any Services that match
+              // this workload are also target backends for the Ingress.
+              for (let j = 0; j < paths.length; j++) {
+                const pathData = paths[j];
+                const targetServiceName = pathData.backend.service.name;
+
+                for (let k = 0; k < this.matchingServices.length; k++) {
+                  const service = this.matchingServices[k];
+                  const matchingServiceName = service.metadata?.name;
+
+                  if (ingress.metadata?.namespace === this.value.metadata?.namespace && matchingServiceName === targetServiceName) {
+                    return true;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        return false;
+      });
+
+      this.matchingIngresses = matchingIngresses;
+    }
   }
 };
 </script>
@@ -257,7 +357,7 @@ export default {
         />
       </template>
     </div>
-    <ResourceTabs :value="value">
+    <ResourceTabs :value="value" :always-show-events="true">
       <Tab v-if="isCronJob" name="jobs" :label="t('tableHeaders.jobs')" :weight="4">
         <SortableTable
           :rows="value.jobs"
@@ -295,6 +395,51 @@ export default {
           <EmberPage inline="ember-anchor" :src="v1MonitoringUrl" />
         </div>
       </Tab>
+      <Tab v-if="!isJob && !isCronJob" name="services" :label="t('workload.detail.services')" :weight="3">
+        <p v-if="!serviceSchema" class="caption">
+          {{ t('workload.detail.cannotViewServices') }}
+        </p>
+        <p v-else-if="matchingServices.length === 0" class="caption">
+          {{ t('workload.detail.cannotFindServices') }}
+        </p>
+        <p v-else class="caption">
+          {{ t('workload.detail.serviceListCaption') }}
+        </p>
+        <SortableTable
+          v-if="serviceSchema && matchingServices.length > 0"
+          :rows="matchingServices"
+          :headers="serviceHeaders"
+          key-field="id"
+          :schema="serviceSchema"
+          :show-groups="false"
+          :search="false"
+          :table-actions="false"
+        />
+      </Tab>
+      <Tab v-if="!isJob && !isCronJob" name="ingresses" :label="t('workload.detail.ingresses')" :weight="2">
+        <p v-if="!serviceSchema" class="caption">
+          {{ t('workload.detail.cannotViewIngressesBecauseCannotViewServices') }}
+        </p>
+        <p v-else-if="!ingressSchema" class="caption">
+          {{ t('workload.detail.cannotViewIngresses') }}
+        </p>
+        <p v-else-if="matchingIngresses.length === 0" class="caption">
+          {{ t('workload.detail.cannotFindIngresses') }}
+        </p>
+        <p v-else class="caption">
+          {{ t('workload.detail.ingressListCaption') }}
+        </p>
+        <SortableTable
+          v-if="ingressSchema && matchingIngresses.length > 0"
+          :rows="matchingIngresses"
+          :headers="ingressHeaders"
+          key-field="id"
+          :schema="ingressSchema"
+          :show-groups="false"
+          :search="false"
+          :table-actions="false"
+        />
+      </Tab>
     </ResourceTabs>
   </div>
 </template>
@@ -320,4 +465,7 @@ export default {
     }
   }
 }
+.caption {
+  margin-bottom: .5em;
+}
 </style>

package/edit/auth/azuread.vue

@@ -3,34 +3,50 @@ import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
 import InfoBox from '@shell/components/InfoBox';
-import RadioGroup from '@shell/components/form/RadioGroup';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Banner from '@shell/components/Banner';
+import { RadioGroup } from '@components/Form/Radio';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Banner } from '@components/Banner';
 import AuthBanner from '@shell/components/auth/AuthBanner';
 import CopyToClipboardText from '@shell/components/CopyToClipboardText.vue';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import AuthConfig from '@shell/mixins/auth-config';
+import { AZURE_MIGRATED } from '@shell/config/labels-annotations';
+import { get } from '@shell/utils/object';
 
 const TENANT_ID_TOKEN = '__[[TENANT_ID]]__';
 
-const ENDPOINT_MAPPING = {
+// Azure AD Graph will be deprecated end of 2022, see: https://docs.microsoft.com/en-us/graph/migrate-azure-ad-graph-overview
+export const OLD_ENDPOINTS = {
   standard: {
-    endpoint:      'https://login.microsoftonline.com/',
     graphEndpoint: 'https://graph.windows.net/',
     tokenEndpoint: `https://login.microsoftonline.com/${ TENANT_ID_TOKEN }/oauth2/token`,
-    authEndpoint:  `https://login.microsoftonline.com/${ TENANT_ID_TOKEN }/oauth2/authorize`,
+    authEndpoint:  `https://login.microsoftonline.com/${ TENANT_ID_TOKEN }/oauth2/authorize`
   },
   china: {
-    endpoint:      'https://login.chinacloudapi.cn/',
     graphEndpoint: 'https://graph.chinacloudapi.cn/',
     tokenEndpoint: `https://login.chinacloudapi.cn/${ TENANT_ID_TOKEN }/oauth2/token`,
-    authEndpoint:  `https://login.chinacloudapi.cn/${ TENANT_ID_TOKEN }/oauth2/authorize`,
+    authEndpoint:  `https://login.chinacloudapi.cn/${ TENANT_ID_TOKEN }/oauth2/authorize`
+  }
+};
+
+const ENDPOINT_MAPPING = {
+  standard: {
+    endpoint:      'https://login.microsoftonline.com/',
+    graphEndpoint: 'https://graph.microsoft.com',
+    tokenEndpoint: `https://login.microsoftonline.com/${ TENANT_ID_TOKEN }/oauth2/v2.0/token`,
+    authEndpoint:  `https://login.microsoftonline.com/${ TENANT_ID_TOKEN }/oauth2/v2.0/authorize`
+  },
+  china: {
+    endpoint:      'https://login.partner.microsoftonline.cn/',
+    graphEndpoint: 'https://microsoftgraph.chinacloudapi.cn',
+    tokenEndpoint: `https://login.partner.microsoftonline.cn/${ TENANT_ID_TOKEN }/oauth2/v2.0/token`,
+    authEndpoint:  `https://login.partner.microsoftonline.cn/${ TENANT_ID_TOKEN }/oauth2/v2.0/authorize`
   },
   custom: {
     endpoint:      'https://login.microsoftonline.com/',
     graphEndpoint: '',
     tokenEndpoint: '',
-    authEndpoint:  '',
+    authEndpoint:  ''
   }
 };
 
@@ -65,9 +81,9 @@ export default {
   computed: {
     tArgs() {
       return {
-        baseUrl:   this.baseUrl,
-        provider:  this.displayName,
-        username:  this.principal.loginName || this.principal.name,
+        baseUrl:  this.baseUrl,
+        provider: this.displayName,
+        username: this.principal.loginName || this.principal.name
       };
     },
 
@@ -89,11 +105,26 @@ export default {
       return {
         config: {
           ...this.model,
-          enabled:           true,
-          description:       'Enable AzureAD'
+          enabled:     true,
+          description: 'Enable AzureAD'
         }
       };
     },
+
+    needsUpdate() {
+      return (
+        get(this.model, `annotations."${ AZURE_MIGRATED }"`) !== 'true'
+      );
+    },
+
+    modalConfig() {
+      return {
+        applyAction: this.updateEndpoint,
+        applyMode:   'update',
+        title:       this.t('authConfig.azuread.updateEndpoint.modal.title'),
+        body:        this.t('authConfig.azuread.updateEndpoint.modal.body', null, { raw: true })
+      };
+    }
   },
 
   watch: {
@@ -120,18 +151,29 @@ export default {
           this.$set(this, 'applicationSecret', this.model.applicationSecret);
         }
       }
-    }
+    },
+
   },
 
   methods: {
     setEndpoints(endpoint) {
-      Object.keys(ENDPOINT_MAPPING[endpoint]).forEach((key) => {
-        this.$set(this.model, key, ENDPOINT_MAPPING[endpoint][key].replace(TENANT_ID_TOKEN, this.model.tenantId));
-      });
+      if (this.editConfig || !this.model.enabled) {
+        Object.keys(ENDPOINT_MAPPING[endpoint]).forEach((key) => {
+          this.$set(
+            this.model,
+            key,
+            ENDPOINT_MAPPING[endpoint][key].replace(
+              TENANT_ID_TOKEN,
+              this.model.tenantId
+            )
+          );
+        });
+      }
     },
 
     getNewApplicationSecret() {
-      const applicationSecretOrId = this.model.applicationSecret || this.applicationSecret;
+      const applicationSecretOrId =
+        this.model.applicationSecret || this.applicationSecret;
 
       // The application secret comes back as an ID from steve API and this indicates
       // that the current application secret isn't new
@@ -140,8 +182,36 @@ export default {
       }
 
       return applicationSecretOrId;
+    },
+
+    promptUpdate() {
+      this.$store.dispatch('management/promptModal', {
+        component: 'GenericPrompt',
+        resources: [this.modalConfig]
+      });
+    },
+
+    // update the authconfig to change the azure ad graph endpoint to the microsoft graph endpoint
+    // only relevant for setups upgrading to 2.6.6 with azuread auth already enabled
+    updateEndpoint(btnCB) {
+      if (this.needsUpdate) {
+        this.model
+          .doAction('upgrade')
+          .then(() => {
+            this.reloadModel();
+            this.$store.dispatch('growl/success', { message: 'Graph endpoint updated successfully.' });
+            btnCB(true);
+          })
+          .catch((err) => {
+            this.$store.dispatch('growl/fromError', {
+              title: 'Error updating graph endpoint',
+              err
+            });
+            btnCB(false);
+          });
+      }
     }
-  },
+  }
 };
 </script>
 
@@ -154,39 +224,75 @@ export default {
       :resource="model"
       :subtypes="[]"
       :validation-passed="true"
-      :finish-button-mode="model.enabled ? 'edit' : 'enable'"
+      :finish-button-mode="model && model.enabled ? 'edit' : 'enable'"
       :can-yaml="false"
       :errors="errors"
       :show-cancel="showCancel"
       :cancel-event="true"
-      @error="e=>errors = e"
+      @error="e => (errors = e)"
       @finish="save"
       @cancel="cancel"
     >
       <template v-if="model.enabled && !isEnabling && !editConfig">
         <AuthBanner :t-args="tArgs" :disable="disable" :edit="goToEdit">
           <template slot="rows">
-            <tr><td>{{ t(`authConfig.azuread.tenantId`) }}: </td><td>{{ model.tenantId }}</td></tr>
-            <tr><td>{{ t(`authConfig.azuread.applicationId`) }}: </td><td>{{ model.applicationId }}</td></tr>
-            <tr><td>{{ t(`authConfig.azuread.endpoint`) }}: </td><td>{{ model.endpoint }}</td></tr>
-            <tr><td>{{ t(`authConfig.azuread.graphEndpoint`) }}: </td><td>{{ model.graphEndpoint }}</td></tr>
-            <tr><td>{{ t(`authConfig.azuread.tokenEndpoint`) }}: </td><td>{{ model.tokenEndpoint }}</td></tr>
-            <tr><td>{{ t(`authConfig.azuread.authEndpoint`) }}: </td><td>{{ model.authEndpoint }}</td></tr>
+            <tr>
+              <td>{{ t(`authConfig.azuread.tenantId`) }}:</td>
+              <td>{{ model.tenantId }}</td>
+            </tr>
+            <tr>
+              <td>{{ t(`authConfig.azuread.applicationId`) }}:</td>
+              <td>{{ model.applicationId }}</td>
+            </tr>
+            <tr>
+              <td>{{ t(`authConfig.azuread.endpoint`) }}:</td>
+              <td>{{ model.endpoint }}</td>
+            </tr>
+            <tr>
+              <td>{{ t(`authConfig.azuread.graphEndpoint`) }}:</td>
+              <td>{{ model.graphEndpoint }}</td>
+            </tr>
+            <tr>
+              <td>{{ t(`authConfig.azuread.tokenEndpoint`) }}:</td>
+              <td>{{ model.tokenEndpoint }}</td>
+            </tr>
+            <tr>
+              <td>{{ t(`authConfig.azuread.authEndpoint`) }}:</td>
+              <td>{{ model.authEndpoint }}</td>
+            </tr>
+          </template>
+          <template v-if="needsUpdate" slot="actions">
+            <button
+              type="button"
+              class="btn btn-sm role-secondary mr-10 update"
+              @click="promptUpdate"
+            >
+              {{ t('authConfig.azuread.updateEndpoint.button') }}
+            </button>
           </template>
         </AuthBanner>
 
         <hr />
 
-        <AllowedPrincipals provider="azuread" :auth-config="model" :mode="mode" />
+        <AllowedPrincipals
+          provider="azuread"
+          :auth-config="model"
+          :mode="mode"
+        />
       </template>
 
       <template v-else>
-        <Banner v-if="!model.enabled" :label="t('authConfig.stateBanner.disabled', tArgs)" color="warning" />
+        <Banner
+          v-if="!model.enabled"
+          :label="t('authConfig.stateBanner.disabled', tArgs)"
+          color="warning"
+        />
 
-        <InfoBox v-if="!model.enabled" class="mt-20 mb-20 p-10">
-          Azure AD requires a whitelisted URL for your Rancher server before beginning this setup. Please ensure that the following URL is set in the Reply URL section of your Azure Portal. Please note that is may take up to 5 minutes for the whitelisted URL to propagate.
+        <InfoBox v-if="!model.enabled" id="reply-info" class="mt-20 mb-20 p-10">
+          {{ t('authConfig.azuread.reply.info') }}
           <br />
-          <label>Reply URL: </label> <CopyToClipboardText :plain="true" :text="replyUrl" />
+          <label>{{ t('authConfig.azuread.reply.label') }} </label>
+          <CopyToClipboardText :plain="true" :text="replyUrl" />
         </InfoBox>
 
         <div class="row mb-20">
@@ -230,7 +336,7 @@ export default {
           :required="true"
           label="Endpoints"
           name="endpoints"
-          :options="['standard','china', 'custom']"
+          :options="['standard', 'china', 'custom']"
           :mode="mode"
           :labels="['Standard', 'China', 'Custom']"
         />
@@ -276,3 +382,9 @@ export default {
     </CruResource>
   </div>
 </template>
+
+<style lang="scss">
+#reply-info {
+  flex-grow: 0;
+}
+</style>

package/edit/auth/github.vue

@@ -2,9 +2,9 @@
 import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
-import RadioGroup from '@shell/components/form/RadioGroup';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Banner from '@shell/components/Banner';
+import { RadioGroup } from '@components/Form/Radio';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Banner } from '@components/Banner';
 import CopyToClipboard from '@shell/components/CopyToClipboard';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import { MANAGEMENT } from '@shell/config/types';

package/edit/auth/googleoauth.vue

@@ -5,9 +5,9 @@ import AuthConfig from '@shell/mixins/auth-config';
 
 import CruResource from '@shell/components/CruResource';
 import InfoBox from '@shell/components/InfoBox';
-import Checkbox from '@shell/components/form/Checkbox';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Banner from '@shell/components/Banner';
+import { Checkbox } from '@components/Form/Checkbox';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Banner } from '@components/Banner';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import FileSelector from '@shell/components/form/FileSelector';
 import AuthBanner from '@shell/components/auth/AuthBanner';

package/edit/auth/ldap/config.vue

@@ -1,9 +1,9 @@
 <script>
-import RadioGroup from '@shell/components/form/RadioGroup';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Checkbox from '@shell/components/form/Checkbox';
+import { RadioGroup } from '@components/Form/Radio';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Checkbox } from '@components/Form/Checkbox';
 import UnitInput from '@shell/components/form/UnitInput';
-import Banner from '@shell/components/Banner';
+import { Banner } from '@components/Banner';
 import FileSelector from '@shell/components/form/FileSelector';
 
 const DEFAULT_NON_TLS_PORT = 389;
@@ -44,14 +44,14 @@ export default {
 
     return {
       model:         this.value,
-      hostname:      this.value.servers[0],
+      hostname:      this.value.servers.join(','),
       serverSetting: null,
     };
   },
 
   watch: {
     hostname(neu, old) {
-      this.value.servers[0] = neu;
+      this.value.servers = neu.split(',');
     },
     'model.starttls'(neu) {
       if (neu) {
@@ -84,7 +84,15 @@ export default {
     <template>
       <div class="row mb-20">
         <div class="col span-6">
-          <LabeledInput v-model="hostname" required :mode="mode" :label="t('authConfig.ldap.hostname')" />
+          <LabeledInput
+            v-model="hostname"
+            required
+            :mode="mode"
+            :hoover-tooltip="true"
+            :tooltip="t('authConfig.ldap.hostname.hint')"
+            :label="t('authConfig.ldap.hostname.label')"
+            :placeholder="t('authConfig.ldap.hostname.placeholder')"
+          />
         </div>
         <div class="col span-4">
           <LabeledInput

package/edit/auth/ldap/index.vue

@@ -2,8 +2,8 @@
 import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Banner from '@shell/components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Banner } from '@components/Banner';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import config from '@shell/edit/auth/ldap/config';
 import AuthConfig from '@shell/mixins/auth-config';

package/edit/auth/oidc.vue

@@ -3,12 +3,12 @@ import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import AuthConfig from '@shell/mixins/auth-config';
 import CruResource from '@shell/components/CruResource';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Banner from '@shell/components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Banner } from '@components/Banner';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import FileSelector from '@shell/components/form/FileSelector';
 import AuthBanner from '@shell/components/auth/AuthBanner';
-import RadioGroup from '@shell/components/form/RadioGroup';
+import { RadioGroup } from '@components/Form/Radio';
 
 export default {
   components: {

package/edit/auth/saml.vue

@@ -3,9 +3,9 @@ import Loading from '@shell/components/Loading';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import AuthConfig from '@shell/mixins/auth-config';
 import CruResource from '@shell/components/CruResource';
-import LabeledInput from '@shell/components/form/LabeledInput';
-import Checkbox from '@shell/components/form/Checkbox';
-import Banner from '@shell/components/Banner';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import { Checkbox } from '@components/Form/Checkbox';
+import { Banner } from '@components/Banner';
 import AllowedPrincipals from '@shell/components/auth/AllowedPrincipals';
 import FileSelector from '@shell/components/form/FileSelector';
 import AuthBanner from '@shell/components/auth/AuthBanner';

package/edit/autoscaling.horizontalpodautoscaler/index.vue

@@ -2,7 +2,7 @@
 import CreateEditView from '@shell/mixins/create-edit-view';
 
 import CruResource from '@shell/components/CruResource';
-import LabeledInput from '@shell/components/form/LabeledInput';
+import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import Labels from '@shell/components/form/Labels';
 import Loading from '@shell/components/Loading';