Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-01 20:05:23 +02:00
Code Issues Releases Activity

fix(helm): fix helm move to advance deployments issues [EE-5999] (#10453)

Browse source 
* fix helm move to adv deployments
This commit is contained in:
Prabhat Khera 2023-10-12 11:02:09 +13:00 • committed by GitHub
parent 7218eb0892
commit ff5b311eee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 39 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/kubernetes/views/deploy/deploy.html
View file

@ -54,7 +54,7 @@
</div>
</div>
<div class="col-sm-12 form-section-title"> Build method </div>
<div class="col-sm-12 form-section-title"> Deploy from </div>
<box-selector
slim="true"
radio-name="'method'"
@ -167,7 +167,13 @@
<!-- Helm -->
<div ng-show="ctrl.state.BuildMethod === ctrl.BuildMethods.HELM">
<helm-templates-view endpoint="ctrl.endpoint" namespace="ctrl.formValues.Namespace" stack-name="ctrl.formValues.StackName"></helm-templates-view>
<div class="col-sm-12 form-section-title" ng-if="ctrl.state.selectedHelmChart">Selected Helm chart</div>
<helm-templates-view
on-select-helm-chart="(ctrl.onSelectHelmChart)"
endpoint="ctrl.endpoint"
namespace="ctrl.formValues.Namespace"
stack-name="ctrl.formValues.StackName"
></helm-templates-view>
</div>
<!-- !Helm -->

7
app/kubernetes/views/deploy/deployController.js
View file

@ -32,7 +32,6 @@ class KubernetesDeployController {
{ ...git, value: KubernetesDeployBuildMethods.GIT },
{ ...editor, value: KubernetesDeployBuildMethods.WEB_EDITOR },
{ ...url, value: KubernetesDeployBuildMethods.URL },
{ ...customTemplate, value: KubernetesDeployBuildMethods.CUSTOM_TEMPLATE },
{ ...customTemplate, description: 'Use custom template', value: KubernetesDeployBuildMethods.CUSTOM_TEMPLATE },
{ ...helm, value: KubernetesDeployBuildMethods.HELM },
];
@ -55,6 +54,7 @@ class KubernetesDeployController {
webhookId: createWebhookId(),
templateLoadFailed: false,
isEditorReadOnly: false,
selectedHelmChart: '',
};
this.currentUser = {
@ -79,6 +79,7 @@ class KubernetesDeployController {
this.ManifestDeployTypes = KubernetesDeployManifestTypes;
this.BuildMethods = KubernetesDeployBuildMethods;
this.onSelectHelmChart = this.onSelectHelmChart.bind(this);
this.onChangeTemplateId = this.onChangeTemplateId.bind(this);
this.deployAsync = this.deployAsync.bind(this);
this.onChangeFileContent = this.onChangeFileContent.bind(this);
@ -90,6 +91,10 @@ class KubernetesDeployController {
this.onChangeTemplateVariables = this.onChangeTemplateVariables.bind(this);
}
onSelectHelmChart(chart) {
this.state.selectedHelmChart = chart;
}
onChangeTemplateVariables(value) {
this.onChangeFormValues({ Variables: value });