Skip to content

Commit 84142e1

Browse files
committed
fix: remove false positive error log about missing annotation
1 parent 1eb1675 commit 84142e1

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

internal/webhook/core/v1/pod_webhook.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,8 @@ func (a *ImageRewriter) RewriteImages(pod *corev1.Pod, isNewPod bool) []Rewritte
116116

117117
func (a *ImageRewriter) handleContainer(pod *corev1.Pod, container *corev1.Container, initContainer bool, rewriteImage bool) RewrittenImage {
118118
annotationKey := registry.ContainerAnnotationKey(container.Name, initContainer)
119-
originalImage := pod.Annotations[annotationKey]
120119
rewrittenImage := RewrittenImage{
121120
ContainerName: container.Name,
122-
Original: originalImage,
123121
}
124122

125123
if err := a.isImageRewritable(container); err != nil {
@@ -153,6 +151,7 @@ func (a *ImageRewriter) handleContainer(pod *corev1.Pod, container *corev1.Conta
153151

154152
container.Image = fmt.Sprintf("localhost:%d/%s", a.ProxyPort, image)
155153

154+
rewrittenImage.Original = pod.Annotations[annotationKey]
156155
rewrittenImage.Rewritten = container.Image
157156
return rewrittenImage
158157
}

0 commit comments

Comments
 (0)