Fixing imageID retrieval issue when sidecars are injected (w/ Istio in mind).

Author: Hugheym

pkg/deployment/images.go

@@ -119,7 +119,7 @@ func (ib *imagesBuilder) fetchArangoDBImageIDAndVersion(ctx context.Context, ima
 			log.Warn().Msg("Empty list of ContainerStatuses")
 			return true, nil
 		}
-		imageID := k8sutil.ConvertImageID2Image(pod.Status.ContainerStatuses[0].ImageID)
+		imageID := k8sutil.GetArangoDBImageIDFromPod(pod)
 		if imageID == "" {
 			// Fall back to specified image
 			imageID = image

pkg/util/k8sutil/images.go

@@ -22,7 +22,11 @@
 
 package k8sutil
 
-import "strings"
+import (
+	"strings"
+
+	corev1 "k8s.io/api/core/v1"
+)
 
 const (
 	dockerPullableImageIDPrefix = "docker-pullable://"
@@ -36,3 +40,16 @@ func ConvertImageID2Image(imageID string) string {
 	}
 	return imageID
 }
+
+// GetArangoDBImageIDFromPod returns the ArangoDB specific image from a pod
+func GetArangoDBImageIDFromPod(pod *corev1.Pod) string {
+	rawImageID := pod.Status.ContainerStatuses[0].ImageID
+	if len(pod.Status.ContainerStatuses) > 1 {
+		for _, containerStatus := range pod.Status.ContainerStatuses {
+			if strings.Contains(containerStatus.ImageID, "arango") {
+				rawImageID = containerStatus.ImageID
+			}
+		}
+	}
+	return ConvertImageID2Image(rawImageID)
+}