From f16fdd3ea7e2dfeeaae45f5e8bb0a0226318a1ba Mon Sep 17 00:00:00 2001
From: fhanportainer <79428273+fhanportainer@users.noreply.github.com>
Date: Mon, 6 Sep 2021 13:46:14 +1200
Subject: [PATCH] fix(k8s): add tag ids to request payload for creating local
 k8s endpoint. EE-1454 (#5577)

* fix(k8s): add tag ids to request payload for creating local k8s endpoint.

* add https to k8s local environment url
---
 app/portainer/services/api/endpointService.js               | 4 ++--
 .../views/endpoints/create/createEndpointController.js      | 3 ++-
 app/portainer/views/endpoints/edit/endpointController.js    | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js
index 33dd04e29..852d398f9 100644
--- a/app/portainer/services/api/endpointService.js
+++ b/app/portainer/services/api/endpointService.js
@@ -137,10 +137,10 @@ angular.module('portainer.app').factory('EndpointService', [
       return deferred.promise;
     };
 
-    service.createLocalKubernetesEndpoint = function (name = 'local') {
+    service.createLocalKubernetesEndpoint = function (name = 'local', tagIds = []) {
       var deferred = $q.defer();
 
-      FileUploadService.createEndpoint(name, PortainerEndpointCreationTypes.LocalKubernetesEnvironment, '', '', 1, [], true, true, true)
+      FileUploadService.createEndpoint(name, PortainerEndpointCreationTypes.LocalKubernetesEnvironment, '', '', 1, tagIds, true, true, true)
         .then(function success(response) {
           deferred.resolve(response.data);
         })
diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js
index f8d983456..dde612ab5 100644
--- a/app/portainer/views/endpoints/create/createEndpointController.js
+++ b/app/portainer/views/endpoints/create/createEndpointController.js
@@ -154,8 +154,9 @@ angular
 
     $scope.addKubernetesEndpoint = function () {
       var name = $scope.formValues.Name;
+      var tagIds = $scope.formValues.TagIds;
       $scope.state.actionInProgress = true;
-      EndpointService.createLocalKubernetesEndpoint(name)
+      EndpointService.createLocalKubernetesEndpoint(name, tagIds)
         .then(function success(result) {
           Notifications.success('Endpoint created', name);
           $state.go('portainer.endpoints.endpoint.kubernetesConfig', { id: result.Id });
diff --git a/app/portainer/views/endpoints/edit/endpointController.js b/app/portainer/views/endpoints/edit/endpointController.js
index 5e297df04..2318a9509 100644
--- a/app/portainer/views/endpoints/edit/endpointController.js
+++ b/app/portainer/views/endpoints/edit/endpointController.js
@@ -168,10 +168,14 @@ function EndpointController(
       payload.URL = 'tcp://' + endpoint.URL;
     }
 
-    if (endpoint.Type === PortainerEndpointTypes.AgentOnKubernetesEnvironment || endpoint.Type === PortainerEndpointTypes.KubernetesLocalEnvironment) {
+    if (endpoint.Type === PortainerEndpointTypes.AgentOnKubernetesEnvironment) {
       payload.URL = endpoint.URL;
     }
 
+    if (endpoint.Type === PortainerEndpointTypes.KubernetesLocalEnvironment) {
+      payload.URL = 'https://' + endpoint.URL;
+    }
+
     $scope.state.actionInProgress = true;
     EndpointService.updateEndpoint(endpoint.Id, payload).then(
       function success() {