fix(k8s) parse empty configuration as empty string yaml instead of {} (ce#395)

* fix missing kubectl download (#4802 )
feat(build): introducing buildx for Windows (#4792 )
2021-02-02 14:36:13 +13:00 · 2021-02-02 11:12:40 +13:00 · 2021-01-31 17:32:30 +13:00
13 changed files with 43 additions and 99 deletions
--- a/api/cmd/portainer/main.go
+++ b/api/cmd/portainer/main.go
@@ -74,7 +74,7 @@ func initDataStore(dataStorePath string, fileService portainer.FileService) port
 }

 func initComposeStackManager(assetsPath string, dataStorePath string, reverseTunnelService portainer.ReverseTunnelService, proxyManager *proxy.Manager) portainer.ComposeStackManager {
-	composeWrapper := exec.NewComposeWrapper(assetsPath, dataStorePath, proxyManager)
+	composeWrapper := exec.NewComposeWrapper(assetsPath, proxyManager)
 	if composeWrapper != nil {
 		return composeWrapper
 	}
--- a/api/exec/compose_wrapper.go
+++ b/api/exec/compose_wrapper.go
@@ -16,19 +16,17 @@ import (
 // ComposeWrapper is a wrapper for docker-compose binary
 type ComposeWrapper struct {
 	binaryPath   string
-	dataPath     string
 	proxyManager *proxy.Manager
 }

 // NewComposeWrapper returns a docker-compose wrapper if corresponding binary present, otherwise nil
-func NewComposeWrapper(binaryPath, dataPath string, proxyManager *proxy.Manager) *ComposeWrapper {
+func NewComposeWrapper(binaryPath string, proxyManager *proxy.Manager) *ComposeWrapper {
 	if !IsBinaryPresent(programPath(binaryPath, "docker-compose")) {
 		return nil
 	}

 	return &ComposeWrapper{
 		binaryPath:   binaryPath,
-		dataPath:     dataPath,
 		proxyManager: proxyManager,
 	}
 }
@@ -81,8 +79,6 @@ func (w *ComposeWrapper) command(command []string, stack *portainer.Stack, endpo

 	var stderr bytes.Buffer
 	cmd := exec.Command(program, args...)
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, fmt.Sprintf("DOCKER_CONFIG=%s", w.dataPath))
 	cmd.Stderr = &stderr

 	out, err := cmd.Output()
--- a/api/exec/compose_wrapper_integration_test.go
+++ b/api/exec/compose_wrapper_integration_test.go
@@ -42,7 +42,7 @@ func Test_UpAndDown(t *testing.T) {

 	stack, endpoint := setup(t)

-	w := NewComposeWrapper("", "", nil)
+	w := NewComposeWrapper("", nil)

 	err := w.Up(stack, endpoint)
 	if err != nil {
--- a/api/portainer.go
+++ b/api/portainer.go
@@ -1125,7 +1125,7 @@ type (

 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.1.0"
+	APIVersion = "2.0.1"
 	// DBVersion is the version number of the Portainer database
 	DBVersion = 25
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax
--- a/app/kubernetes/converters/configMap.js
+++ b/app/kubernetes/converters/configMap.js
@@ -1,32 +1,10 @@
 import _ from 'lodash-es';
-import { KubernetesConfigMap, KubernetesPortainerAccessConfigMap } from 'Kubernetes/models/config-map/models';
+import { KubernetesConfigMap } from 'Kubernetes/models/config-map/models';
 import { KubernetesConfigMapCreatePayload, KubernetesConfigMapUpdatePayload } from 'Kubernetes/models/config-map/payloads';
 import { KubernetesPortainerConfigurationOwnerLabel } from 'Kubernetes/models/configuration/models';
 import { KubernetesConfigurationFormValuesEntry } from 'Kubernetes/models/configuration/formvalues';

 class KubernetesConfigMapConverter {
-  static apiToPortainerAccessConfigMap(data) {
-    const res = new KubernetesPortainerAccessConfigMap();
-    res.Id = data.metadata.uid;
-    res.Data = data.data;
-    return res;
-  }
-
-  static createAccessPayload(data) {
-    const res = new KubernetesConfigMapCreatePayload();
-    _.unset(res, 'binaryData');
-    res.metadata.name = data.Name;
-    res.metadata.namespace = data.Namespace;
-    res.data = data.Data;
-    return res;
-  }
-
-  static updateAccessPayload(data) {
-    const res = KubernetesConfigMapConverter.createAccessPayload(data);
-    res.metadata.uid = data.Id;
-    return res;
-  }
-
  /**
   * API ConfigMap to front ConfigMap
   */
--- a/app/kubernetes/models/config-map/models.js
+++ b/app/kubernetes/models/config-map/models.js
@@ -2,15 +2,6 @@ export const KubernetesPortainerConfigMapNamespace = 'portainer';
 export const KubernetesPortainerConfigMapConfigName = 'portainer-config';
 export const KubernetesPortainerConfigMapAccessKey = 'NamespaceAccessPolicies';

-export function KubernetesPortainerAccessConfigMap() {
-  return {
-    Id: 0,
-    Name: KubernetesPortainerConfigMapConfigName,
-    Namespace: KubernetesPortainerConfigMapNamespace,
-    Data: {},
-  };
-}
-
 /**
 * ConfigMap Model
 */
--- a/app/kubernetes/services/configMapService.js
+++ b/app/kubernetes/services/configMapService.js
@@ -3,7 +3,6 @@ import _ from 'lodash-es';
 import PortainerError from 'Portainer/error';
 import KubernetesConfigMapConverter from 'Kubernetes/converters/configMap';
 import { KubernetesCommonParams } from 'Kubernetes/models/common/params';
-import { KubernetesPortainerAccessConfigMap } from 'Kubernetes/models/config-map/models';

 class KubernetesConfigMapService {
  /* @ngInject */
@@ -18,54 +17,6 @@ class KubernetesConfigMapService {
    this.deleteAsync = this.deleteAsync.bind(this);
  }

-  getAccess(namespace, name) {
-    return this.$async(async () => {
-      try {
-        const params = new KubernetesCommonParams();
-        params.id = name;
-        const raw = await this.KubernetesConfigMaps(namespace).get(params).$promise;
-        return KubernetesConfigMapConverter.apiToPortainerAccessConfigMap(raw);
-      } catch (err) {
-        if (err.status === 404) {
-          return new KubernetesPortainerAccessConfigMap();
-        }
-        throw new PortainerError('Unable to retrieve Portainer accesses', err);
-      }
-    });
-  }
-
-  createAccess(config) {
-    return this.$async(async () => {
-      try {
-        const payload = KubernetesConfigMapConverter.createAccessPayload(config);
-        const params = {};
-        const namespace = payload.metadata.namespace;
-        const data = await this.KubernetesConfigMaps(namespace).create(params, payload).$promise;
-        return KubernetesConfigMapConverter.apiToPortainerAccessConfigMap(data);
-      } catch (err) {
-        throw new PortainerError('Unable to create Portainer accesses', err);
-      }
-    });
-  }
-
-  updateAccess(config) {
-    return this.$async(async () => {
-      try {
-        if (!config.Id) {
-          return await this.createAccess(config);
-        }
-        const payload = KubernetesConfigMapConverter.updateAccessPayload(config);
-        const params = new KubernetesCommonParams();
-        params.id = payload.metadata.name;
-        const namespace = payload.metadata.namespace;
-        const data = await this.KubernetesConfigMaps(namespace).update(params, payload).$promise;
-        return KubernetesConfigMapConverter.apiToPortainerAccessConfigMap(data);
-      } catch (err) {
-        throw new PortainerError('Unable to update Portainer accesses', err);
-      }
-    });
-  }
-
  /**
   * GET
   */
@@ -78,12 +29,12 @@ class KubernetesConfigMapService {
        this.KubernetesConfigMaps(namespace).getYaml(params).$promise,
      ]);

-      if (_.get(rawPromise, 'reason.status') === 404 && _.get(yamlPromise, 'reason.status') === 404) {
+      if (_.get(rawPromise, 'reason.status') == 404 && _.get(yamlPromise, 'reason.status') == 404) {
        return KubernetesConfigMapConverter.defaultConfigMap(namespace, name);
      }

-      // Saving binary data to 'data' field in configMap Object is not allowed by kubernetes and getYaml() may get
-      // an error. We should keep binary data to 'binaryData' field instead of 'data'. Before that, we
+      // Saving binary data to 'data' field in configMap Object is not allowed by kubernetes and getYaml() may get 
+      // an error. We should keep binary data to 'binaryData' field instead of 'data'. Before that, we 
      // use response from get() and ignore 500 error as a workaround.
      if (rawPromise.value) {
        return KubernetesConfigMapConverter.apiToConfigMap(rawPromise.value, yamlPromise.value);
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -1299,7 +1299,7 @@
                      ng-min="1"
                      ng-max="65535"
                      ng-required="!publishedPort.NeedsDeletion"
-                      ng-change="ctrl.onChangePortMappingLoadBalancer()"
+                      ng-change="ctrl.onChangePortMappingLoadBalancerPort()"
                      ng-disabled="ctrl.disableLoadBalancerEdit() || ctrl.isEditAndNotNewPublishedPort($index)"
                    />
                  </div>
--- a/app/kubernetes/views/applications/create/createApplicationController.js
+++ b/app/kubernetes/views/applications/create/createApplicationController.js
@@ -409,14 +409,13 @@ class KubernetesCreateApplicationController {
  }

  onChangePortProtocol(index) {
+    this.onChangePortMappingContainerPort();
    if (this.formValues.PublishingType === KubernetesApplicationPublishingTypes.LOAD_BALANCER) {
      const newPorts = _.filter(this.formValues.PublishedPorts, { IsNew: true });
      _.forEach(newPorts, (port) => {
        port.Protocol = index ? this.formValues.PublishedPorts[index].Protocol : newPorts[0].Protocol;
      });
-      this.onChangePortMappingLoadBalancer();
    }
-    this.onChangePortMappingContainerPort();
  }
  /* #endregion */

--- a/app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js
+++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js
@@ -52,7 +52,7 @@ class KubernetesResourcePoolAccessController {
      let [endpoint, pool, configMap] = await Promise.all([
        this.EndpointService.endpoint(this.endpointId),
        this.KubernetesResourcePoolService.get(name),
-        this.KubernetesConfigMapService.getAccess(KubernetesPortainerConfigMapNamespace, KubernetesPortainerConfigMapConfigName),
+        this.KubernetesConfigMapService.get(KubernetesPortainerConfigMapNamespace, KubernetesPortainerConfigMapConfigName),
      ]);
      const group = await this.GroupService.group(endpoint.GroupId);
      const roles = [];
@@ -96,7 +96,7 @@ class KubernetesResourcePoolAccessController {
      this.state.actionInProgress = true;
      const newAccesses = _.concat(this.authorizedUsersAndTeams, this.formValues.multiselectOutput);
      const accessConfigMap = KubernetesConfigMapHelper.modifiyNamespaceAccesses(angular.copy(this.accessConfigMap), this.pool.Namespace.Name, newAccesses);
-      await this.KubernetesConfigMapService.updateAccess(accessConfigMap);
+      await this.KubernetesConfigMapService.update(accessConfigMap);
      this.Notifications.success('Access successfully created');
      this.$state.reload();
    } catch (err) {
@@ -116,7 +116,7 @@ class KubernetesResourcePoolAccessController {
      this.state.actionInProgress = true;
      const newAccesses = _.without(this.authorizedUsersAndTeams, ...selectedItems);
      const accessConfigMap = KubernetesConfigMapHelper.modifiyNamespaceAccesses(angular.copy(this.accessConfigMap), this.pool.Namespace.Name, newAccesses);
-      await this.KubernetesConfigMapService.updateAccess(accessConfigMap);
+      await this.KubernetesConfigMapService.update(accessConfigMap);
      this.Notifications.success('Access successfully removed');
      this.$state.reload();
    } catch (err) {
--- a/app/portainer/views/stacks/create/createStackController.js
+++ b/app/portainer/views/stacks/create/createStackController.js
@@ -167,6 +167,7 @@ angular

    async function initView() {
      var endpointMode = $scope.applicationState.endpoint.mode;
+      const endpointId = +$state.params.endpointId;
      $scope.state.StackType = 2;
      if (endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER') {
        $scope.state.StackType = 1;
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
  "author": "Portainer.io",
  "name": "portainer",
  "homepage": "http://portainer.io",
-  "version": "2.1.0",
+  "version": "2.0.0",
  "repository": {
    "type": "git",
    "url": "git@github.com:portainer/portainer.git"
@@ -77,8 +77,10 @@
    "chart.js": "~2.6.0",
    "codemirror": "~5.30.0",
    "fast-json-patch": "^3.0.0-1",
+    "file-system": "^2.2.2",
    "filesize": "~3.3.0",
    "filesize-parser": "^1.5.0",
+    "fs": "^0.0.1-security",
    "jquery": "^3.5.1",
    "js-base64": "^3.6.0",
    "js-yaml": "^3.14.0",
--- a/yarn.lock
+++ b/yarn.lock
@@ -1352,6 +1352,7 @@ angular-moment-picker@^0.10.2:
  dependencies:
    angular-mocks "1.6.1"
    angular-sanitize "1.6.1"
+    lodash-es "^4.17.15"

 angular-resource@1.8.0:
  version "1.8.0"
@@ -4576,6 +4577,13 @@ file-loader@^1.1.11:
    loader-utils "^1.0.2"
    schema-utils "^0.4.5"

+file-match@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz#c9cad265d2c8adf3a81475b0df475859069faef7"
+  integrity sha1-ycrSZdLIrfOoFHWw30dYWQafrvc=
+  dependencies:
+    utils-extend "^1.0.6"
+
 file-saver@^1.3.3:
  version "1.3.8"
  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
@@ -4586,6 +4594,14 @@ file-sync-cmp@^0.1.0:
  resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"
  integrity sha1-peeo/7+kk7Q7kju9TKiaU7Y7YSs=

+file-system@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz#7d65833e3a2347dcd956a813c677153ed3edd987"
+  integrity sha1-fWWDPjojR9zZVqgTxncVPtPt2Yc=
+  dependencies:
+    file-match "^1.0.1"
+    utils-extend "^1.0.4"
+
 file-type@5.2.0, file-type@^5.2.0:
  version "5.2.0"
  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
@@ -4904,6 +4920,11 @@ fs.realpath@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

+fs@^0.0.1-security:
+  version "0.0.1-security"
+  resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.1-security.tgz#8a7bd37186b6dddf3813f23858b57ecaaf5e41d4"
+  integrity sha1-invTcYa23d84E/I4WLV+yq9eQdQ=
+
 fsevents@^1.2.7:
  version "1.2.13"
  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
@@ -11000,6 +11021,11 @@ utila@^0.4.0, utila@~0.4:
  resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
  integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=

+utils-extend@^1.0.4, utils-extend@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz#ccfd7b64540f8e90ee21eec57769d0651cab8a5f"
+  integrity sha1-zP17ZFQPjpDuIe7Fd2nQZRyril8=
+
 utils-merge@1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
Author	SHA1	Message	Date
Simon Meng	59d4b90a0a	fix(k8s) parse empty configuration as empty string yaml instead of {} (ce#395)	2021-02-02 14:36:13 +13:00
Yi Chen	81de55fedd	* fix missing kubectl download (#4802 )	2021-02-02 11:12:40 +13:00
Steven Kang	84827b8782	feat(build): introducing buildx for Windows (#4792 ) * feat(build): introducing buildx for Windows * feat(build): re-ordered USER * feat(build): Fixed Typo * feat(build): fixed typo	2021-01-31 17:32:30 +13:00