iguazio.dashboard-controls 0.37.17 → 0.37.21

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "0.37.17",
+    "version": "0.37.21",
     "main": "dist/js/iguazio.dashboard-controls.js",
     "description": "Collection of resources (such as CSS styles, fonts and images) and AngularJs 1.x components and services to share among different Iguazio repos.",
     "repository": {

package/src/i18n/en/common.json

@@ -246,6 +246,7 @@
     "GET_VERSIONS": "Get versions",
     "GO_TO_CONTAINING_FOLDER": "Go to containing folder",
     "GPU": "GPU",
+    "GPU_CORES": "GPU (cores)",
     "GROUP": "Group",
     "GROUPS": "Groups",
     "GUIDE_SCREEN": "Guide Screen",

package/src/i18n/en/functions.json

@@ -88,7 +88,6 @@
     "EDIT_PROJECT": "Edit Project",
     "ENDPOINT": "Endpoint",
     "ENTER_HOST_TO_SEE_ENDPOINT": "Enter host to see endpoint",
-    "ENVIRONMENT_VARIABLES": "Environment Variables",
     "ERROR_MSG": {
         "COULD_NOT_READ_FILE": "Could not read file...",
         "CREATE_FUNCTION_EVENT": "Error occurred while creating the new function event.",
@@ -182,8 +181,7 @@
     "NO_LOGS_HAVE_BEEN_FOUND": "No logs have been found...",
     "NODE_SELECTORS": "Node selector",
     "NORMAL": "Normal",
-    "NOT_START_WITH_FORBIDDEN_WORDS_ANNOTATION": "Must not start with 'kubernetes.io', 'k8s.io'",
-    "NOT_START_WITH_FORBIDDEN_WORDS_LABEL": "Must not start with 'kubernetes.io', 'k8s.io' or 'nuclio.io'",
+    "NOT_START_WITH_FORBIDDEN_WORDS": "Must not start with 'kubernetes.io', 'k8s.io'",
     "NOT_YET_DEPLOYED": "Not yet deployed",
     "OAUTH2": "OAuth2",
     "ONBUILD_IMAGE": "Onbuild image",
@@ -378,6 +376,7 @@
     "UNSPECIFIED_FIELD_NAME": "Unspecified field name",
     "URL_NOT_EXPOSED": "URL not exposed",
     "V3IO": "V3IO",
+    "V3IO_INVALID_REPLICAS_MSG": "V3io_stream trigger requires min and max replicas to be the same",
     "VIEW_YAML": "View YAML",
     "VOLUMES": "Volumes",
     "ALWAYS_WAIT_FOR_READINESS_TIMEOUT_EXPIRATION": "Always wait for readiness-timeout expiration",

package/src/igz_controls/components/navigation-tabs/navigation-tabs.service.js

@@ -123,11 +123,6 @@
                     tabName: $i18next.t('common:NODES', {lng: lng}),
                     uiRoute: 'app.cluster.nodes',
                     capability: 'clusters.nodes'
-                },
-                {
-                    tabName: $i18next.t('common:SUPPORT_LOGS', {lng: lng}),
-                    uiRoute: 'app.cluster.support-logs',
-                    capability: 'clusters.collectLogs'
                 }
             ];
 
@@ -161,6 +156,12 @@
                     id: 'app',
                     uiRoute: 'app.clusters.app',
                     capability: 'clusters'
+                },
+                {
+                    tabName: $i18next.t('common:SUPPORT_LOGS', {lng: lng}),
+                    id: 'support-logs',
+                    uiRoute: 'app.clusters.support-logs',
+                    capability: 'clusters.collectLogs'
                 }
             ];
         }

package/src/igz_controls/components/size/size.component.js

@@ -1,4 +1,4 @@
-/* eslint complexity: ["error", 14] */
+/* eslint complexity: ["error", 15] */
 (function () {
     'use strict';
 
@@ -32,6 +32,7 @@
 
         var CPU_TYPES = ['nodes', 'clusters'];
         var CPU_CORES_TYPES = ['services_cpu', 'functions_cpu'];
+        var GPU_CORES_TYPES = ['services_gpu', 'functions_gpu'];
         var SIZE_TYPES = ['containers', 'storage-pools', 'tenants', 'services_memory', 'functions_memory'];
         var COUNT_TYPES = ['functions_events'];
 
@@ -75,17 +76,19 @@
 
             ctrl.metricType = isCpu()      ? 'cpuLineChartData'      :
                               isCpuCores() ? 'cpuCoresLineChartData' :
+                              isGpuCores() ? 'gpuCoresLineChartData' :
                               isSize()     ? 'sizeLineChartData'     :
                                              'countLineChartData'    ;
 
             ctrl.displayValueWithTooltip = lodash.includes(['containers', 'tenants'], ctrl.type);
-            ctrl.justDisplayValue = lodash.includes(['clusters', 'nodes', 'functions_cpu', 'functions_memory',
-                'functions_events', 'services_cpu', 'services_memory'], ctrl.type);
+            ctrl.justDisplayValue = lodash.includes(['clusters', 'nodes', 'functions_cpu', 'functions_gpu',
+                'functions_memory', 'functions_events', 'services_cpu', 'services_gpu', 'services_memory'], ctrl.type);
 
             ctrl.displayValueClasses = {
                 'short': lodash.includes(['functions_memory', 'services_memory'], ctrl.type),
                 'shorten': lodash.includes(['functions_events'], ctrl.type),
-                'shortest': lodash.includes(['clusters', 'nodes', 'services_cpu', 'functions_cpu'], ctrl.type)
+                'shortest': lodash.includes(['clusters', 'nodes', 'services_cpu', 'services_gpu', 'functions_cpu',
+                    'functions_gpu'], ctrl.type)
             };
 
             lodash.defaults(ctrl.entity.ui, {
@@ -367,6 +370,7 @@
                                           '0';
             var metricName = isCpu()      ? 'cpu.idle'  :
                              isCpuCores() ? 'cpu.cores' :
+                             isGpuCores() ? 'gpu.cores' :
                              isSize()     ? 'size'      :
                                             'count';
             var value = ctrl.entity.ui.metrics[metricName];
@@ -375,7 +379,7 @@
 
             return lodash.isNil(value) ? defaultValue :
                    isCpu()      ? $filter('number')(value > 0 ? 100 - value : 0, 0) + '%' :
-                   isCpuCores() ? $filter('scale')(value, 0, 'nanos')                     :
+                   (isCpuCores() || isGpuCores()) ? $filter('scale')(value, 0, 'nanos')   :
                    isSize()     ? $filter('bytes')(value, 2) + sizePercentage             :
                                   $filter('scale')(value);
         }
@@ -417,6 +421,14 @@
             return lodash.includes(CPU_CORES_TYPES, ctrl.type);
         }
 
+        /**
+         * Determines whether this chart is for GPU cores
+         * @returns {boolean} `true` if this chart is for GPU cores or `false` otherwise
+         */
+        function isGpuCores() {
+            return lodash.includes(GPU_CORES_TYPES, ctrl.type);
+        }
+
         /**
          * Defines if max quota value and max point in chart data has difference less than 20%
          * @returns {boolean}
@@ -443,7 +455,7 @@
          */
         function isTooltipEnabled() {
             return lodash.includes(['containers', 'storage-pools', 'tenants', 'services_memory', 'services_cpu',
-                'functions_memory', 'functions_cpu', 'functions_events'], ctrl.type);
+                'services_gpu', 'functions_memory', 'functions_cpu', 'functions_gpu', 'functions_events'], ctrl.type);
         }
 
         /**
@@ -456,9 +468,11 @@
                 'containers': prepareSizeData,
                 'nodes': prepareCpuData,
                 'functions_cpu': prepareCpuCoresData,
+                'functions_gpu': prepareGpuCoresData,
                 'functions_memory': prepareSizeData,
                 'functions_events': prepareCountData,
                 'services_cpu': prepareCpuData,
+                'services_gpu': prepareGpuData,
                 'services_memory': prepareSizeData,
                 'storage-pools': prepareStoragePoolsData,
                 'storage-pools_containers': prepareStoragePoolsContainersData,
@@ -475,6 +489,14 @@
                 lodash.defaults(ctrl.entity.ui.metrics, {'cpu.cores': 0});
             }
 
+            function prepareGpuCoresData() {
+                lodash.defaults(ctrl.entity.ui.metrics, {'gpu.cores': 0});
+            }
+
+            function prepareGpuData() {
+                lodash.defaults(ctrl.entity.ui.metrics, {'gpu.idle': 0});
+            }
+
             function prepareSizeData() {
                 lodash.defaults(ctrl.entity.ui.metrics, {size: 0});
             }

package/src/igz_controls/services/table-size.service.js

@@ -155,15 +155,15 @@
         };
         var functionsTableColSizes = {
             headerName: {
-                default: '12-5',
+                default: '10',
                 demo: '10'
             },
             rowName: {
-                default: '12-5',
+                default: '10',
                 demo: '10'
             },
             status: {
-                default: '12-5',
+                default: '10',
                 demo: '10'
             },
             replicas: {
@@ -183,16 +183,20 @@
                 demo: '10'
             },
             cpuCores: {
-                default: '15',
-                demo: '15'
+                default: '12-5',
+                demo: '12-5'
             },
             metricsSize: {
-                default: '15',
-                demo: '15'
+                default: '12-5',
+                demo: '12-5'
+            },
+            gpuCores: {
+                default: '12-5',
+                demo: '12-5'
             },
             metricsCount: {
-                default: '15',
-                demo: '15'
+                default: '12-5',
+                demo: '12-5'
             }
         };
 

package/src/igz_controls/services/validation.service.js

@@ -294,6 +294,12 @@
                         $i18next.t('common:BEGIN_END_WITH', { lng: lng }) + ': a–z, 0–9',
                     pattern: /^([a-z0-9]([^/]*[a-z0-9])?\/)?[^/]+$/
                 },
+                {
+                    name: 'prefixNotStart',
+                    label: '[' + $i18next.t('functions:PREFIX', { lng: lng }) + '] ' +
+                        $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS', { lng: lng }),
+                    pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)/
+                },
                 {
                     name: 'prefixMaxLength',
                     label: '[' + $i18next.t('functions:PREFIX', { lng: lng }) + '] ' +
@@ -324,6 +330,7 @@
                     generateRule.validCharacters('a-z A-Z 0-9 - _ .'),
                     generateRule.beginNotWith('0-9 .')
                 ],
+                prefixedQualifiedName: commonRules.prefixedQualifiedName,
                 qualifiedName: [
                     generateRule.validCharacters('a-z A-Z 0-9 - _ .'),
                     generateRule.beginEndWith('a-z A-Z 0-9'),
@@ -351,25 +358,9 @@
                     generateRule.length({ max: lengths.function.name })
                 ),
                 label: {
-                    key: commonRules.prefixedQualifiedName.concat(
-                        {
-                            name: 'prefixNotStart',
-                            label: '[' + $i18next.t('functions:PREFIX', {lng: lng}) + '] ' +
-                                $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS_LABEL', {lng: lng}),
-                            pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)(?!nuclio\.io\/)/
-                        },
-                        generateRule.length({
-                            max: lengths.function.label.key
-                        }))
-                },
-                annotation: {
-                    key: commonRules.prefixedQualifiedName.concat(
-                        {
-                            name: 'prefixNotStart',
-                            label: '[' + $i18next.t('functions:PREFIX', {lng: lng}) + '] ' +
-                                $i18next.t('functions:NOT_START_WITH_FORBIDDEN_WORDS_ANNOTATION', {lng: lng}),
-                            pattern: /^(?!kubernetes\.io\/)(?!k8s\.io\/)/
-                        })
+                    key: commonRules.prefixedQualifiedName.concat(generateRule.length({
+                        max: lengths.function.label.key
+                    }))
                 },
                 itemPath: [generateRule.length({ max: lengths.function.itemPath })],
                 subscriptionQoS: [

package/src/nuclio/functions/function-collapsing-row/function-collapsing-row.component.js

@@ -36,6 +36,7 @@
         ctrl.functionActions = [];
         ctrl.functionNameTooltip = '';
         ctrl.isFunctionCollapsed = true;
+        ctrl.nuclioFunctionsGpu = encodeURI(FunctionsService.nuclioFunctionsGpu);
         ctrl.runtimes = {
             'golang': 'Go',
             'python:2.7': 'Python 2.7',
@@ -104,6 +105,7 @@
                     metrics: {
                         count: null,
                         'cpu.idle': null,
+                        'gpu.idle': null,
                         size: null
                     }
                 }

package/src/nuclio/functions/function-collapsing-row/function-collapsing-row.tpl.html

@@ -110,6 +110,20 @@
                 </div>
             </igz-element-loading-status>
 
+            <igz-element-loading-status class="common-table-cell element-loading-status-wrapper"
+                                        data-name="{{$ctrl.nuclioFunctionsGpu}}-{{$ctrl.function.metadata.name}}"
+                                        data-loading-status-size="small"
+                                        data-ng-class="[$ctrl.getFunctionsTableColSize('gpuCores')]">
+                <igz-size data-ng-if="!$ctrl.function.ui.error[$ctrl.nuclioFunctionsGpu] && $ctrl.isFunctionCollapsed"
+                          data-type="functions_gpu"
+                          data-entity="$ctrl.function"
+                          data-test-id="functions.item-gpu">
+                </igz-size>
+                <div data-ng-if="$ctrl.function.ui.error[$ctrl.nuclioFunctionsGpu] && $ctrl.isFunctionCollapsed">
+                    {{$ctrl.function.ui.error[$ctrl.nuclioFunctionsGpu]}}
+                </div>
+            </igz-element-loading-status>
+
             <igz-element-loading-status class="common-table-cell element-loading-status-wrapper"
                                         data-name="nuclio_processor_handled_events_total-{{$ctrl.function.metadata.name}}"
                                         data-loading-status-size="small"

package/src/nuclio/functions/function-collapsing-row/function-version-row/function-version-row.component.js

@@ -24,6 +24,7 @@
         var ctrl = this;
         var lng = i18next.language;
 
+        ctrl.nuclioFunctionsGpu = encodeURI(FunctionsService.nuclioFunctionsGpu);
         ctrl.versionActions = [];
         ctrl.runtimes = {
             'golang': 'Go',

package/src/nuclio/functions/function-collapsing-row/function-version-row/function-version-row.tpl.html

@@ -70,6 +70,19 @@
             </div>
         </igz-element-loading-status>
 
+        <igz-element-loading-status class="common-table-cell element-loading-status-wrapper"
+                                    data-name="{{$ctrl.nuclioFunctionsGpu}}-{{$ctrl.function.metadata.name}}"
+                                    data-loading-status-size="small"
+                                    data-ng-class="[$ctrl.getFunctionsTableColSize('gpuCores')]">
+            <igz-size data-ng-if="!$ctrl.function.ui.error.kube_metrics_server_pods_gpu_utilization && !$ctrl.isFunctionCollapsed"
+                      data-type="functions_gpu"
+                      data-entity="$ctrl.function">
+            </igz-size>
+            <div data-ng-if="$ctrl.function.ui.error.kube_metrics_server_pods_gpu_utilization">
+                {{$ctrl.function.ui.error.kube_metrics_server_pods_gpu_utilization}}
+            </div>
+        </igz-element-loading-status>
+
         <igz-element-loading-status class="common-table-cell element-loading-status-wrapper"
                                     data-name="nuclio_processor_handled_events_total-{{$ctrl.function.metadata.name}}"
                                     data-loading-status-size="small"

package/src/nuclio/functions/functions.component.js

@@ -33,6 +33,7 @@
 
         var METRICS = {
             FUNCTION_CPU: 'nuclio_function_cpu',
+            FUNCTION_GPU: encodeURI(FunctionsService.nuclioFunctionsGpu),
             FUNCTION_MEMORY: 'nuclio_function_mem',
             FUNCTION_EVENTS: 'nuclio_processor_handled_events_total'
         };
@@ -94,6 +95,11 @@
                 value: 'ui.metrics.size',
                 active: false
             },
+            {
+                label: $i18next.t('common:GPU_CORES', { lng: lng }),
+                value: 'ui.metrics[\'gpu.cores\']',
+                active: false
+            },
             {
                 label: $i18next.t('functions:INVOCATION', { lng: lng }) + ' #',
                 value: 'ui.metrics.count',
@@ -505,6 +511,7 @@
             if (!isRefresh) {
                 $timeout(function () {
                     hideSpinners(METRICS.FUNCTION_CPU);
+                    hideSpinners(METRICS.FUNCTION_GPU);
                     hideSpinners(METRICS.FUNCTION_MEMORY);
                     hideSpinners(METRICS.FUNCTION_EVENTS);
                 });
@@ -705,6 +712,11 @@
                 .then(parseData.bind(null, args.metric))
                 .catch(handleError.bind(null, args.metric));
 
+            args.metric = METRICS.FUNCTION_GPU;
+            ctrl.getStatistics(args)
+                .then(parseData.bind(null, args.metric))
+                .catch(handleError.bind(null, args.metric));
+
             args.metric = METRICS.FUNCTION_MEMORY;
             ctrl.getStatistics(args)
                 .then(parseData.bind(null, args.metric))
@@ -821,6 +833,15 @@
                                     })
                                 }
                             });
+                        } else if (type === METRICS.FUNCTION_GPU) {
+                            lodash.merge(aFunction.ui, {
+                                metrics: {
+                                    'gpu.cores': latestValue,
+                                    gpuCoresLineChartData: lodash.map(funcValues, function (dataPoint) {
+                                        return [dataPoint[0] * 1000, Number(dataPoint[1])]; // [time, value]
+                                    })
+                                }
+                            });
                         } else { // type === METRICS.FUNCTION_COUNT
                             lodash.merge(aFunction.ui, {
                                 metrics: {
@@ -838,6 +859,7 @@
 
                 // if the column values have just been updated, and the table is sorted by this column - update sort
                 if (type === METRICS.FUNCTION_CPU && ctrl.sortedColumnName === 'ui.metrics[\'cpu.cores\']' ||
+                    type === METRICS.FUNCTION_GPU && ctrl.sortedColumnName === 'ui.metrics[\'gpu.cores\']' ||
                     type === METRICS.FUNCTION_MEMORY && ctrl.sortedColumnName === 'ui.metrics.size' ||
                     type === METRICS.FUNCTION_EVENTS &&
                     lodash.includes(['ui.metrics.invocationPerSec', 'ui.metrics.count'], ctrl.sortedColumnName)) {

package/src/nuclio/functions/functions.service.js

@@ -7,6 +7,7 @@
     function FunctionsService($i18next, i18next, lodash, ngDialog, ConfigService, DialogsService) {
         var self = {
             checkedItem: '',
+            nuclioFunctionsGpu: 'kube_metrics_server_pods_gpu_utilization * on (pod) group_left(function_name)(nuclio_function_pod_labels)',
             getClassesList: getClassesList,
             getHandler: getHandler,
             getDisplayStatus: getDisplayStatus,

package/src/nuclio/functions/functions.tpl.html

@@ -127,6 +127,13 @@
                         {{ 'common:MEMORY' | i18next }}
                         <span class="sort-arrow"></span>
                     </div>
+                    <div class="common-table-cell sortable"
+                         data-ng-class="[$ctrl.getColumnSortingClasses('ui.metrics[\'gpu.cores\']', $ctrl.sortedColumnName, $ctrl.isReverseSorting),
+                                        $ctrl.getFunctionsTableColSize('gpuCores')]"
+                         data-ng-click="$ctrl.sortTableByColumn('ui.metrics[\'gpu.cores\']')">
+                        {{ 'common:GPU_CORES' | i18next }}
+                        <span class="sort-arrow"></span>
+                    </div>
                     <div class="common-table-cell sortable"
                          data-ng-class="[$ctrl.getColumnSortingClasses('ui.metrics.count', $ctrl.sortedColumnName, $ctrl.isReverseSorting),
                                         $ctrl.getFunctionsTableColSize('metricsCount')]"

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-annotations/version-configuration-annotations.component.js

@@ -39,7 +39,7 @@
             name: $i18next.t('functions:TOOLTIP.ANNOTATION', { lng: lng })
         });
         ctrl.validationRules = {
-            key: ValidationService.getValidationRules('function.annotation.key', [
+            key: ValidationService.getValidationRules('k8s.prefixedQualifiedName', [
                 {
                     name: 'uniqueness',
                     label: $i18next.t('functions:UNIQUENESS', { lng: lng }),

package/src/nuclio/functions/version/version-configuration/tabs/version-configuration-environment-variables/version-configuration-environment-variables.tpl.html

@@ -1,5 +1,5 @@
 <div class="ncl-version-configuration-environment-variables">
-    <div class="title">{{ 'functions:ENVIRONMENT_VARIABLES' | i18next }}</div>
+    <div class="title">{{ 'common:ENVIRONMENT_VARIABLES' | i18next }}</div>
     <form name="$ctrl.environmentVariablesForm" class="resources-wrapper" novalidate>
         <div class="igz-scrollable-container scrollable-environment-variables"
              data-ng-scrollbars

package/src/nuclio/functions/version/version.component.js

@@ -223,54 +223,61 @@
          */
         function deployButtonClick(event, version) {
             if (!ctrl.isDeployDisabled) {
-                ctrl.isFunctionDeployed = false;
-                $rootScope.$broadcast('deploy-function-version', { event: event });
-
                 var versionCopy = lodash.omit(angular.isDefined(version) ? version : ctrl.version, ['status', 'ui']);
+                var isV3ioExists = Object.values(versionCopy.spec.triggers).find(function (trigger) {
+                    return trigger.kind === 'v3ioStream'
+                });
 
-                // set `nuclio.io/project-name` label to relate this function to its project
-                lodash.set(versionCopy, ['metadata', 'labels', 'nuclio.io/project-name'], ctrl.project.metadata.name);
-                lodash.set(versionCopy, 'spec.build.mode', 'alwaysBuild');
+                if (versionCopy.spec.maxReplicas !== versionCopy.spec.minReplicas && isV3ioExists) {
+                    DialogsService.alert($i18next.t('functions:V3IO_INVALID_REPLICAS_MSG', {lng: lng}));
+                } else {
+                    ctrl.isFunctionDeployed = false;
+                    $rootScope.$broadcast('deploy-function-version', { event: event });
 
-                ctrl.isTestResultShown = false;
-                ctrl.deployResult.shown = false;
-                ctrl.deployResult.collapsed = true;
-                ctrl.isSplashShowed.value = true;
+                    // set `nuclio.io/project-name` label to relate this function to its project
+                    lodash.set(versionCopy, ['metadata', 'labels', 'nuclio.io/project-name'], ctrl.project.metadata.name);
+                    lodash.set(versionCopy, 'spec.build.mode', 'alwaysBuild');
 
-                var isVersionDeployed = VersionHelperService.isVersionDeployed(ctrl.version);
-                var method = isVersionDeployed || ctrl.version.ui.overwrite ? ctrl.updateVersion : ctrl.createVersion;
+                    ctrl.isTestResultShown = false;
+                    ctrl.deployResult.shown = false;
+                    ctrl.deployResult.collapsed = true;
+                    ctrl.isSplashShowed.value = true;
 
-                method({ version: versionCopy, projectId: ctrl.project.metadata.name })
-                    .then(function () {
-                        pollFunctionState();
+                    var isVersionDeployed = VersionHelperService.isVersionDeployed(ctrl.version);
+                    var method = isVersionDeployed || ctrl.version.ui.overwrite ? ctrl.updateVersion : ctrl.createVersion;
 
-                        $timeout(function () {
-                            $rootScope.$broadcast('igzWatchWindowResize::resize');
-                        });
-                    })
-                    .catch(function (error) {
-                        var defaultMsg = $i18next.t('common:ERROR_MSG.UNKNOWN_ERROR', { lng: lng });
-
-                        if (error.status === 409 && isVersionDeployed) {
-                            return FunctionsService.openVersionOverwriteDialog()
-                                .then(function () {
-                                    deployButtonClick(event, lodash.omit(ctrl.version, 'metadata.resourceVersion'));
-                                })
-                                .catch(function () {
+                    method({ version: versionCopy, projectId: ctrl.project.metadata.name })
+                        .then(function () {
+                            pollFunctionState();
+
+                            $timeout(function () {
+                                $rootScope.$broadcast('igzWatchWindowResize::resize');
+                            });
+                        })
+                        .catch(function (error) {
+                            var defaultMsg = $i18next.t('common:ERROR_MSG.UNKNOWN_ERROR', { lng: lng });
+
+                            if (error.status === 409 && isVersionDeployed) {
+                                return FunctionsService.openVersionOverwriteDialog()
+                                    .then(function () {
+                                        deployButtonClick(event, lodash.omit(ctrl.version, 'metadata.resourceVersion'));
+                                    })
+                                    .catch(function () {
+                                        ctrl.isFunctionDeployed = true;
+                                    });
+                            } else if (error.status === 404 && method === ctrl.updateVersion) {
+                                clearVersionStatus(ctrl.version);
+                                return deployButtonClick(event, version);
+                            } else {
+                                return DialogsService.alert(lodash.get(error, 'data.error', defaultMsg)).then(function () {
                                     ctrl.isFunctionDeployed = true;
                                 });
-                        } else if (error.status === 404 && method === ctrl.updateVersion) {
-                            clearVersionStatus(ctrl.version);
-                            return deployButtonClick(event, version);
-                        } else {
-                            return DialogsService.alert(lodash.get(error, 'data.error', defaultMsg)).then(function () {
-                                ctrl.isFunctionDeployed = true;
-                            });
-                        }
-                    })
-                    .finally(function () {
-                        ctrl.isSplashShowed.value = false;
-                    });
+                            }
+                        })
+                        .finally(function () {
+                            ctrl.isSplashShowed.value = false;
+                        });
+                }
             }
         }