Compare commits

...

5 Commits

Author SHA1 Message Date
deviantony
424d11303e feat(k8s/deploy): update logging 2021-09-02 23:10:08 +12:00
deviantony
c70a94b683 feat(k8s): update logging 2021-09-02 22:38:16 +12:00
deviantony
e13401d650 feat(k8s): add extra logging 2021-09-02 22:38:16 +12:00
deviantony
2ce3b369dd feat(k8s/deploy): change default namespace behavior 2021-09-02 22:38:15 +12:00
Anthony Lapenna
f93adc4344 chore(build-system): update dev-toolkit (#4887)
* chore(build-system): update dev-toolkit

* chore(build-system): update dev-toolkit

* chore(build-system): update dev-toolkit Dockerfile

* chore(build-system): update gruntfile

* chore(build-system): gruntfile update

* chore(build-system): better support for private git repositories

* Update toolkit.Dockerfile

* merge develop into toolkit-update

* merge develop into toolkit-update
2021-09-02 22:37:14 +12:00
4 changed files with 11 additions and 6 deletions

View File

@@ -95,7 +95,10 @@ func (deployer *KubernetesDeployer) Deploy(request *http.Request, endpoint *port
args = append(args, "--server", endpoint.URL)
args = append(args, "--insecure-skip-tls-verify")
args = append(args, "--token", token)
args = append(args, "--namespace", namespace)
fmt.Printf("Namespace: %s\n", namespace)
if namespace != "" {
args = append(args, "--namespace", namespace)
}
args = append(args, "apply", "-f", "-")
var stderr bytes.Buffer

View File

@@ -189,6 +189,10 @@ func (handler *Handler) deployKubernetesStack(r *http.Request, endpoint *portain
return "", errors.Wrap(err, "failed to add application labels")
}
if !composeFormat && namespace == "default" {
namespace = ""
}
return handler.KubernetesDeployer.Deploy(r, endpoint, string(manifest), namespace)
}

View File

@@ -83,7 +83,7 @@
placeholder="# Define or paste the content of your manifest file here"
>
<editor-description>
<span class="col-sm-12 text-muted small" ng-show="ctrl.state.DeployType === ctrl.ManifestDeployTypes.COMPOSE">
<span class="col-sm-12" ng-show="ctrl.state.DeployType === ctrl.ManifestDeployTypes.COMPOSE">
<p>
<i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
Portainer uses <a href="https://kompose.io/" target="_blank">Kompose</a> to convert your Compose manifest to a Kubernetes compliant manifest. Be wary that
@@ -95,7 +95,7 @@
</p>
</span>
<span
class="col-sm-12 text-muted small"
class="col-sm-12"
ng-show="ctrl.state.DeployType === ctrl.ManifestDeployTypes.KUBERNETES && ctrl.state.BuildMethod === ctrl.BuildMethods.WEB_EDITOR"
>
<p>

View File

@@ -175,9 +175,7 @@ function shell_build_binary_azuredevops(p, a) {
function shell_run_container() {
return [
'docker rm -f portainer',
'docker run -d -p 8000:8000 -p 9000:9000 -p 9443:9443 -v ' +
portainer_root +
'/dist:/app -v ' +
'docker run -d -p 8000:8000 -p 9000:9000 -v ' + portainer_root + '/dist:/app -v ' +
portainer_data +
':/data -v /var/run/docker.sock:/var/run/docker.sock:z -v /var/run/docker.sock:/var/run/alternative.sock:z -v /tmp:/tmp --name portainer portainer/base /app/portainer',
].join(';');