feat: added support for release imagestream images

added the ability to pass in an imagestream to initialize utility map for remote pullspecs, if no imageregistry is present, any existing pullspec will be updated to refer to the remote pullspec

update: use new methods to help replace pullspec

used new methods to help with asset files and updated disruption deployment to use pullspec method

Signed-off-by: ehila <[email protected]>

feat: added panic method option for pullspec

Signed-off-by: ehila <[email protected]>

Author: eggfoobar

pkg/clioptions/clusterdiscovery/provider.go

@@ -8,6 +8,7 @@ import (
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 
+	"github.com/openshift/origin/test/extended/util/image"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
 	exutil "github.com/openshift/origin/test/extended/util"
@@ -67,6 +68,16 @@ func InitializeTestFramework(context *e2e.TestContextType, config *ClusterConfig
 
 	// IPFamily constants are taken from kube e2e and used by tests
 	context.IPFamily = config.IPFamily
+
+	imageStreamString, _, err := exutil.NewCLIWithoutNamespace("").AsAdmin().Run("adm", "release", "info", `-ojsonpath={.references}`).Outputs()
+	if err != nil {
+		return err
+	}
+
+	if err := image.InitializeReleasePullSpecString(imageStreamString, config.HasNoOptionalCapabilities); err != nil {
+		return err
+	}
+
 	return nil
 }
 

pkg/monitortests/network/disruptionpodnetwork/monitortest.go

@@ -178,6 +178,7 @@ func (pna *podNetworkAvalibility) StartCollection(ctx context.Context, adminREST
 	pna.targetService = service
 
 	hostNetworkTargetDeployment.Spec.Replicas = &numNodes
+	hostNetworkTargetDeployment.Spec.Template.Spec.Containers[0].Image = image.LimitedShellImage()
 	if _, err := pna.kubeClient.AppsV1().Deployments(pna.namespaceName).Create(context.Background(), hostNetworkTargetDeployment, metav1.CreateOptions{}); err != nil {
 		return err
 	}

test/extended/util/image/image.go

@@ -3,12 +3,14 @@ package image
 import (
 	"crypto/sha256"
 	"encoding/base64"
+	"encoding/json"
 	"fmt"
 	"regexp"
 	"strings"
 	"sync"
 	"time"
 
+	imageapi "github.com/openshift/api/image/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	k8simage "k8s.io/kubernetes/test/utils/image"
 )
@@ -19,6 +21,14 @@ var (
 	fromRepository     string
 	images             map[string]string
 
+	releasePullSpecInitializationLock sync.RWMutex
+	releasePullSpecInitialized        bool
+	availablePullSpecs                = map[string]string{
+		"cli":   "image-registry.openshift-image-registry.svc:5000/openshift/cli:latest",
+		"tools": "image-registry.openshift-image-registry.svc:5000/openshift/tools:latest",
+	}
+	imageRegistryPullSpecRegex = regexp.MustCompile(`image-registry\.openshift-image-registry\.svc:5000\/openshift\/([A-Za-z0-9._-]+)[@:A-Za-z0-9._-]*`)
+
 	allowedImages = map[string]k8simage.ImageID{
 		// used by jenkins tests
 		"quay.io/redhat-developer/nfs-server:1.1": -1,
@@ -106,6 +116,27 @@ func ReplaceContents(data []byte) ([]byte, error) {
 		patterns[to] = re
 	}
 
+	// find any references to image-registry.openshift-image-registry.svc:5000/openshift/<image>:<tag>
+	// append pattern match for appropriate PullSpec if one exists
+	allMatches := imageRegistryPullSpecRegex.FindAllStringSubmatch(string(data), -1)
+	for _, match := range allMatches {
+		if len(match) != 2 {
+			continue
+		}
+		exactMatchedPullSpec := match[0]
+		tagMatchedPullSpec := match[1]
+		to, found := GetPullSpecFor(tagMatchedPullSpec)
+		if !found || to == exactMatchedPullSpec {
+			continue
+		}
+		pattern := fmt.Sprintf(exactImageFormat, regexp.QuoteMeta(exactMatchedPullSpec))
+		re, err := regexp.Compile(pattern)
+		if err != nil {
+			return nil, err
+		}
+		patterns[to] = re
+	}
+
 	for to, pattern := range patterns {
 		data = pattern.ReplaceAll(data, []byte(to))
 	}
@@ -146,15 +177,15 @@ the test/extended/util/image/README.md file.`, image))
 // to avoid the need to add packages by using simpler concepts or consider
 // extending an existing image.
 func ShellImage() string {
-	return "image-registry.openshift-image-registry.svc:5000/openshift/tools:latest"
+	return GetPullSpecForOrPanic("tools")
 }
 
 // LimitedShellImage returns a docker pull spec that any pod on the cluster
 // has access to that contains bash and standard commandline tools.
 // This image should be used when you only need oc and can't use the shell image.
 // This image has oc.
 func LimitedShellImage() string {
-	return "image-registry.openshift-image-registry.svc:5000/openshift/cli:latest"
+	return GetPullSpecForOrPanic("cli")
 }
 
 // OpenLDAPTestImage returns the LDAP test image.
@@ -236,3 +267,54 @@ func GetMappedImages(originalImages map[string]k8simage.ImageID, repo string) ma
 	}
 	return configs
 }
+
+func GetPullSpecFor(image string) (string, bool) {
+	if spec, found := availablePullSpecs[image]; found {
+		return spec, true
+	}
+	return "", false
+}
+
+func GetPullSpecForOrPanic(image string) string {
+	spec, found := GetPullSpecFor(image)
+	if !found {
+		panic(fmt.Sprintf("could not find PullSpec for (%s)", image))
+	}
+	return spec
+}
+
+// InitializeReleasePullSpecString initializes a mapping with the PullSpec ImageStream string from
+// the release payload
+//
+// When running in clusters that do not have ImageRegistry installed it is necessary to use the full
+// PullSpec for ImageRegistry containers such as `cli` or `tools`, Pass in an imageStreamString of
+// the discovered PullSpec (ex. oc adm release info `-ojsonpath='{.references}'). This method will then
+// initialize the package with the PullSpec for that release.
+//
+// Using GetPullSpecFor(), ShellImage() and LimitedShellImage() will return the appropriate
+// PullSpec, either the ReleasePayload or ImageRegistry.
+func InitializeReleasePullSpecString(imageStreamString string, hasNoImageRegistry bool) error {
+	releasePullSpecInitializationLock.Lock()
+	defer releasePullSpecInitializationLock.Unlock()
+	if releasePullSpecInitialized {
+		panic("attempt to double initialize ReleasePullSpec")
+	}
+	images := &imageapi.ImageStream{}
+	err := json.Unmarshal([]byte(imageStreamString), images)
+	if err != nil {
+		return fmt.Errorf("failed to unmarshal release ImageStream string: %w", err)
+	}
+
+	for _, tag := range images.Spec.Tags {
+		if tag.From.Kind != "DockerImage" {
+			continue
+		}
+		// If an available pullthrough spec is already defined, and we do have an ImageRegistry
+		// we leave it alone
+		if _, available := availablePullSpecs[tag.Name]; available && !hasNoImageRegistry {
+			continue
+		}
+		availablePullSpecs[tag.Name] = tag.From.Name
+	}
+	return nil
+}