@rancher/shell 3.0.12-rc.1 → 3.0.12-rc.3

package/models/management.cattle.io.node.js

@@ -1,7 +1,5 @@
 import { MANAGEMENT_NODE } from '@shell/config/labels-annotations';
-import {
-  ADDRESSES, CAPI, MANAGEMENT, NODE, NORMAN
-} from '@shell/config/types';
+import { ADDRESSES, MANAGEMENT, NODE, NORMAN } from '@shell/config/types';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { listNodeRoles } from '@shell/models/cluster/node';
 import { downloadUrl } from '@shell/utils/download';
@@ -26,6 +24,10 @@ export default class MgmtNode extends HybridModel {
     return this.metadata.labels[MANAGEMENT_NODE.NODE_NAME];
   }
 
+  get mgmtCluster() {
+    return this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, this.mgmtClusterId);
+  }
+
   get mgmtClusterId() {
     return this.id.substring(0, this.id.indexOf('/'));
   }
@@ -101,7 +103,7 @@ export default class MgmtNode extends HybridModel {
   }
 
   get provisioningCluster() {
-    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find((c) => c.mgmtClusterId === this.mgmtClusterId);
+    return this.mgmtCluster?.provCluster;
   }
 
   get doneOverride() {

package/models/management.cattle.io.nodepool.js

@@ -45,7 +45,7 @@ export default class MgmtNodePool extends HybridModel {
   }
 
   get provisioningCluster() {
-    return this.$getters['all'](CAPI.RANCHER_CLUSTER).find((c) => c.name === this.spec.clusterName);
+    return this.$getters['byId'](CAPI.RANCHER_CLUSTER, `${ this.metadata.namespace }/${ this.spec.clusterName }`);
   }
 
   get doneOverride() {

package/models/monitoring.coreos.com.alertmanagerconfig.js

@@ -5,25 +5,39 @@ import { set } from '@shell/utils/object';
 
 export default class AlertmanagerConfig extends SteveModel {
   applyDefaults() {
-    if (this.spec) {
-      return this.spec;
-    }
-    const existingReceivers = this.spec?.route?.receivers || [];
-
-    const defaultSpec = {
-      receivers: [...existingReceivers],
-      route:     {
-        receivers:      this.spec?.route?.receivers || [],
-        groupBy:        this.spec?.route?.groupBy || [],
-        groupWait:      this.spec?.route?.groupWait || '30s',
-        groupInterval:  this.spec?.route?.groupInterval || '5m',
-        repeatInterval: this.spec?.route?.repeatInterval || '4h',
-        match:          this.spec?.route?.match || {},
-        matchRe:        this.spec?.route?.matchRe || {}
+    const spec = this.spec || {};
+
+    spec.receivers = spec.receivers || [];
+
+    // Always provide a route object so the Route tab has something to bind to,
+    // even when loading a resource that was saved without `spec.route`.
+    const route = { ...(spec.route || {}) };
+
+    route.groupBy = route.groupBy || [];
+    route.groupWait = route.groupWait || '30s';
+    route.groupInterval = route.groupInterval || '5m';
+    route.repeatInterval = route.repeatInterval || '4h';
+    route.matchers = route.matchers || [];
+
+    spec.route = route;
+
+    set(this, 'spec', spec);
+  }
+
+  cleanForSave(data, forNew) {
+    const val = super.cleanForSave(data, forNew);
+    const route = val?.spec?.route;
+
+    if (route) {
+      // When a route is present its `receiver` is required and must match an
+      // entry in `spec.receivers`. Until the user has defined a receiver the
+      // root route can't direct alerts anywhere, so drop it entirely
+      if (!route.receiver) {
+        delete val.spec.route;
       }
-    };
+    }
 
-    set(this, 'spec', defaultSpec);
+    return val;
   }
 
   get _availableActions() {

package/models/networking.k8s.io.ingress.js

@@ -1,5 +1,5 @@
 import { SECRET, SERVICE } from '@shell/config/types';
-import isUrl from 'is-url';
+import { isValidUrl } from '@shell/utils/validators/setting';
 import { get } from '@shell/utils/object';
 import isEmpty from 'lodash/isEmpty';
 import SteveModel from '@shell/plugins/steve/steve-class';
@@ -76,15 +76,15 @@ export default class Ingress extends SteveModel {
     const fullPath = this.fullPath(rule, path);
 
     return {
-      // isUrl thinks urls which contain '*' are valid so I'm adding an additional check for '*'
-      isUrl:           isUrl(fullPath) && !fullPath.includes('*'),
+      // is-url thinks urls which contain '*' are valid so adding an additional check for '*'
+      isUrl:           isValidUrl(fullPath) && !fullPath.includes('*'),
       pathType:        path.pathType,
       fullPath,
       serviceName,
       serviceTargetTo: this.targetTo(workloads, serviceName),
       certs:           this.certLinks(rule, certificates),
       targetLink:      this.targetLink(workloads, serviceName),
-      port:            get(path?.backend, this.servicePortPath)
+      port:            get(path?.backend, this.servicePortPath) || get(path?.backend, this.servicePortNamePath)
     };
   }
 
@@ -184,6 +184,14 @@ export default class Ingress extends SteveModel {
     return this.useNestedBackendField ? nestedPath : flatPath;
   }
 
+  get servicePortNamePath() {
+    const nestedPath = 'service.port.name';
+    // Flat API has a single `servicePort` field for both name and number.
+    const flatPath = 'servicePort';
+
+    return this.useNestedBackendField ? nestedPath : flatPath;
+  }
+
   get defaultBackendPath() {
     const defaultBackend = this.$rootGetters['cluster/pathExistsInSchema'](this.type, 'spec.defaultBackend');
 

package/models/nodedriver.js

@@ -13,6 +13,13 @@ export default class NodeDriver extends Driver {
     return 'c-cluster-manager-driver-nodedriver';
   }
 
+  get parentLocationOverride() {
+    return {
+      name:   'c-cluster-manager-driver-nodedriver',
+      params: { cluster: this.$rootGetters['clusterId'] }
+    };
+  }
+
   get _availableActions() {
     const out = [
       {