Merge pull request openshift#1977 from alvaroaleman/fix-bugs

Fix an ineffective break and an incomplete nilcheck
alvaroaleman · May 12, 2021 · 63e4e66 · 63e4e66
2 parents ce00324 + 66483c9
commit 63e4e66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/entrypoint-wrapper/main.go b/cmd/entrypoint-wrapper/main.go
@@ -193,7 +193,7 @@ func execCmd(argv []string) error {
 		for {
 			select {
 			case <-ctx.Done():
-				break
+				return
 			case s := <-sig:
 				fmt.Fprintf(os.Stderr, "received signal %d, forwarding\n", s)
 				if err := proc.Process.Signal(s); err != nil {

diff --git a/pkg/rehearse/jobs.go b/pkg/rehearse/jobs.go
@@ -277,7 +277,7 @@ func getResolvedConfigForTest(ciopConfig config.DataWithInfo, resolver registry.
 // target clusters where the rehearsals will execute).
 func inlineCiOpConfig(container *v1.Container, ciopConfigs config.DataByFilename, resolver registry.Resolver, metadata api.Metadata, testname string, loggers Loggers) (apihelper.ImageStreamTagMap, error) {
 	allImageStreamTags := apihelper.ImageStreamTagMap{}
-	if container.Command == nil || container.Command[0] != "ci-operator" {
+	if len(container.Command) < 1 || container.Command[0] != "ci-operator" {
 		return allImageStreamTags, nil
 	}