Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-21 22:39:41 +02:00
Code Issues Releases Activity

Merge changes from release 2.2 (#4930)

Browse source 
* fix windows build

* fix(endpoints): show correct values of security settings (#4889)

* fix(app): EndpointProvider fallback on URL EndpointID when no endpoint is selected (#4892)

* fix(templates): App templates not loading with error in browser console (#4895)

* fix(kube/config): show used key warning when needed (#4890)

fix [CE-469]
- recalculate duplcate keys when they are changed
- show used warning on duplicate keys

* fix(k8s): CE-471 variables from configuration showing on environment variables section on application edit screen (#4896)

* fix(k8s): CE-471 variables from configuration showing on environment variables section on application edit screen

* fix(k8s): CE-471 avoid to remove value path of env when patch k8s deployment, as the value path does not exist if env variable has empty value.

Co-authored-by: Simon Meng <simon.meng@portainer.io>

Co-authored-by: Dmitry Salakhov <to@dimasalakhov.com>
Co-authored-by: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Co-authored-by: LP B <xAt0mZ@users.noreply.github.com>
Co-authored-by: Maxime Bajeux <max.bajeux@gmail.com>
Co-authored-by: cong meng <mcpacino@gmail.com>
Co-authored-by: Simon Meng <simon.meng@portainer.io>
This commit is contained in:
Yi Chen 2021-03-23 08:58:11 +13:00 • committed by GitHub
parent 239e434522
commit 572b64b68e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 65 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/kubernetes/views/configure/configureController.js
View file

@ -8,11 +8,19 @@ import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
class KubernetesConfigureController {
/* #region CONSTRUCTOR */
// TODO: technical debt
// $transition$ cannot be injected as bindings: { $transition$: '<' } inside app/portainer/__module.js
// because this view is not using a component (https://ui-router.github.io/guide/ng1/route-to-component#accessing-transition)
// and will cause
// >> Error: Cannot combine: component|bindings|componentProvider
// >> with: templateProvider|templateUrl|template|notify|async|controller|controllerProvider|controllerAs|resolveAs
// >> in stateview: 'content@@portainer.endpoints.endpoint.kubernetesConfig'
/* @ngInject */
constructor(
$async,
$state,
$stateParams,
$transition$,
Notifications,
KubernetesStorageService,
EndpointService,
@ -24,7 +32,7 @@ class KubernetesConfigureController {
) {
this.$async = $async;
this.$state = $state;
this.$stateParams = $stateParams;
this.$transition$ = $transition$;
this.Notifications = Notifications;
this.KubernetesStorageService = KubernetesStorageService;
this.EndpointService = EndpointService;
@ -210,7 +218,7 @@ class KubernetesConfigureController {
actionInProgress: false,
displayConfigureClassPanel: {},
viewReady: false,
endpointId: this.$stateParams.id,
endpointId: this.$transition$.params().id,
duplicates: {
ingressClasses: new KubernetesFormValidationReferences(),
},