diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/assets/javascripts/create_cluster | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/assets/javascripts/create_cluster')
6 files changed, 18 insertions, 11 deletions
diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue index d6c402fcb5d..a653e228e3f 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue +++ b/app/assets/javascripts/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue @@ -1,4 +1,5 @@ <script> +/* eslint-disable vue/no-v-html */ import { createNamespacedHelpers, mapState, mapActions, mapGetters } from 'vuex'; import { escape } from 'lodash'; import { GlFormInput, GlFormCheckbox } from '@gitlab/ui'; diff --git a/app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue b/app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue index e063f9edfd9..5c13cbb2775 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue +++ b/app/assets/javascripts/create_cluster/eks_cluster/components/service_credentials_form.vue @@ -1,15 +1,15 @@ <script> -import { GlFormInput } from '@gitlab/ui'; +/* eslint-disable vue/no-v-html */ +import { GlFormInput, GlButton } from '@gitlab/ui'; import { escape } from 'lodash'; import { mapState, mapActions } from 'vuex'; import { sprintf, s__, __ } from '~/locale'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import LoadingButton from '~/vue_shared/components/loading_button.vue'; export default { components: { GlFormInput, - LoadingButton, + GlButton, ClipboardButton, }, props: { @@ -130,13 +130,15 @@ export default { <gl-form-input id="eks-provision-role-arn" v-model="roleArn" /> <p class="form-text text-muted" v-html="provisionRoleArnHelpText"></p> </div> - <loading-button - class="js-submit-service-credentials btn-success" + <gl-button + variant="success" + category="primary" type="submit" :disabled="submitButtonDisabled" :loading="isCreatingRole" - :label="submitButtonLabel" @click.prevent="createRole({ roleArn, externalId })" - /> + > + {{ submitButtonLabel }} + </gl-button> </form> </template> diff --git a/app/assets/javascripts/create_cluster/eks_cluster/constants.js b/app/assets/javascripts/create_cluster/eks_cluster/constants.js index a850ba89818..471d6e1f0aa 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/constants.js +++ b/app/assets/javascripts/create_cluster/eks_cluster/constants.js @@ -1,2 +1,6 @@ -// eslint-disable-next-line import/prefer-default-export -export const KUBERNETES_VERSIONS = [{ name: '1.14', value: '1.14' }]; +export const KUBERNETES_VERSIONS = [ + { name: '1.14', value: '1.14' }, + { name: '1.15', value: '1.15' }, + { name: '1.16', value: '1.16', default: true }, + { name: '1.17', value: '1.17' }, +]; diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js b/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js index caf2729a4c7..5abff3c7831 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js +++ b/app/assets/javascripts/create_cluster/eks_cluster/store/actions.js @@ -56,6 +56,7 @@ export const createCluster = ({ dispatch, state }) => { environment_scope: state.environmentScope, managed: state.gitlabManagedCluster, provider_aws_attributes: { + kubernetes_version: state.kubernetesVersion, region: state.selectedRegion, vpc_id: state.selectedVpc, subnet_ids: state.selectedSubnet, diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/getters.js b/app/assets/javascripts/create_cluster/eks_cluster/store/getters.js index bbe4930c191..d8489ca31cf 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/store/getters.js +++ b/app/assets/javascripts/create_cluster/eks_cluster/store/getters.js @@ -1,3 +1,2 @@ -// eslint-disable-next-line import/prefer-default-export export const subnetValid = ({ selectedSubnet }) => Array.isArray(selectedSubnet) && selectedSubnet.length >= 2; diff --git a/app/assets/javascripts/create_cluster/eks_cluster/store/state.js b/app/assets/javascripts/create_cluster/eks_cluster/store/state.js index d1337e7ea4a..ed51e95e434 100644 --- a/app/assets/javascripts/create_cluster/eks_cluster/store/state.js +++ b/app/assets/javascripts/create_cluster/eks_cluster/store/state.js @@ -1,6 +1,6 @@ import { KUBERNETES_VERSIONS } from '../constants'; -const [{ value: kubernetesVersion }] = KUBERNETES_VERSIONS; +const kubernetesVersion = KUBERNETES_VERSIONS.find(version => version.default).value; export default () => ({ createRolePath: null, |