Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1354 from nashasha1/fix/some-typo 

Fix some typo
This commit is contained in:
Sebastiaan van Stijn 2018-09-12 14:53:38 +02:00 committed by GitHub
parent bd906df601 f8e04011e4
commit 1921a6c051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/stack/kubernetes/services.go
View File

@ -107,7 +107,7 @@ func RunServices(dockerCli *KubeCli, opts options.Services) error {
return err 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) services, info, err := convertToServices(replicasList, daemonsList, servicesList)
if err != nil { if err != nil {
return err return err

2
cli/command/stack/kubernetes/stackclient.go
View File

@ -85,7 +85,7 @@ func (s *stackV1Beta1) IsColliding(servicesClient corev1.ServiceInterface, st St
return nil 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 // 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) // than the stack name for the label, we fail (i.e. it will collide)
func verify(services corev1.ServiceInterface, stackName string, service string) error { func verify(services corev1.ServiceInterface, stackName string, service string) error {

2
e2e/stack/remove_test.go
View File

@ -46,7 +46,7 @@ func deployFullStack(t *testing.T, orchestrator, stackname string) {
} }
func cleanupFullStack(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, stackRm(orchestrator, stackname), pollSettings)
poll.WaitOn(t, taskCount(orchestrator, stackname, 0), pollSettings) poll.WaitOn(t, taskCount(orchestrator, stackname, 0), pollSettings)
} }