mirror of https://github.com/docker/cli.git
commit
1921a6c051
|
@ -107,7 +107,7 @@ func RunServices(dockerCli *KubeCli, opts options.Services) error {
|
|||
return err
|
||||
}
|
||||
|
||||
// Convert Replicas sets and kubernetes services to swam services and formatter informations
|
||||
// Convert Replicas sets and kubernetes services to swarm services and formatter information
|
||||
services, info, err := convertToServices(replicasList, daemonsList, servicesList)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
@ -85,7 +85,7 @@ func (s *stackV1Beta1) IsColliding(servicesClient corev1.ServiceInterface, st St
|
|||
return nil
|
||||
}
|
||||
|
||||
// verify checks wether the service is already present in kubernetes.
|
||||
// verify checks whether the service is already present in kubernetes.
|
||||
// If we find the service by name but it doesn't have our label or it has a different value
|
||||
// than the stack name for the label, we fail (i.e. it will collide)
|
||||
func verify(services corev1.ServiceInterface, stackName string, service string) error {
|
||||
|
|
|
@ -46,7 +46,7 @@ func deployFullStack(t *testing.T, orchestrator, stackname string) {
|
|||
}
|
||||
|
||||
func cleanupFullStack(t *testing.T, orchestrator, stackname string) {
|
||||
// FIXME(vdemeester) we shouldn't have to do that. it is hidding a race on docker stack rm
|
||||
// FIXME(vdemeester) we shouldn't have to do that. it is hiding a race on docker stack rm
|
||||
poll.WaitOn(t, stackRm(orchestrator, stackname), pollSettings)
|
||||
poll.WaitOn(t, taskCount(orchestrator, stackname, 0), pollSettings)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue