@rancher/shell 0.3.4 → 0.3.6

package/assets/images/providers/outscale.svg

@@ -0,0 +1,19 @@
+<svg height="590" preserveAspectRatio="xMidYMid meet" width="607" xmlns="http://www.w3.org/2000/svg"
+    style="">
+    <rect id="backgroundrect" width="100%" height="100%" x="0" y="0" fill="none" stroke="none" />
+
+    <g class="currentLayer" style="">
+        <title>Layer 1</title>
+        <g id="svg_1" class="">
+            <path
+                d="m297.00000850856304,0.9336278513073921 c-37.30000055581331,2.600000038743019 -75.60000112652779,10.800000160932541 -88.30000131577253,18.900000281631947 c-3.9000000581145287,2.400000035762787 -4.700000070035458,3.500000052154064 -4.700000070035458,5.900000087916851 c0,3.8000000566244125 3.7000000551342964,6.500000096857548 12.10000018030405,8.800000131130219 c5.200000077486038,1.4000000208616257 10.600000157952309,1.700000025331974 28.90000043064356,1.5000000223517418 c49.0000007301569,-0.30000000447034836 87.70000130683184,4.200000062584877 112.80000168085098,12.90000019222498 c18.900000281631947,6.70000009983778 25.200000375509262,13.300000198185444 25.200000375509262,26.600000396370888 c-0.10000000149011612,18.500000275671482 -14.000000208616257,40.50000060349703 -46.40000069141388,72.90000108629465 c-20.40000030398369,20.40000030398369 -39.40000058710575,36.700000546872616 -65.1000009700656,55.90000083297491 c-29.10000043362379,21.700000323355198 -43.700000651180744,34.50000051409006 -46.60000069439411,40.90000060945749 c-1.600000023841858,3.500000052154064 -0.4000000059604646,7.1000001057982445 2.9000000432133675,8.50000012665987 c10.500000156462193,4.400000065565109 54.40000081062317,-15.20000022649765 97.70000145584345,-43.60000064969063 c66.30000098794699,-43.50000064820051 111.30000165849924,-93.20000138878822 120.00000178813934,-132.7000019773841 c2.3000000342726707,-10.200000151991844 1.700000025331974,-24.70000036805868 -1.4000000208616257,-32.600000485777855 c-7.600000113248825,-19.900000296533108 -33.20000049471855,-34.400000512599945 -72.20000107586384,-40.90000060945749 c-23.400000348687172,-3.9000000581145287 -48.20000071823597,-4.90000007301569 -74.90000111609697,-3.0000000447034836 z"
+                stroke-width="0" id="svg_2" />
+            <path
+                d="m462.00001096725464,198.9336308017373 c-38.40000057220459,4.200000062584877 -65.70000097900629,16.100000239908695 -80.40000119805336,35.200000524520874 c-13.500000201165676,17.50000026077032 -12.300000183284283,38.60000057518482 3.9000000581145287,66.60000099241734 c9.80000014603138,16.900000251829624 22.600000336766243,33.5000004991889 60.200000897049904,77.60000115633011 c27.500000409781933,32.40000048279762 32.100000478327274,38.10000056773424 39.300000585615635,48.800000727176666 c15.600000232458115,23.400000348687172 16.300000242888927,40.40000060200691 2.0000000298023224,47.70000071078539 c-16.20000024139881,8.300000123679638 -41.40000061690807,10.900000162422657 -140.00000208616257,14.500000216066837 c-23.400000348687172,0.9000000134110452 -43.80000065267086,2.400000035762787 -48.50000072270632,3.6000000536441807 c-5.700000084936619,1.5000000223517418 -8.50000012665987,4.400000065565109 -8.50000012665987,9.00000013411045 c0,7.600000113248825 8.200000122189522,11.10000016540289 35.200000524520874,15.300000227987766 c86.70000129193068,13.40000019967556 161.60000240802765,12.10000018030405 200.70000299066305,-3.500000052154064 c29.000000432133675,-11.60000017285347 45.200000673532486,-34.60000051558018 42.100000627338886,-59.60000088810921 c-3.1000000461935997,-24.00000035762787 -20.800000309944153,-49.70000074058771 -82.10000122338533,-119.50000178068876 c-33.80000050365925,-38.500000573694706 -42.900000639259815,-53.30000079423189 -42.900000639259815,-70.00000104308128 c0,-11.200000166893005 5.100000075995922,-16.900000251829624 18.900000281631947,-21.200000315904617 c15.800000235438347,-4.90000007301569 30.100000448524952,-6.3000000938773155 85.40000127255917,-8.100000120699406 c45.80000068247318,-1.5000000223517418 52.700000785291195,-2.3000000342726707 57.40000085532665,-6.70000009983778 c6.800000101327896,-6.400000095367432 -2.3000000342726707,-14.900000222027302 -21.200000315904617,-19.700000293552876 c-8.800000131130219,-2.2000000327825546 -33.00000049173832,-6.400000095367432 -50.00000074505806,-8.700000129640102 c-13.300000198185444,-1.8000000268220901 -59.50000088661909,-2.7000000402331352 -71.50000106543303,-1.3000000193715096 z"
+                stroke-width="0" id="svg_3" />
+            <path
+                d="m164.50000653415918,281.2336320281029 c-45.10000067204237,5.000000074505806 -81.50000121444464,13.90000020712614 -91.50000136345625,22.20000033080578 c-3.9000000581145287,3.300000049173832 -3.9000000581145287,6.500000096857548 0,9.80000014603138 c6.400000095367432,5.300000078976154 19.500000290572643,6.70000009983778 57.50000085681677,5.900000087916851 c80.0000011920929,-1.700000025331974 127.2000018954277,8.900000132620335 138.60000206530094,30.90000046044588 c3.0000000447034836,5.800000086426735 3.7000000551342964,18.900000281631947 1.5000000223517418,27.500000409781933 c-5.100000075995922,19.500000290572643 -19.900000296533108,40.80000060796738 -45.80000068247318,65.90000098198652 c-41.100000612437725,39.90000059455633 -100.80000150203705,75.30000112205744 -127.60000190138817,75.80000112950802 c-6.3000000938773155,0.10000000149011612 -7.600000113248825,-0.20000000298023224 -8.900000132620335,-1.9000000283122063 c-5.800000086426735,-7.800000116229057 10.500000156462193,-44.00000065565109 51.60000076889992,-114.40000170469284 c13.600000202655792,-23.20000034570694 19.200000286102295,-35.50000052899122 19.400000289082527,-42.60000063478947 c0.20000000298023224,-5.700000084936619 -1.5000000223517418,-7.500000111758709 -7.300000108778477,-7.500000111758709 c-3.8000000566244125,0 -5.900000087916851,0.800000011920929 -10.700000159442425,3.9000000581145287 c-7.900000117719173,5.100000075995922 -14.70000021904707,13.200000196695328 -34.400000512599945,40.80000060796738 c-35.00000052154064,48.90000072866678 -60.10000089555979,88.60000132024288 -82.70000123232603,130.40000194311142 c-18.30000027269125,33.70000050216913 -24.2000003606081,47.300000704824924 -24.2000003606081,55.40000082552433 c0,6.200000092387199 1.5000000223517418,7.000000104308128 12.400000184774399,6.800000101327896 c33.5000004991889,-0.6000000089406967 114.10000170022249,-30.90000046044588 173.80000258982182,-65.20000097155571 c79.80000118911266,-45.80000068247318 130.80000194907188,-98.90000147372484 150.40000224113464,-156.60000233352184 c3.400000050663948,-9.80000014603138 3.8000000566244125,-12.10000018030405 3.7000000551342964,-20.500000305473804 c0,-11.10000016540289 -2.1000000312924385,-17.50000026077032 -8.600000128149986,-27.3000004068017 c-12.300000183284283,-18.200000271201134 -44.40000066161156,-32.00000047683716 -88.700001321733,-38.20000056922436 c-15.70000023394823,-2.2000000327825546 -62.30000092834234,-2.8000000417232513 -78.50000116974115,-1.1000000163912773 z"
+                stroke-width="0" id="svg_4" />
+        </g>
+    </g>
+</svg>

package/assets/styles/app.scss

@@ -33,4 +33,4 @@
 @import "./vendor/vue-select";
 @import "./vendor/vue-js-modal";
 @import "./vendor/code-mirror";
-@import '@/node_modules/xterm/css/xterm.css';
+@import 'node_modules/xterm/css/xterm.css';

package/assets/styles/base/_basic.scss

@@ -1,3 +1,5 @@
+@import "./mixins";
+
 // -----------------------------------------------------------------------------
 // This file contains very basic styles.
 // -----------------------------------------------------------------------------
@@ -109,3 +111,19 @@ HR.vertical {
   margin-left: -1px;
   top: 0;
 }
+
+// --------------------------------------------------------------------------------------------------------
+// These were declared in _mixins, but that results in these styles being declared for every Vue component
+// Moved here, as these are styles and mixins should only include mixing definitions, not style definitions
+// --------------------------------------------------------------------------------------------------------
+
+.clearfix         { @include clearfix; }
+.list-unstyled    { @include list-unstyled }
+.no-select        { @include no-select }
+.no-resize        { @include no-resize }
+.hand             { @include hand }
+.fixed            { @include fixed }
+.clip             { @include clip }
+.force-wrap       { @include force-wrap }
+.bordered-section { @include bordered-section }
+.section-divider  { @include section-divider }

