Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-22 06:49:40 +02:00
Code Issues Releases Activity

post tech review updates

Browse source
This commit is contained in:
ArrisLee 2021-09-08 12:15:19 +12:00
parent 1991475437
commit 0c87634bc3
5 changed files with 21 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

30
api/exec/kubernetes_deploy.go
View file

@ -95,24 +95,13 @@ func (deployer *KubernetesDeployer) Deploy(request *http.Request, endpoint *port
}
args := make([]string, 0)
if endpoint.Type != portainer.KubernetesLocalEnvironment {
url := endpoint.URL
switch endpoint.Type {
case portainer.AgentOnKubernetesEnvironment:
agentUrl, agentProxy, err := deployer.getAgentURL(endpoint)
if err != nil {
return "", errors.WithMessage(err, "failed generating endpoint URL")
}
url = agentUrl
defer agentProxy.Close()
case portainer.EdgeAgentOnKubernetesEnvironment:
url, err = deployer.getEdgeUrl(endpoint)
if err != nil {
return "", errors.WithMessage(err, "failed generating endpoint URL")
}
if endpoint.Type == portainer.AgentOnKubernetesEnvironment || endpoint.Type == portainer.EdgeAgentOnKubernetesEnvironment {
url, proxy, err := deployer.getAgentURL(endpoint)
if err != nil {
return "", errors.WithMessage(err, "failed generating endpoint URL")
}
defer proxy.Close()
args = append(args, "--server", url)
args = append(args, "--insecure-skip-tls-verify")
}
@ -163,15 +152,6 @@ func (deployer *KubernetesDeployer) ConvertCompose(data []byte) ([]byte, error)
return output, nil
}
func (deployer *KubernetesDeployer) getEdgeUrl(endpoint *portainer.Endpoint) (string, error) {
tunnel, err := deployer.reverseTunnelService.GetActiveTunnel(endpoint)
if err != nil {
return "", errors.Wrap(err, "failed activating tunnel")
}
return fmt.Sprintf("http://127.0.0.1:%d/kubernetes", tunnel.Port), nil
}
func (deployer *KubernetesDeployer) getAgentURL(endpoint *portainer.Endpoint) (string, *factory.ProxyServer, error) {
proxy, err := deployer.proxyManager.CreateAgentProxyServer(endpoint)
if err != nil {