EKS Provisioning

cypress/e2e/blueprints/manager/clusterProviderUrlCheck.ts

@@ -5,11 +5,11 @@ export const providersList = [
     conditions:                [
       {
         rkeType: 'rke2',
-        loads:   'rke1'
+        loads:   'rke2'
       },
       {
         rkeType: 'rke1',
-        loads:   'rke1'
+        loads:   'rke2'
       },
     ]
   },

package.json

@@ -57,6 +57,7 @@
   "dependencies": {
     "@aws-sdk/client-ec2": "3.1.0",
     "@aws-sdk/client-eks": "3.1.0",
+    "@aws-sdk/client-iam": "3.18.0",
     "@aws-sdk/client-kms": "3.8.1",
     "@innologica/vue-dropdown-menu": "0.1.3",
     "@novnc/novnc": "1.2.0",
@@ -131,6 +132,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "7.14.5",
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
+    "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
     "@babel/preset-typescript": "7.16.7",
     "@cypress/code-coverage": "3.10.4",
     "@cypress/grep": "^3.1.5",

pkg/aks/components/CruAks.vue

@@ -32,9 +32,11 @@ import ClusterMembershipEditor, { canViewClusterMembershipEditor } from '@shell/
 import AksNodePool from '@pkg/aks/components/AksNodePool.vue';
 import type { AKSDiskType, AKSNodePool, AKSPoolMode, AKSConfig } from '../types/index';
 import {
-  diffUpstreamSpec, getAKSRegions, getAKSVirtualNetworks, getAKSVMSizes, getAKSKubernetesVersions
+  getAKSRegions, getAKSVirtualNetworks, getAKSVMSizes, getAKSKubernetesVersions
   , regionsWithAvailabilityZones
 } from '@pkg/aks/util/aks';
+
+import { diffUpstreamSpec } from '@shell/utils/kontainer';
 import {
   requiredInCluster,
   clusterNameChars,
@@ -893,7 +895,7 @@ export default defineComponent({
           label-key="aks.location.azWarning"
           color="warning"
         />
-        <div><h4>{{ t('aks.nodePools.title') }}</h4></div>
+        <div><h3>{{ t('aks.nodePools.title') }}</h3></div>
         <Tabbed
           ref="pools"
           :side-tabs="true"
@@ -1290,4 +1292,5 @@ export default defineComponent({
     display: flex;
     align-items: center;
   }
+
 </style>

pkg/eks/assets/data/eks-versions.js

@@ -0,0 +1,9 @@
+export default ['[1.29',
+
+  '1.28',
+
+  '1.27',
+
+  '1.26',
+
+  '1.25'];

pkg/eks/babel.config.js

@@ -0,0 +1 @@
+module.exports = require('./.shell/pkg/babel.config.js');

pkg/eks/components/AccountAccess.vue

@@ -0,0 +1,176 @@
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { _CREATE, _VIEW } from '@shell/config/query-params';
+import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
+import SelectCredential from '@shell/edit/provisioning.cattle.io.cluster/SelectCredential.vue';
+import { DEFAULT_REGION } from './CruEKS.vue';
+import { mapGetters } from 'vuex';
+import { AWS } from 'types';
+
+export default defineComponent({
+  name: 'EKSAccountAccess',
+
+  components: {
+    LabeledSelect,
+    SelectCredential
+  },
+
+  props: {
+    mode: {
+      type:    String,
+      default: _CREATE
+    },
+
+    credential: {
+      type:    String,
+      default: null
+    },
+
+    region: {
+      type:    String,
+      default: ''
+    }
+  },
+
+  async fetch() {
+    if (this.mode !== _VIEW) {
+      this.defaultRegions = await this.$store.dispatch('aws/defaultRegions');
+      if (this.defaultRegions.length && !this.region) {
+        this.$emit('update-region', DEFAULT_REGION);
+      }
+    }
+  },
+
+  data() {
+    return { regions: [] as string[], defaultRegions: [] as string[] };
+  },
+
+  watch: {
+    isAuthenticated: {
+      async handler(neu) {
+        if (neu && this.mode !== _VIEW) {
+          await this.fetchRegions();
+        } else {
+          if (this.defaultRegions.length && !this.defaultRegions.includes(this.region)) {
+            if (this.defaultRegions.includes(DEFAULT_REGION)) {
+              this.$emit('update-region', DEFAULT_REGION);
+            } else {
+              this.$emit('update-region', this.defaultRegions[0]);
+            }
+          }
+        }
+      },
+      immediate: true
+    }
+  },
+
+  methods: {
+    async fetchRegions() {
+      const { region, credential }: { region: string, credential: string} = this;
+
+      if (!!region && !!credential) {
+        try {
+          const ec2Client = await this.$store.dispatch('aws/ec2', { region, cloudCredentialId: credential });
+
+          const res: {Regions: AWS.EC2Region[]} = await ec2Client.describeRegions({});
+
+          this.regions = (res?.Regions || []).map((r) => r.RegionName);
+        } catch (err) {
+          this.$emit('error', this.t('eks.errors.fetchingRegions', { err }));
+        }
+      }
+    },
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
+    // once the credential is validated we can fetch a list of available regions
+    isAuthenticated(): boolean {
+      return !!this.credential;
+    },
+
+    regionOptions(): string[] {
+      return this.regions.length ? this.regions : this.defaultRegions;
+    },
+
+    CREATE(): string {
+      return _CREATE;
+    },
+
+    VIEW(): string {
+      return _VIEW;
+    },
+
+  },
+});
+</script>
+
+<template>
+  <div
+    :class="{'showing-form': !credential}"
+    class="credential-region"
+  >
+    <div class="region mb-10">
+      <LabeledSelect
+        :disabled="mode!=='create'"
+        :value="region"
+        label-key="eks.region.label"
+        :options="regionOptions"
+        @input="$emit('update-region', $event)"
+      />
+    </div>
+    <div
+      class="select-credential-container mb-10"
+    >
+      <SelectCredential
+        :value="credential"
+        data-testid="crueks-select-credential"
+        :mode="mode === VIEW ? VIEW : CREATE"
+        provider="aws"
+        :default-on-cancel="true"
+        :showing-form="!credential"
+        class="select-credential"
+        :cancel="()=>$emit('cancel-credential')"
+        @input="$emit('update-credential', $event)"
+      />
+    </div>
+  </div>
+</template>
+
+<style lang="scss">
+  .credential-region {
+    display: flex;
+    flex-grow:1;
+
+    .region {
+      flex-basis: 50%;
+      flex-grow: 0;
+      margin: 0 1.75% 0 0;
+    }
+
+    &.showing-form {
+      flex-direction: column;
+
+      &>.region {
+        margin: 0;
+      }
+
+      &>.select-credential-container{
+      display:flex;
+      flex-direction: column;
+      flex-grow: 1;
+      }
+    }
+
+    &>.select-credential-container{
+      flex-basis: 50%;
+
+      &>.select-credential{
+        flex-grow: 1;
+      }
+
+    }
+  }
+
+</style>