From 8c3160d061452ca9bcc979c56e738d27d7e8bb16 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 17 Aug 2020 12:13:29 +1200 Subject: [PATCH] feat(core/endpoints): review endpoint creation instructions --- .../endpoints/create/createEndpointController.js | 6 ++++-- .../views/endpoints/create/createendpoint.html | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js index c108f1725..5aaf9862e 100644 --- a/app/portainer/views/endpoints/create/createEndpointController.js +++ b/app/portainer/views/endpoints/create/createEndpointController.js @@ -56,10 +56,12 @@ angular }; $scope.copyAgentCommand = function () { - if ($scope.state.deploymentTab === 1) { + if ($scope.state.deploymentTab === 2) { clipboard.copyText('curl -L https://downloads.portainer.io/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent'); + } else if ($scope.state.deploymentTab === 1) { + clipboard.copyText('curl -L https://downloads.portainer.io/portainer-agent-k8s-node.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml'); } else { - clipboard.copyText('curl -L https://downloads.portainer.io/portainer-agent-k8s.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml'); + clipboard.copyText('curl -L https://downloads.portainer.io/portainer-agent-k8s-lb.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml'); } $('#copyNotification').show().fadeOut(2500); }; diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html index ee9e6e25a..fbf112a71 100644 --- a/app/portainer/views/endpoints/create/createendpoint.html +++ b/app/portainer/views/endpoints/create/createendpoint.html @@ -76,13 +76,19 @@ Ensure that you have deployed the Portainer agent in your cluster first. Refer to the platform related command below to deploy it.
- + curl -L https://downloads.portainer.io/portainer-agent-k8s.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yamlcurl -L https://downloads.portainer.io/portainer-agent-k8s-lb.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml - + + curl -L https://downloads.portainer.io/portainer-agent-k8s-node.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml + + + curl -L https://downloads.portainer.io/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent