Squashed commit of the following:

commit e4605d9 Author: yi-portainer <[email protected]> Date: Tue Feb 2 17:42:57 2021 +1300 * update portainer version commit 7686971 Author: LP B <[email protected]> Date: Tue Feb 2 05:00:19 2021 +0100 sec(app): remove unused and vulnerable dependencies (portainer#4801) commit d3086da Author: cong meng <[email protected]> Date: Tue Feb 2 15:10:06 2021 +1300 fix(k8s) trigger port validation while changing protocol (ce#394) (portainer#4804) Co-authored-by: Simon Meng <[email protected]> commit 95894e8 Author: cong meng <[email protected]> Date: Tue Feb 2 15:03:11 2021 +1300 fix(k8s) parse empty configuration as empty string yaml instead of {} (ce#395) (portainer#4805) Co-authored-by: Simon Meng <[email protected]> commit 81de55f Author: Yi Chen <[email protected]> Date: Tue Feb 2 11:12:40 2021 +1300 * fix missing kubectl download (portainer#4802) commit 84827b8 Author: Steven Kang <[email protected]> Date: Sun Jan 31 17:32:30 2021 +1300 feat(build): introducing buildx for Windows (portainer#4792) * feat(build): introducing buildx for Windows * feat(build): re-ordered USER * feat(build): Fixed Typo * feat(build): fixed typo
misterbh · Feb 2, 2021 · d2d7f6f · d2d7f6f
1 parent b747f5f
commit d2d7f6f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git 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.0.1"
+	APIVersion = "2.1.0"
 	// DBVersion is the version number of the Portainer database
 	DBVersion = 25
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax

diff --git a/app/kubernetes/helpers/configurationHelper.js b/app/kubernetes/helpers/configurationHelper.js
@@ -52,6 +52,8 @@ class KubernetesConfigurationHelper {
   }
 
   static parseData(formValues) {
+    if (!formValues.Data.length) return '';
+
     const data = _.reduce(
       formValues.Data,
       (acc, entry) => {

diff --git 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.onChangePortMappingLoadBalancerPort()"
+                      ng-change="ctrl.onChangePortMappingLoadBalancer()"
                       ng-disabled="ctrl.disableLoadBalancerEdit() || ctrl.isEditAndNotNewPublishedPort($index)"
                     />
                   </div>

diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js
@@ -409,13 +409,14 @@ 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 */
 

diff --git a/build/download_kubectl_binary.sh b/build/download_kubectl_binary.sh
@@ -4,12 +4,12 @@ PLATFORM=$1
 ARCH=$2
 KUBECTL_VERSION=$3
 
-exit 0
-
 if [ "${PLATFORM}" == 'linux' ]; then
   wget -O "dist/kubectl" "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/${PLATFORM}/${ARCH}/kubectl"
   chmod +x "dist/kubectl"
 elif [ "${PLATFORM}" == 'windows' ]; then
   wget -O "dist/kubectl.exe" "https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/windows/amd64/kubectl.exe"
   chmod +x "dist/kubectl.exe"
 fi
+
+exit 0
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "repository": {
     "type": "git",
     "url": "[email protected]:portainer/portainer.git"