Bugfix for operator-framework#4530: not able to test ansible operator…

… locally or on k8s cluster (operator-framework#4944) * Bugfix for operator-framework#4530: unable to test ansible operator locally or on k8s cluster Signed-off-by: rashmigottipati <[email protected]>
xdlbdy · May 26, 2021 · 45b6a52 · 45b6a52
1 parent f855bd6
commit 45b6a52
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,6 @@
 
 [![Build Status](https://github.com/operator-framework/operator-sdk/workflows/deploy/badge.svg)](https://github.com/operator-framework/operator-sdk/actions)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
-[![Go Report Card](https://goreportcard.com/badge/github.com/operator-framework/operator-sdk)](https://goreportcard.com/report/github.com/operator-framework/operator-sdk)
 
 ## Documentation
 

diff --git a/internal/ansible/runner/runner.go b/internal/ansible/runner/runner.go
@@ -48,6 +48,8 @@ const (
 	// to the ansible-runner command. This will override the value for a particular CR.
 	// Example usage "ansible.sdk.operatorframework.io/verbosity: 5"
 	AnsibleVerbosityAnnotation = "ansible.sdk.operatorframework.io/verbosity"
+
+	ansibleRunnerBin = "ansible-runner"
 )
 
 // Runner - a runnable that should take the parameters and name and namespace
@@ -180,6 +182,10 @@ type runner struct {
 }
 
 func (r *runner) Run(ident string, u *unstructured.Unstructured, kubeconfig string) (RunResult, error) {
+	if _, err := exec.LookPath(ansibleRunnerBin); err != nil {
+		return nil, err
+	}
+
 	timer := metrics.ReconcileTimer(r.GVK.String())
 	defer timer.ObserveDuration()
 
@@ -277,11 +283,16 @@ func (r *runner) Run(ident string, u *unstructured.Unstructured, kubeconfig stri
 		// link the current run to the `latest` directory under artifacts
 		currentRun := filepath.Join(inputDir.Path, "artifacts", ident)
 		latestArtifacts := filepath.Join(inputDir.Path, "artifacts", "latest")
-		if _, err = os.Lstat(latestArtifacts); err == nil {
-			if err = os.Remove(latestArtifacts); err != nil {
-				logger.Error(err, "Error removing the latest artifacts symlink")
+		if _, err = os.Lstat(latestArtifacts); err != nil {
+			if !errors.Is(err, os.ErrNotExist) {
+				logger.Error(err, "Latest artifacts dir has error")
+				return
 			}
+		} else if err = os.Remove(latestArtifacts); err != nil {
+			logger.Error(err, "Error removing the latest artifacts symlink")
+			return
 		}
+
 		if err = os.Symlink(currentRun, latestArtifacts); err != nil {
 			logger.Error(err, "Error symlinking latest artifacts")
 		}