Removed func

Author: yuriolisa

pkg/instrumentation/apachehttpd.go

@@ -164,7 +164,7 @@ func injectApacheHttpdagent(_ logr.Logger, apacheSpec v1alpha1.ApacheHttpd, pod
 					MountPath: apacheAgentConfDirFull,
 				},
 			},
-			ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+			ImagePullPolicy: instSpec.ImagePullPolicy,
 		})
 	}
 

pkg/instrumentation/dotnet.go

@@ -112,7 +112,7 @@ func injectDotNetSDK(dotNetSpec v1alpha1.DotNet, pod corev1.Pod, index int, runt
 				Name:      volume.Name,
 				MountPath: dotnetInstrMountPath,
 			}},
-			ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+			ImagePullPolicy: instSpec.ImagePullPolicy,
 		})
 	}
 	return pod, nil

pkg/instrumentation/golang.go

@@ -57,7 +57,7 @@ func injectGoSDK(goSpec v1alpha1.Go, pod corev1.Pod, cfg config.Config, instSpec
 				Name:      kernelDebugVolumeName,
 			},
 		},
-		ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+		ImagePullPolicy: instSpec.ImagePullPolicy,
 	}
 
 	// Annotation takes precedence for OTEL_GO_AUTO_TARGET_EXE

pkg/instrumentation/helper.go

@@ -171,13 +171,3 @@ func setContainersFromAnnotation(inst *instrumentationWithContainers, annotation
 	inst.Containers = append(inst.Containers, languageContainers...)
 	return nil
 }
-
-func setImagePullPolicy(instSpec corev1.PullPolicy) corev1.PullPolicy {
-	var imagePullPolicy = corev1.PullAlways
-
-	if instSpec != imagePullPolicy {
-		imagePullPolicy = instSpec
-	}
-
-	return imagePullPolicy
-}

pkg/instrumentation/javaagent.go

@@ -65,7 +65,7 @@ func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int, instSpec
 				Name:      volume.Name,
 				MountPath: javaInstrMountPath,
 			}},
-			ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+			ImagePullPolicy: instSpec.ImagePullPolicy,
 		})
 
 		for i, extension := range javaSpec.Extensions {

pkg/instrumentation/nginx.go

@@ -228,7 +228,7 @@ mv ${NGINX_AGENT_CONF_DIR_FULL}/opentelemetry_agent.conf  ${NGINX_AGENT_CONF_DIR
 				},
 			},
 			SecurityContext: pod.Spec.Containers[index].SecurityContext,
-			ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+			ImagePullPolicy: instSpec.ImagePullPolicy,
 		})
 
 		found := false

pkg/instrumentation/nodejs.go

@@ -58,7 +58,7 @@ func injectNodeJSSDK(nodeJSSpec v1alpha1.NodeJS, pod corev1.Pod, index int, inst
 				Name:      volume.Name,
 				MountPath: nodejsInstrMountPath,
 			}},
-			ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+			ImagePullPolicy: instSpec.ImagePullPolicy,
 		})
 	}
 	return pod, nil

pkg/instrumentation/python.go

@@ -102,7 +102,7 @@ func injectPythonSDK(pythonSpec v1alpha1.Python, pod corev1.Pod, index int, plat
 				Name:      volume.Name,
 				MountPath: pythonInstrMountPath,
 			}},
-			ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
+			ImagePullPolicy: instSpec.ImagePullPolicy,
 		})
 	}
 	return pod, nil