package/assets/styles/base/_mixins.scss

@@ -63,17 +63,6 @@
   margin-top: 20px;
 }
 
-.clearfix         { @include clearfix; }
-.list-unstyled    { @include list-unstyled }
-.no-select        { @include no-select }
-.no-resize        { @include no-resize }
-.hand             { @include hand }
-.fixed            { @include fixed }
-.clip             { @include clip }
-.force-wrap       { @include force-wrap }
-.bordered-section { @include bordered-section }
-.section-divider  { @include section-divider }
-
 /// Sets the specified background color and calculates a dark or light contrasted text color.
 @mixin contrasted($background-color, $dark: $contrasted-dark, $light: $contrasted-light) {
   color: contrast-color($background-color, $dark, $light);

package/assets/styles/base/_variables.scss

@@ -52,9 +52,7 @@ $breakpoints: (
 
 $font-size-h2: 21px;
 
-/*
- * Global spacing variables
- */
+// Global spacing variables
 $space-s: 10px;
 $space-m: 20px;
-$space-l: 40px;
+$space-l: 40px;

package/assets/styles/fonts/_fontstack.scss

@@ -4,8 +4,8 @@
   font-style: normal;
   font-weight: normal;
   src: local(''),
-       url('~shell/assets/fonts/poppins/poppins-v15-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
-       url('~shell/assets/fonts/poppins/poppins-v15-latin-300.woff') format('woff'), /* Modern Browsers */
+    url('~@shell/assets/fonts/poppins/poppins-v15-latin-300.woff2') format('woff2'), /* Super Modern Browsers */
+    url('~@shell/assets/fonts/poppins/poppins-v15-latin-300.woff') format('woff'), /* Modern Browsers */
 }
 
 /* poppins-500 - latin */
@@ -14,8 +14,8 @@
   font-style: normal;
   font-weight: bold;
   src: local(''),
-       url('~shell/assets/fonts/poppins/poppins-v15-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
-       url('~shell/assets/fonts/poppins/poppins-v15-latin-500.woff') format('woff'), /* Modern Browsers */
+    url('~@shell/assets/fonts/poppins/poppins-v15-latin-500.woff2') format('woff2'), /* Super Modern Browsers */
+    url('~@shell/assets/fonts/poppins/poppins-v15-latin-500.woff') format('woff'), /* Modern Browsers */
 }
 
 /* lato-regular - latin */
@@ -24,8 +24,8 @@
   font-style: normal;
   font-weight: normal;
   src: local(''),
-       url('~shell/assets/fonts/lato/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('~shell/assets/fonts/lato/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */
+    url('~@shell/assets/fonts/lato/lato-v17-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('~@shell/assets/fonts/lato/lato-v17-latin-regular.woff') format('woff'), /* Modern Browsers */
 }
 
 /* lato-700 - latin */
@@ -34,8 +34,8 @@
   font-style: normal;
   font-weight: bold;
   src: local(''),
-       url('~shell/assets/fonts/lato/lato-v17-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
-       url('~shell/assets/fonts/lato/lato-v17-latin-700.woff') format('woff'), /* Modern Browsers */
+    url('~@shell/assets/fonts/lato/lato-v17-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
+    url('~@shell/assets/fonts/lato/lato-v17-latin-700.woff') format('woff'), /* Modern Browsers */
 }
 
 /* roboto-mono-regular - latin */
@@ -44,6 +44,6 @@
   font-style: normal;
   font-weight: normal;
   src: local(''),
-       url('~shell/assets/fonts/roboto-mono/roboto-mono-v13-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
-       url('~shell/assets/fonts/roboto-mono/roboto-mono-v13-latin-regular.woff') format('woff'), /* Modern Browsers */
-}
+    url('~@shell/assets/fonts/roboto-mono/roboto-mono-v13-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
+    url('~@shell/assets/fonts/roboto-mono/roboto-mono-v13-latin-regular.woff') format('woff'), /* Modern Browsers */
+}

package/assets/styles/global/_button.scss

@@ -87,7 +87,7 @@ button,
 
   &:hover, &._hover {
     color: var(--lightest) !important;
-  }  
+  }
 
   &:focus, &.focused {
     background-color: var(--primary-hover-bg);
@@ -120,7 +120,17 @@ button,
 
 .role-link {
   background: transparent;
-  color: var(--link) !important;
+  color: var(--link);
+
+  &:hover, &._hover {
+    color: var(--lightest);
+  }
+
+  &:focus, &.focused {
+    background: transparent;
+    color: var(--link);
+    box-shadow: none;
+  }
 }
 
 .role-multi-action {

package/assets/styles/vendor/vue-js-modal.scss

@@ -1,4 +1,4 @@
-@import '~/node_modules/vue-js-modal/dist/styles.css';
+@import 'node_modules/vue-js-modal/dist/styles.css';
 
 .v--modal-overlay {
   background-color: var(--overlay-bg);
@@ -10,7 +10,7 @@
 }
 
 .v--modal {
-  background-color: var(--modal-bg)!important;
+  background-color: var(--modal-bg) !important;
   box-shadow: none;
   border: 2px solid var(--modal-border);
-}
+}

package/assets/translations/en-us.yaml

@@ -22,6 +22,7 @@ generic:
   disabled: Disabled
   done: Done
   enabled: Enabled
+  here: here
   id: ID
   ignored: Ignored
   invalidCron: Invalid cron schedule
@@ -819,6 +820,8 @@ catalog:
       clusterToolExists: This chart has a fixed namespace and name. A matching <a href="{url}">application</a> has been found and any changes will be made to it.
     banner:
       legacy: 'PSP Removal: Before upgrading a cluster to Kubernetes 1.25+, please ensure you review your Helm applications for Pod Security Policies and update them accordingly'
+    enablePSP: Enable Pod Security Policies
+    global: Global
   charts:
     all: All
     categories:
@@ -1067,7 +1070,6 @@ cis:
   testID: Test ID
   testsSkipped: Tests Skipped
   testsToSkip: Tests to Skip
-  workerProfile: CIS Profile
 
 cluster:
   addonChart:
@@ -1262,6 +1264,7 @@ cluster:
       affinity:
         namespaces:
           placeholder: e.g. default,system,base
+      installGuestAgent: Install guest agent
   description:
     label: Cluster Description
     placeholder: Any text you want that better describes this cluster
@@ -1311,8 +1314,9 @@ cluster:
   manageAction: Manage
   kubernetesVersion:
     label: Kubernetes Version
-    experimental: experimental
-    deprecated: deprecated
+    current: (current)
+    experimental: (experimental)
+    deprecated: (deprecated)
     deprecatedPatches: Show deprecated Kubernetes patch versions
     deprecatedPatchWarning: We recommend using the latest patch version for each minor Kubernetes version. Deprecated patch versions can be useful for migration purposes.
   toolsTip: Use the new Cluster Tools to manage and install Monitoring, Logging and other tools
@@ -1344,6 +1348,10 @@ cluster:
       availabilityZone:
         label: Availability Zone
         description: Availability zones protect applications from complete Azure data center failures.
+        publicIpAndSKUWarning: Availability zones require Static Public IP and Use Standard SKU for Public IP to be enabled.
+        publicIpWarning: Availability zones require Static Public IP to be enabled.
+        standardSKUWarning: Availability zones require Use Standard SKU for Public IP to be enabled.
+        managedDisksWarning: Availability zones require Managed Disks to be enabled.
       dns:
         help: A unique DNS label for the public IP address.
         label: DNS Label
@@ -1379,8 +1387,15 @@ cluster:
           label: No Public IP
         staticPublicIp:
           label: Static Public IP
+        standardSKU:
+          label: Use Standard SKU for Public IP
       resourceGroup:
         label: Resource Group
+      sections:
+        availabilitySetConfiguration: Availability Set Configuration
+        purchasePlan: Purchase Plan
+        network: Network
+        disks: Disks
       size:
         label: VM Size
         tooltip: When accelerated networking is enabled, not all sizes are available.
@@ -1607,11 +1622,10 @@ cluster:
     os: 'You are attemping to add a {newOS} worker node to a cluster with one or more {existingOS} worker nodes: some installed apps may need to be upgraded or removed.'
     rke2-k3-reprovisioning: 'Making changes to cluster configuration may result in nodes reprovisioning. For more information see the <a target="blank" href="{docsBase}/cluster-provisioning/rke-clusters/behavior-differences-between-rke1-and-rke2/" target="_blank" rel="noopener nofollow">documentation</a>.'
     desiredNodeGroupWarning: There are 0 nodes available to run the cluster agent. The cluster will not become active until at least one node is available.
-    invalidPsps: You have one or more PodSecurityPolicy resource(s) in this cluster. Pod Security Policies are not available in Kubernetes v1.25.
+    invalidPsps: You have one or more PodSecurityPolicy resource(s) in this cluster. Pod Security Policies are not available in Kubernetes v1.25 and will be automatically removed.
     haveArgInfo: Configuration information is not available for the selected Kubernetes version.  The options available in this screen will be limited, you may want to use the YAML editor.
     deprecatedPsp: Pod Security Policies are deprecated as of Kubernetes v1.21, and have been removed in Kubernetes v1.25.
-    removedPsp: Pod Security Policies have been removed in Kubernetes v1.25, use PodSecurity Admission instead.
-
+    removedPsp: Pod Security Policies have been removed in Kubernetes v1.25, use Pod Security Admission instead.
   rkeTemplateUpgrade: Template revision {name} available for upgrade
 
   availabilityWarnings:
@@ -1667,11 +1681,17 @@ cluster:
       label: Drain Before Delete
     role:
       label: Roles
+      etcd: etcd
+      controlPlane: Control Plane
+      worker: Worker
     labels:
       label: Kubernetes Node Labels
     noAccessBanner: "You do not have access to see this machine pool's configuration."
     configNotFound: "We could not find this machine pool's configuration. We recommend that you create a new cluster with the desired configuration."
     noPoolsDisclaimer: You do not have any machine pools defined, click the plus to add one.
+    truncationPool: "Hostname truncation has been manually configured for this pool to {limit}"
+    truncationCluster: "Hostname truncation has been manually configured for this cluster to {limit}"
+
     autoReplace:
       label: Auto Replace
       toolTip: If greater than 0, nodes that are unreachable for this duration will be automatically deleted and replaced.
@@ -1760,6 +1780,14 @@ cluster:
     create-template: Use a Catalog Template to create a cluster
     register-custom: Import any Kubernetes cluster
   rke2:
+    banner:
+      psaChange: PSACT is now set to Rancher default automatically
+      cisOverride: Changing this setting may affect cluster security as it overrides default CIS settings
+      cisUnsupported: The selected Kubernetes Version no longer supports CIS Profile "{cisProfile}". Please select a supported profile. We recommend reviewing the <a href="https://docs.rke2.io/security/hardening_guide" target="_blank" rel="noopener noreferrer nofollow">documentation</a> to evaluate the impact of changing the CIS Profile.
+    modal:
+      pspChange:
+        title: Pod Security Policy deprecation
+        body: Kubernetes has removed support for Pod Security Policies (PSPs) starting with version 1.25. If your cluster has PodSecurityPolicy admission controller enabled via "kube-apiserver-arg.enable-admission-plugins" in Cluster YAML, it has to be <i>manually</i> removed before proceeding with the upgrade. Additionally, any PSPs that may be present in the cluster will no longer be available/enforced. Do you want to proceed?
     snapshots:
       suffix: Snapshots per node
     systemService:
@@ -1777,12 +1805,18 @@ cluster:
         label: Default - RKE2 Embedded
     security:
       header: Security
+    cis:
+      server: Server CIS Profile
+      agent: CIS Profile
+      override: Allow the default Pod Security Admission Configuration Template to be overridden when using a CIS Profile
     defaultPodSecurityPolicyTemplateName:
       label: Default Pod Security Policy
-      option: RKE Default
+      option: Default - RKE2 Embedded
     defaultPodSecurityAdmissionConfigurationTemplateName:
-      label: Default Pod Security Admission
-      option: (None)
+      label: Pod Security Admission Configuration Template
+      option: 
+        none: (None)
+        default: Default - RKE2 Embedded
     cisProfile:
       option: (None)
     enableNetworkPolicy:
@@ -1800,6 +1834,7 @@ cluster:
       label: Drain Nodes
       toolTip: Draining preemptively removes the pods on each node so there are no running workloads on the nodes being upgraded.  Upgrading without draining is faster and causes less shuffling around, but pods may still be restarted depending on the upgrade being performed.
     deleteEmptyDir: "By default, pods using emptyDir volumes will be deleted on upgrade. Operations reliant on emptyDir volumes persisting through the pod's lifecycle may be impacted."
+    truncateHostnames: Truncate hostnames to 15 characters for NetBIOS compatibility.
     address:
       tooltip: Cluster networking values cannot be changed after the cluster is created.
       header: Addressing
@@ -2077,7 +2112,12 @@ fleet:
       placeholder: e.g. https://github.com/rancher/fleet-examples.git or git@github.com:rancher/fleet-examples.git
       addRepo: Add Repository
       noRepos: No repositories have been added
+      noWorkspaces: There are no workspaces. <br/> Please create a workspace before adding repositories
       protocolBanner: Enter a valid HTTPS or SSH URL to a git repository.
+    resources:
+      label: 'Resource Handling'
+      keepResources: Keep resources after deletion
+      resourceBanner: When enabled above, resources will be kept when deleting a GitRepo or Bundle - only Helm release secrets will be deleted.
     add:
       steps:
         repoInfo:
@@ -2128,6 +2168,7 @@ fleet:
       cluster: There are no clusters available
     workspace:
       label: Workspace
+      addWorkspace: Create a workspace
   clusterGroup:
     selector:
       label: Cluster Selectors
@@ -2148,7 +2189,17 @@ fleet:
     error: Error
     ready: Ready
     errors: Errors
-
+  workspaces: 
+    tabs:
+      restrictions: Allowed Target Namespaces
+    timeout: Workspace creation timeout. It's possible the workspace was created. We suggest checking the workspace page before trying to create another.
+  restrictions: 
+    addTitle: 'allowedTargetNamespaces'
+    addLabel: Add
+    banner: "{count, plural,
+          =0 { Adding namespaces here will create a GitRepoRestriction. }
+          other { Only the Git Repo Restriction's <code>allowedTargetNamespaces</code> is managed here. You can make additional changes to the Git Repo Restriction} 
+        }"
 footer:
   docs: Docs
   download: Download CLI
@@ -2157,6 +2208,7 @@ footer:
   slack: Slack
 
 gatekeeperConstraint:
+  downloadViolations: Download Violations
   match:
     title: Match
   tab:
@@ -2184,14 +2236,22 @@ gatekeeperConstraint:
       editAsYaml: Edit as YAML
       title: Parameters
   template: Template
+  enforcement:
+    action: Enforcement Action
   violations:
-    title: Violations
+    title: "Violations: {total}"
+    notAll: Not all are shown due to the configured OPA Gatekeeper constraint violation limit - the constraint only includes details for {shown}
 
 gatekeeperIndex:
   poweredBy: OPA Gatekeeper
   unavailable: OPA + Gatekeeper is not available in the system-charts catalog.
   violations: Violations
 
+gatekeeperInstall: 
+  auditInterval: Auto Interval
+  constraintViolationsLimit: Constraint Violations Limit
+  runtimeDefaultSeccompProfile: Enable Runtime Default Seccomp Profile
+
 glance:
   created: Created
   cpu: CPU Usage
@@ -2402,7 +2462,7 @@ istio:
       label: Jaeger
       description: Monitor and Troubleshoot microservices-based distributed systems.
     disabled: '{app} is not installed'
-  cni: Enabled CNI
+  cni: Enable CNI
   customOverlayFile:
     label: Custom Overlay File
     tip: 'The <a target="_blank" rel="noopener noreferrer nofollow" href="https://istio.io/latest/docs/setup/additional-setup/customize-installation/#patching-the-output-manifest">overlay file</a> allows for additional configuration on top of the base {vendor} Istio installation. You can utilize the <a href="https://istio.io/latest/docs/reference/config/istio.operator.v1alpha1/" target="_blank" rel="noopener noreferrer nofollow" >IstioOperator API</a> to make changes and additions for all components and apply those changes via this overlay YAML file.'
@@ -2553,20 +2613,21 @@ istio:
         label: Subject Alternative Names
         placeholder: e.g. example.com
         add: Add Subject Alternative Name
-  egressGateway: Enabled Egress Gateway
-  ingressGateway: Enabled Ingress Gateway
-  istiodRemote: Enabled istiodRemote
-  kiali: Enabled Kiali
-  pilot: Enabled Pilot
-  policy: Enabled Policy
+  egressGateway: Enable Egress Gateway
+  ingressGateway: Enable Ingress Gateway
+  istiodRemote: Enable istiodRemote
+  kiali: Enable Kiali
+  pilot: Enable Pilot
+  policy: Enable Policy
+  pilotRequired: Pilot must be enabled in order to enable Kiali
   poweredBy: Powered by <a target="_blank" rel="noopener noreferrer nofollow" href='https://istio.io/latest/'>Istio</a>
-  telemetry: Enabled Telemetry
+  telemetry: Enable Telemetry
   titles:
     components: Components
     customAnswers: Custom Answers
     advanced: Advanced Settings
     description: Description
-  tracing: Enabled Jaeger Tracing (limited)
+  tracing: Enable Jaeger Tracing (limited)
   v1Warning: Please uninstall the current Istio version in the <code>istio-system</code> namespace before attempting to install this version.
 
 labels:
@@ -2727,6 +2788,7 @@ logging:
     sslClientCertKey: Cert Key from Secret
   loki:
     url: URL
+    urlInvalid: Incorrect URL format. Please  check and correct your URL format before saving.
     tenant: Tenant
     username: User from Secret
     password: Password from Secret
@@ -2928,6 +2990,8 @@ members:
   clusterMembers: Cluster Members
   clusterAndProject: Cluster and Project Members
   createActionLabel: Add
+  clusterMemebership: Cluster Membership
+  projectMembership: Project Memebership
   clusterPermissions:
     noDescription: User created - no description
     label: Cluster Permissions
@@ -2952,6 +3016,7 @@ members:
     custom:
       label: Custom
       description: Choose individual roles for this user.
+      lockedRole: This role is locked.
   localClusterWarning: "Caution: This is the cluster that Rancher is using as a data store. Only administrators should be given write access to this cluster. Users with write access to this cluster can use it to grant themselves access to any part of this installation."
   noRolesAssigned: There are no users assigned to this project.
 
@@ -3294,6 +3359,7 @@ namespace:
   resourceQuotas: Resource Quotas
   project:
     label: Project
+    none: (None)
   resources: Resources
   enableAutoInjection: Enable Istio Auto Injection
   disableAutoInjection: Disable Istio Auto Injection
@@ -3394,6 +3460,8 @@ networkpolicy:
   labelsAnnotations:
     label: Labels & Annotations
   rules:
+    pod: Pod
+    namespace: Namespace
     ruleLabel: Rule {index}
     addPort: Add allowed port
     type: Rule type
@@ -3420,6 +3488,8 @@ networkpolicy:
       label: Pod Selector
     namespaceSelector:
       label: Namespace Selector
+    namespaceAndPodSelector:
+      label: Namespace/Pod Selector
   config:
     label: Configuration
   selectors:
@@ -3439,6 +3509,18 @@ networkpolicy:
           =1 {Matches 1 of {total, number} namespaces: "{sample}"}
           other {Matches {matched, number} of {total, number} existing namespaces, including "{sample}"}
         }
+    matchingNamespacesAndPods:
+      tooltip: A single entry rule that specifies both Namespace Selector and Pod Selector that selects particular Pods within particular namespaces
+      matchesSome: |-
+        {matchedPods, plural,
+          =0 {Matches 0 of {totalPods, number} pods}
+          =1 {Matches 1 of {totalPods, number} pods: "{samplePods}"}
+          other {Matches {matchedPods, number} of {totalPods, number} existing pods, including "{samplePods}"}
+        } in {matchedNamespaces, plural,
+          =0 {0 of {totalNamespaces, number} namespaces}
+          =1 {1 of {totalNamespaces, number} namespaces: "{sampleNamespaces}"}
+          other {{matchedNamespaces, number} of {totalNamespaces, number} existing namespaces, including "{sampleNamespaces}"}
+        }
 node:
   list:
     pool: Pool
@@ -3449,6 +3531,9 @@ node:
     poolDescription:
       noSize: No Size
       noLocation: No Location
+    nodeLabels: Labels
+    hideLabels: Show less
+    showLabels: Show more
   detail:
     detailTop:
       containerRuntime: Container Runtime
@@ -3857,6 +3942,7 @@ podDisruptionBudget:
 
 # Rancher Extensions
 plugins:
+  incompatibleDisclaimer: "The latest version of this extension ({ version }) is not compatible with the current Rancher version ({ rancherVersion })."
   labels:
     builtin: Built-in
     experimental: Experimental
@@ -3890,6 +3976,7 @@ plugins:
     detail: Detail
     versions: Versions
     versionError: Could not load version information
+    requiresVersion: "Requires Rancher {version}"
   empty:
     all: Extensions are neither installed nor available
     available: No Extensions available
@@ -3952,7 +4039,7 @@ podSecurityAdmission:
   name: Pod Security Admission
   description: Define the admission control mode you want to use for the pod security
   banner: 
-    modifications: 'Note: Modifying a Pod Security Admission Configuration Template will not affect any downstream cluster that references it until there is a cluster update'
+    modifications: 'Changing any template that is currently in use will cause an update to those live clusters the next time the cluster is updated'
   labels:
     enforce: Enforce
     audit: Audit
@@ -4119,6 +4206,7 @@ projectNamespaces:
   label: Projects/Namespaces
   noNamespaces: There are no namespaces defined.
   noProjectNoNamespaces: All namespaces are in a project
+  isIstioInjectionEnabled: Istio automatic sidecar injection is enabled for this namespace
 
 prometheusRule:
   alertingRules:
@@ -4467,6 +4555,7 @@ resourceTable:
     namespace: Group by Namespace
     project: Group by Project
     node: Group by Node
+    role: Group by Role
     cluster: Group by Cluster
   groupLabel:
     cluster: "<span>Cluster:</span> {name}"
@@ -5126,6 +5215,7 @@ tableHeaders:
   clusterGroups: Cluster Groups
   commit: Commit
   condition: Condition
+  constraint: Constraint
   completions: Completions
   count: Count
   createdAt: Created At
@@ -5291,6 +5381,7 @@ tableHeaders:
   target: Target
   targetKind: Target Type
   targetPort: Target
+  template: Template
   type: Type
   updated: Updated
   up-to-date: Up To Date
@@ -7105,7 +7196,7 @@ legacy:
   globalDnsProviders: Global DNS Providers
   notifiers: Notifiers
   monitoring: Monitoring
-  psps: Pod Security Policies
+  psps: Pod Security Policy Templates
   secrets: Secrets
 
   project: