From ff87e687ec9bbbb78538040b284a61d3ce7a3ebb Mon Sep 17 00:00:00 2001 From: fhanportainer <79428273+fhanportainer@users.noreply.github.com> Date: Tue, 19 Oct 2021 13:21:54 +1300 Subject: [PATCH] fix(registry): ignore pull limit in non-docker hub registry. (#5918) --- .../views/applications/create/createApplication.html | 2 +- .../views/applications/create/createApplicationController.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index d590c6c38..c7d635213 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -1771,7 +1771,7 @@ ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM" type="button" class="btn btn-primary btn-sm" - ng-disabled="!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.state.pullImageValidity" + ng-disabled="!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.imageValidityIsValid()" ng-click="ctrl.deployApplication()" button-spinner="ctrl.state.actionInProgress" data-cy="k8sAppCreate-deployButton" diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js index 671b17abc..8ed872c8d 100644 --- a/app/kubernetes/views/applications/create/createApplicationController.js +++ b/app/kubernetes/views/applications/create/createApplicationController.js @@ -2,6 +2,7 @@ import angular from 'angular'; import _ from 'lodash-es'; import filesizeParser from 'filesize-parser'; import * as JsonPatch from 'fast-json-patch'; +import { RegistryTypes } from '@/portainer/models/registryTypes'; import { KubernetesApplicationDataAccessPolicies, @@ -193,6 +194,10 @@ class KubernetesCreateApplicationController { this.state.pullImageValidity = validity; } + imageValidityIsValid() { + return this.state.pullImageValidity || this.formValues.ImageModel.Registry.Type !== RegistryTypes.DOCKERHUB; + } + onChangeName() { const existingApplication = _.find(this.applications, { Name: this.formValues.Name }); this.state.alreadyExists = (this.state.isEdit && existingApplication && this.application.Id !== existingApplication.Id) || (!this.state.isEdit && existingApplication);