Skip to content

Commit b2329ef

Browse files
committed
Removed func
1 parent da0d9ae commit b2329ef

File tree

8 files changed

+7
-17
lines changed

8 files changed

+7
-17
lines changed

pkg/instrumentation/apachehttpd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func injectApacheHttpdagent(_ logr.Logger, apacheSpec v1alpha1.ApacheHttpd, pod
164164
MountPath: apacheAgentConfDirFull,
165165
},
166166
},
167-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
167+
ImagePullPolicy: instSpec.ImagePullPolicy,
168168
})
169169
}
170170

pkg/instrumentation/dotnet.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func injectDotNetSDK(dotNetSpec v1alpha1.DotNet, pod corev1.Pod, index int, runt
112112
Name: volume.Name,
113113
MountPath: dotnetInstrMountPath,
114114
}},
115-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
115+
ImagePullPolicy: instSpec.ImagePullPolicy,
116116
})
117117
}
118118
return pod, nil

pkg/instrumentation/golang.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func injectGoSDK(goSpec v1alpha1.Go, pod corev1.Pod, cfg config.Config, instSpec
5757
Name: kernelDebugVolumeName,
5858
},
5959
},
60-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
60+
ImagePullPolicy: instSpec.ImagePullPolicy,
6161
}
6262

6363
// Annotation takes precedence for OTEL_GO_AUTO_TARGET_EXE

pkg/instrumentation/helper.go

-10
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,3 @@ func setContainersFromAnnotation(inst *instrumentationWithContainers, annotation
171171
inst.Containers = append(inst.Containers, languageContainers...)
172172
return nil
173173
}
174-
175-
func setImagePullPolicy(instSpec corev1.PullPolicy) corev1.PullPolicy {
176-
var imagePullPolicy = corev1.PullAlways
177-
178-
if instSpec != imagePullPolicy {
179-
imagePullPolicy = instSpec
180-
}
181-
182-
return imagePullPolicy
183-
}

pkg/instrumentation/javaagent.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func injectJavaagent(javaSpec v1alpha1.Java, pod corev1.Pod, index int, instSpec
6565
Name: volume.Name,
6666
MountPath: javaInstrMountPath,
6767
}},
68-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
68+
ImagePullPolicy: instSpec.ImagePullPolicy,
6969
})
7070

7171
for i, extension := range javaSpec.Extensions {

pkg/instrumentation/nginx.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ mv ${NGINX_AGENT_CONF_DIR_FULL}/opentelemetry_agent.conf ${NGINX_AGENT_CONF_DIR
228228
},
229229
},
230230
SecurityContext: pod.Spec.Containers[index].SecurityContext,
231-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
231+
ImagePullPolicy: instSpec.ImagePullPolicy,
232232
})
233233

234234
found := false

pkg/instrumentation/nodejs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func injectNodeJSSDK(nodeJSSpec v1alpha1.NodeJS, pod corev1.Pod, index int, inst
5858
Name: volume.Name,
5959
MountPath: nodejsInstrMountPath,
6060
}},
61-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
61+
ImagePullPolicy: instSpec.ImagePullPolicy,
6262
})
6363
}
6464
return pod, nil

pkg/instrumentation/python.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func injectPythonSDK(pythonSpec v1alpha1.Python, pod corev1.Pod, index int, plat
102102
Name: volume.Name,
103103
MountPath: pythonInstrMountPath,
104104
}},
105-
ImagePullPolicy: setImagePullPolicy(instSpec.ImagePullPolicy),
105+
ImagePullPolicy: instSpec.ImagePullPolicy,
106106
})
107107
}
108108
return pod, nil

0 commit comments

Comments
 (0)