From 131643187b29239800e7b97d015b176081c90724 Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Fri, 23 Jan 2026 13:07:54 +0100 Subject: [PATCH] UPSTREAM: : Fix test operator deployment availability Signed-off-by: Per Goncalves da Silva --- .../pkg/bindata/operator/operator.go | 16 ++++++++-------- .../tests-extension/test/olmv1-incompatible.go | 3 +-- .../registry.clusterserviceversion.yaml | 4 ++-- .../operator/manifests/script.configmap.yaml | 9 +++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/openshift/tests-extension/pkg/bindata/operator/operator.go b/openshift/tests-extension/pkg/bindata/operator/operator.go index f849820b8..f893045f5 100644 --- a/openshift/tests-extension/pkg/bindata/operator/operator.go +++ b/openshift/tests-extension/pkg/bindata/operator/operator.go @@ -97,12 +97,12 @@ func dockerfile() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "Dockerfile", size: 888, mode: os.FileMode(420), modTime: time.Unix(1759972370, 0)} + info := bindataFileInfo{name: "Dockerfile", size: 888, mode: os.FileMode(420), modTime: time.Unix(1756998653, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifestsRegistryClusterserviceversionYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x4b\x6f\xdb\xb8\x13\xbf\xfb\x53\x0c\x74\xfe\x4b\xb1\xd3\xa4\x0d\x78\xfa\xa7\x6d\x10\x2c\x90\x17\x92\xec\x1e\xb6\x28\x16\x63\x6a\x62\x73\x4d\x91\x5c\x92\x72\xaa\x66\xf3\xdd\x17\x94\x64\x5b\xb2\x68\xc7\x45\xf7\xb2\xbc\x58\x22\xe7\xf1\x9b\x27\x47\x46\x23\x7e\x23\xeb\x84\x56\x0c\xb4\x21\x8b\x5e\x5b\x97\x71\x6d\x49\x87\x9f\xe2\x68\x39\x41\x69\xe6\x38\x19\x2d\x84\xca\x19\x7c\x92\xa5\xf3\x64\x1f\xc8\x2e\x05\xa7\x96\x75\x54\x90\xc7\x1c\x3d\xb2\x11\x00\x2a\xa5\x3d\x7a\xa1\x95\x0b\xaf\x00\x28\x8b\x94\xbe\x61\x61\x24\x39\x06\x7f\xa7\xf5\x26\xc0\x97\xf6\x17\xe0\x65\xfd\x04\x90\x6c\x00\x25\x0c\x12\xcd\x53\x6d\x72\x5a\xa6\x74\x4c\xd9\x0a\xdf\x93\xc5\x82\x9e\xb5\x5d\x64\x42\x67\x6f\x52\xac\x2d\x48\xfe\xd7\xd5\x13\xcc\x09\x1a\xee\x69\x26\x9c\xb7\x55\xff\x74\x65\x50\xc2\x7a\xe8\x00\x12\x89\x53\x92\x6e\xb0\x5f\x23\x37\xd9\xa2\x9c\x92\x55\xe4\xc9\x05\xcd\x05\x2a\x9c\x51\x9e\x4e\xab\xa0\x69\x51\x3a\xaf\x0b\xf1\x9d\x7a\xaa\x76\xb0\x2a\x2c\x28\x30\xbd\xbc\xc0\xe3\xc5\xc3\x63\xfa\xf1\xd7\x9b\xcf\x57\x17\xf0\xfa\x9a\xf4\x78\x5f\xfb\xa2\x92\x9d\x6c\xa9\xab\x03\xd0\xe5\xee\xf1\x26\xce\x10\x4f\x18\xa8\x52\xca\xf5\xf6\x6b\xfb\xf4\xb5\xfe\xe5\x68\x70\x2a\xa4\xf0\x22\xc4\xf1\x23\x3a\xc1\xe1\x17\xe5\x3c\xb6\x1c\xdc\x12\x7a\xca\xcf\x3d\x83\xe4\x78\x7c\x7c\x9a\x8e\xcf\xd2\xf1\xfb\xc7\xc9\x07\x76\xf2\x8e\x9d\x4c\x7e\x6f\x74\x6f\x92\x2c\x1a\xac\x69\x29\x64\x4e\x76\x93\x8c\xa9\xcb\x17\xe9\x72\x92\xbd\x3b\xc9\x26\x87\x08\x30\x56\xff\x49\xdc\xff\x21\xb1\xd2\xa5\x67\x30\xd3\xb5\x67\x5b\xb9\x75\x3e\x9c\x8c\x00\x82\xa3\x18\x0c\xdc\x94\x2d\xc7\xd9\xb8\x56\x14\x08\x9c\x41\x4e\x0c\x8c\x44\x4e\x73\x1d\xf8\x47\xc1\x4d\x75\x96\x1b\xe1\x9a\x1a\xc8\xe9\x49\x28\xd1\xe4\x3b\xbc\x04\x97\xf1\x3a\xd0\x96\x9c\x2e\x6d\xf7\xbc\x3d\xce\xc9\x71\x2b\x4c\xbb\xb3\x8d\xa0\x7b\x9c\xc1\xe3\xed\xe7\xdb\x2c\xf0\x08\x67\x24\x56\x37\x71\xd4\x23\x00\xc1\xb5\x0a\xb8\x52\x98\xa2\xa3\xf7\x27\x75\x35\x42\xd2\xf8\xbc\xa0\x5c\xa0\xaf\x0c\xb5\x3b\xa2\x89\x5a\x53\x9e\x2b\x8b\xc2\xca\xc9\x48\x5d\x15\xa4\xbc\x5b\x6d\xa5\x50\x67\x3c\xeb\xe4\xca\xbe\x44\x67\xb0\x4e\xf3\xbd\x1c\x3b\xfc\xdf\xe1\xe1\x5a\x79\xab\x65\x6a\x24\x2a\x62\xab\x57\x49\x36\x6d\xb4\xd9\x35\xed\x0e\x59\xe9\x1e\x96\xae\xd1\x61\x59\x32\x52\x70\x74\x0c\x26\x9d\x5d\x47\x92\xb8\xd7\x96\xf5\x8a\xac\x40\xcf\xe7\x57\x75\x1b\x60\x5b\x85\x7c\x38\x66\x00\xe7\x2d\x7a\x9a\x55\x6d\x56\xac\x96\xa7\xc2\x48\xf4\xb4\xa5\xb3\xd3\x60\xbb\x6b\xd0\x6c\xbb\x2b\x78\x9c\x7b\xb9\xe5\xf9\x9c\x9e\xb0\x94\xbe\xf6\x0e\x0a\x15\x6a\x6d\x08\x2e\x2c\x19\x35\xf1\xc7\x8c\x1c\x7a\x3a\xac\xa5\x96\x65\x41\x03\xd1\x69\x1b\xc9\x26\xff\x5d\x4c\xf1\x93\x98\x5d\xa3\x19\x62\x5a\x25\xc1\xdc\x7b\x93\xa7\x8d\x80\x08\x51\x6b\xfb\xb5\xce\x89\xc1\xf8\xc3\xe9\x69\x24\x7e\xb5\x4f\x22\xd8\xd0\xce\xa2\xce\x28\x0a\x0c\x17\xe3\x97\xe4\xa8\xc5\x7d\x54\x83\xc8\xdc\x3c\xf9\x3a\x20\x17\x05\xce\xa8\xd3\x9f\x3f\xdd\xde\x3c\xde\xdf\x5e\x5d\x5d\xdc\x0f\x5a\x7b\x58\x46\x5b\x1f\x51\x1a\xe0\xac\xa1\xde\x69\xeb\x19\x9c\x8d\xcf\x26\x03\xba\xc6\xcf\xd7\xba\x54\xbb\xa4\xec\x77\x78\x58\x45\xe0\xbe\x43\x3f\x67\x70\xb4\x8f\xce\x12\xe6\xb7\x4a\x56\x0c\xbc\x2d\x69\x40\x22\xc5\x92\x14\x39\x77\x67\xf5\x94\x62\x58\x82\xd3\x2e\xc9\xc7\x8e\x00\x4c\xa3\x7f\x4e\x28\xfd\xfc\x7b\x9c\x64\xb7\x1b\x42\xc3\x13\x5e\xa0\xfc\x4c\x12\xab\x07\xe2\x5a\xe5\xa1\xd2\xb7\xa3\x5f\x8b\x21\x2b\x74\xbe\xa6\x39\x1e\x0f\x68\x1a\x97\xc5\x4b\xa6\x71\x83\xf8\x69\x43\x83\x94\xea\xdf\xb2\xf3\x00\x33\x27\x43\x33\x57\xd7\x57\x34\x71\xa4\x28\x44\x3c\xa5\x00\xb8\x29\x19\x9c\x8e\xc7\x45\x3c\x9d\xa8\xd0\xb6\x62\x30\x39\x3e\xbb\x16\x11\x0a\x4b\x7f\x95\xe4\xf6\xca\x9e\xbc\x21\xfa\xfd\x49\x44\xb2\x23\x5e\x5a\xe1\xab\x4f\x5a\x79\xfa\x16\xf5\x3e\x4a\xa9\x9f\xef\xac\x58\x0a\x49\x33\xba\x70\x1c\x25\x36\x97\xf4\x13\x4a\x37\x4c\xe9\xad\x89\x28\x8a\x29\xb7\x3a\xda\xad\x42\xed\x9d\x5f\x5d\x0d\x61\x7a\xb4\xbe\x34\x3f\x95\x3c\xb5\x0c\xca\x7f\x3c\x7b\x9e\x50\xc8\xd2\xd2\xe3\xdc\x92\x0b\xe3\x0e\x83\x77\xc3\xbc\x78\x3b\x77\xde\x74\xb5\x2d\xd5\xb9\xbb\xd1\xea\x5e\x6b\x1f\x6d\x17\xed\x64\x75\xce\x79\x68\x3e\xcd\xd0\xd3\xb6\xee\x2d\x4a\x4f\xb6\x10\xaa\x0e\xd3\xa5\x45\x4e\x77\x3b\xb0\x99\x40\xe7\x5c\xf7\x9e\x4c\xc1\x96\xb2\x1b\xb7\x34\x0c\x75\x97\x56\x97\xa6\x17\xcc\x74\x35\x45\xb5\xe0\x63\x75\x91\xb6\x77\x53\x81\xa6\xdb\x1d\x97\x64\xa7\x5b\x74\x33\xf2\xbd\x77\x29\x5c\x7f\xe3\x39\x4c\x17\x7d\xd1\xf5\x5c\xdd\xdb\x2a\x4d\xbe\xbd\x65\x06\x7c\x39\x49\xea\x10\xed\x34\x8f\x6b\x6d\xf3\xd6\x89\xd9\xe2\x2c\x0c\x09\x6f\xdb\x2b\x09\x1d\xfd\xf7\x6c\x3d\x24\x94\xb4\x0c\xf3\xef\x7e\xd3\x22\x38\xfb\xa0\x62\x29\x7c\xf0\x84\xba\x19\x0d\x37\x03\xf9\x66\x6c\x0f\xd3\x8b\x6b\x66\x7d\x57\x9a\x50\xd1\x94\x77\xca\xa8\x99\xf3\x6f\x9f\xd5\xcd\xea\x0b\xe6\x0d\xd2\x07\xa1\x66\x92\x76\x52\x6f\x9a\x5f\x43\x7e\x5d\x4a\x2f\x0e\x95\x7d\x2e\xe5\x9a\x34\xb8\x74\x41\xd5\xb3\xb6\x79\x0b\x3f\x36\xfe\x4b\xa1\x16\xed\xf1\xbe\x6f\x84\xd2\xca\x66\xda\x73\xec\xe8\x68\xf8\x19\x97\xeb\x02\x85\x1a\x85\x61\x5d\x74\x47\xba\x14\xa8\x40\x21\x19\x54\xba\xb4\xff\xaf\x9f\x33\xae\x9b\xfb\xa4\x51\x77\xbd\x66\x80\x80\xbc\x16\xe1\xeb\x7e\xc6\xa0\xfe\x1f\x61\x04\x60\xac\x5e\x8a\xf0\x95\xda\xe1\xbb\x6b\xf7\x56\x5c\x5b\x10\x83\xbe\x0d\xaa\xe5\xea\x2f\x97\xe6\x6b\xf3\x9f\x00\x00\x00\xff\xff\x78\xa4\x24\x61\x85\x11\x00\x00") +var _manifestsRegistryClusterserviceversionYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x58\x4b\x6f\xe3\x36\x10\xbe\xfb\x57\x0c\x74\xae\x14\x3b\x9b\xec\x06\x3c\x35\xbb\x1b\x04\x05\xf2\x42\x92\xf6\xd0\xc5\xa2\x18\x53\x13\x9b\x35\x45\xb2\x24\xe5\xac\x9a\xe6\xbf\x17\x94\x64\x5b\xb2\x68\xc7\x8b\xed\xa5\xbc\x58\x22\xe7\xf1\xcd\x93\x23\xa3\x11\xbf\x91\x75\x42\x2b\x06\xda\x90\x45\xaf\xad\xcb\xb8\xb6\xa4\xc3\x4f\x71\xb4\x9c\xa0\x34\x73\x9c\x8c\x16\x42\xe5\x0c\x3e\xc9\xd2\x79\xb2\x0f\x64\x97\x82\x53\xcb\x3a\x2a\xc8\x63\x8e\x1e\xd9\x08\x00\x95\xd2\x1e\xbd\xd0\xca\x85\x57\x00\x94\x45\x4a\xdf\xb0\x30\x92\x1c\x83\x7f\xd2\x7a\x13\xe0\x4b\xfb\x0b\xf0\xb2\x7e\x02\x48\x36\x80\x12\x06\x89\xe6\xa9\x36\x39\x2d\x53\x3a\xa6\x6c\x85\xef\xc9\x62\x41\xcf\xda\x2e\x32\xa1\xb3\x37\x29\xd6\x16\x24\x3f\x75\xf5\x04\x73\x82\x86\x7b\x9a\x09\xe7\x6d\xd5\x3f\x5d\x19\x94\xb0\x1e\x3a\x80\x44\xe2\x94\xa4\x1b\xec\xd7\xc8\x4d\xb6\x28\xa7\x64\x15\x79\x72\x41\x73\x81\x0a\x67\x94\xa7\xd3\x2a\x68\x5a\x94\xce\xeb\x42\xfc\x4d\x3d\x55\x3b\x58\x15\x16\x14\x98\x5e\x5e\xe0\xf1\xe2\xe1\x31\xfd\xf8\xeb\xcd\xe7\xab\x0b\x78\x7d\x4d\x7a\xbc\xaf\x7d\x51\xc9\x4e\xb6\xd4\xd5\x01\xe8\x72\xf7\x78\x13\x67\x88\x27\x0c\x54\x29\xe5\x7a\xfb\xb5\x7d\xfa\x5a\xff\x72\x34\x38\x15\x52\x78\x11\xe2\xf8\x11\x9d\xe0\xf0\x8b\x72\x1e\x5b\x0e\x6e\x09\x3d\xe5\xe7\x9e\x41\x72\x3c\x3e\x3e\x4d\xc7\x67\xe9\xf8\xfd\xe3\xe4\x03\x3b\x79\xc7\x4e\x26\xbf\x37\xba\x37\x49\x16\x0d\xd6\xb4\x14\x32\x27\xbb\x49\xc6\xd4\xe5\x8b\x74\x39\xc9\xde\x9d\x64\x93\x43\x04\x18\xab\xff\x24\xee\xff\x90\x58\xe9\xd2\x33\x98\xe9\xda\xb3\xad\xdc\x3a\x1f\x4e\x46\x00\xc1\x51\x0c\x06\x6e\xca\x96\xe3\x6c\x5c\x2b\x0a\x04\xce\x20\x27\x06\x46\x22\xa7\xb9\x0e\xfc\xa3\xe0\xa6\x3a\xcb\x8d\x70\x4d\x0d\xe4\xf4\x24\x94\x68\xf2\x1d\x5e\x82\xcb\x78\x1d\x68\x4b\x4e\x97\xb6\x7b\xde\x1e\xe7\xe4\xb8\x15\xa6\xdd\xd9\x46\xd0\x3d\xce\xe0\xf1\xf6\xf3\x6d\x16\x78\x84\x33\x12\xab\x9b\x38\xea\x11\x80\xe0\x5a\x05\x5c\x29\x4c\xd1\xd1\xfb\x93\xba\x1a\x21\x69\x7c\x5e\x50\x2e\xd0\x57\x86\xda\x1d\xd1\x44\xad\x29\xcf\x95\x45\x61\xe5\x64\xa4\xae\x0a\x52\xde\xad\xb6\x52\xa8\x33\x9e\x75\x72\x65\x5f\xa2\x33\x58\xa7\xf9\x5e\x8e\x1d\xfe\xef\xf0\x70\xad\xbc\xd5\x32\x35\x12\x15\xb1\xd5\xab\x24\x9b\x36\xda\xec\x9a\x76\x87\xac\x74\x0f\x4b\xd7\xe8\xb0\x2c\x19\x29\x38\x3a\x06\x93\xce\xae\x23\x49\xdc\x6b\xcb\x7a\x45\x56\xa0\xe7\xf3\xab\xba\x0d\xb0\xad\x42\x3e\x1c\x33\x80\xf3\x16\x3d\xcd\xaa\x36\x2b\x56\xcb\x53\x61\x24\x7a\xda\xd2\xd9\x69\xb0\xdd\x35\x68\xb6\xdd\x15\x3c\xce\xbd\xdc\xf2\x7c\x4e\x4f\x58\x4a\x5f\x7b\x07\x85\x0a\xb5\x36\x04\x17\x96\x8c\x9a\xf8\x7d\x46\x0e\x3d\x1d\xd6\x52\xcb\xb2\xa0\x81\xe8\xb4\x8d\x64\x93\xff\x2e\xa6\xf8\x49\xcc\xae\xd1\x0c\x31\xad\x92\x60\xee\xbd\xc9\xd3\x46\x40\x84\xa8\xb5\xfd\x5a\xe7\xc4\x60\xfc\xe1\xf4\x34\x12\xbf\xda\x27\x11\x6c\x68\x67\x51\x67\x14\x05\x86\x8b\xf1\x4b\x72\xd4\xe2\x3e\xaa\x41\x64\x6e\x9e\x7c\x1d\x90\x8b\x02\x67\xd4\xe9\xcf\x9f\x6e\x6f\x1e\xef\x6f\xaf\xae\x2e\xee\x07\xad\x3d\x2c\xa3\xad\x8f\x28\x0d\x70\xd6\x50\xef\xb4\xf5\x0c\xce\xc6\x67\x93\x01\x5d\xe3\xe7\x6b\x5d\xaa\x5d\x52\xf6\x3b\x3c\xac\x22\x70\xdf\xa1\x9f\x33\x38\xda\x47\x67\x09\xf3\x5b\x25\x2b\x06\xde\x96\x34\x20\x91\x62\x49\x8a\x9c\xbb\xb3\x7a\x4a\x31\x2c\xc1\x69\x97\xe4\x63\x47\x00\xa6\xd1\x1f\x84\xc4\xcf\x77\xfb\x20\x74\x3b\xe1\x05\xca\xcf\x24\xb1\x7a\x20\xae\x55\x1e\xca\x7c\x3b\xf4\xb5\x18\xb2\x42\xe7\x6b\x9a\xe3\xf1\x80\xa6\xf1\x57\xbc\x5e\x1a\x1f\x88\x1f\xb6\x32\x48\xa9\xfe\x23\x33\x0f\xb0\x72\x32\xb4\x72\x75\x75\x45\x93\x46\x8a\x42\xc4\xd3\x09\x80\x9b\x92\xc1\xe9\x78\x5c\xc4\x53\x89\x0a\x6d\x2b\x06\x93\xe3\xb3\x6b\x11\xa1\xb0\xf4\x57\x49\x6e\xaf\xec\xc9\x1b\xa2\xdf\x9f\x44\x24\x3b\xe2\xa5\x15\xbe\xfa\xa4\x95\xa7\x6f\x51\xe7\xa3\x94\xfa\xf9\xce\x8a\xa5\x90\x34\xa3\x0b\xc7\x51\x62\x73\x41\x3f\xa1\x74\xb1\xa4\xeb\x4d\x43\x51\x4c\xb9\xd5\xd1\x4e\x15\xea\xee\xfc\xea\x6a\x08\xd3\xa3\xf5\xa5\xf9\xa1\xdc\xa9\x65\x50\xfe\xfd\xd9\xf3\x84\x42\x96\x96\x1e\xe7\x96\x5c\x18\x75\x18\xbc\x1b\xe6\xc5\xdb\xb9\xf3\xa6\xab\x6d\xa9\xce\xdd\x8d\x56\xf7\x5a\xfb\x68\xab\x68\xa7\xaa\x73\xce\x43\xe3\x69\x06\x9e\xb6\x6d\x6f\x51\x7a\xb2\x85\x50\x75\x98\x2e\x2d\x72\xba\xdb\x81\xcd\x04\x3a\xe7\xba\x77\x64\x0a\xb6\x94\xdd\xb8\xa5\x61\xa0\xbb\xb4\xba\x34\xbd\x60\xa6\xab\x09\xaa\x05\x1f\xab\x8b\xb4\xbd\x97\x0a\x34\xdd\xce\xb8\x24\x3b\xdd\xa2\x9b\x91\xef\xbd\x4b\xe1\xfa\x1b\xcf\x61\xb2\xe8\x8b\xae\x67\xea\xde\x56\x69\xf2\xed\x2d\x33\xe0\xcb\x49\x52\x87\x68\xa7\x79\x5c\x6b\x9b\xb7\x4e\xcc\x16\x67\x61\x40\x78\xdb\x5e\x49\xe8\xe8\xff\x67\xeb\x21\xa1\xa4\x65\x98\x7d\xf7\x9b\x16\xc1\xd9\x07\x15\x4b\xe1\x83\xa7\xd3\xcd\x58\xb8\x19\xc6\x37\x23\x7b\x98\x5c\x5c\x33\xe7\xbb\xd2\x84\x8a\xa6\xbc\x53\x46\xcd\x8c\x7f\xfb\xac\x6e\x56\x5f\x2f\x6f\x90\x3e\x08\x35\x93\xb4\x93\x7a\xd3\xfc\x1a\xf2\xeb\x52\x7a\x71\xa8\xec\x73\x29\xd7\xa4\xc1\xa5\x0b\xaa\x9e\xb5\xcd\x5b\xf8\xb1\xd1\x5f\x0a\xb5\x68\x8f\xf7\x7d\x1f\x94\x56\x36\x93\x9e\x63\x47\x47\xc3\x4f\xb8\x5c\x17\x28\xd4\x28\x0c\xea\xa2\x3b\xce\xa5\x40\x05\x0a\xc9\xa0\xd2\xa5\xfd\xb9\x7e\xce\xb8\x6e\xee\x93\x46\xdd\xf5\x9a\x01\x02\xf2\x5a\x84\xaf\xfb\x19\x83\xfa\x3f\x84\x11\x80\xb1\x7a\x29\xc2\x17\x6a\x87\xef\xae\xdd\x5b\x71\x6d\x41\x0c\xfa\x36\xa8\x96\xab\xbf\x5b\x9a\x2f\xcd\x7f\x03\x00\x00\xff\xff\x9e\xfb\x1b\xfa\x81\x11\x00\x00") func manifestsRegistryClusterserviceversionYamlBytes() ([]byte, error) { return bindataRead( @@ -117,12 +117,12 @@ func manifestsRegistryClusterserviceversionYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/registry.clusterserviceversion.yaml", size: 4485, mode: os.FileMode(420), modTime: time.Unix(1764220580, 0)} + info := bindataFileInfo{name: "manifests/registry.clusterserviceversion.yaml", size: 4481, mode: os.FileMode(420), modTime: time.Unix(1769170151, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifestsScriptConfigmapYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\xce\xbf\x6e\x83\x30\x10\xc7\xf1\xdd\x4f\xf1\x2b\x9d\x8d\xa1\x13\xf2\xd0\xa5\x73\xd7\xee\x57\x7c\xc4\x56\x82\xb1\xec\x0b\x24\x52\x1e\x3e\x12\xe4\xcf\xc4\x78\xf7\xf9\x4a\x77\x94\xc2\x1f\xe7\x12\xa6\x68\x31\xb7\xea\x18\xa2\xb3\xf8\x99\xe2\x10\x0e\xbf\x94\xd4\xc8\x42\x8e\x84\xac\x02\x22\x8d\x6c\xe1\x45\x92\xd3\xa5\xcf\x21\x89\x7a\xd2\xba\xac\x8b\xb7\xb8\x29\x00\xf8\xfc\x30\xff\x21\x9a\xe2\xd7\x89\x7b\x3f\xa1\x7a\x9c\x41\x5b\x7f\xd5\x4d\xf5\x06\xc9\x67\xc6\x37\xcc\x4c\xd9\x2c\xcb\x62\x8a\x50\x16\x76\xfb\x41\x66\x72\xd7\x7d\x3e\x85\x99\x37\xbd\x70\xbf\x7d\x06\x3d\x40\xfb\x57\x02\x9d\xd0\x35\x5d\xab\xee\x01\x00\x00\xff\xff\xa2\x23\x09\xd5\xfd\x00\x00\x00") +var _manifestsScriptConfigmapYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\xce\x31\x4e\xc4\x30\x10\x85\xe1\xde\xa7\x78\x2c\xb5\xe3\x0d\xd5\xca\x05\x0d\x35\x2d\xfd\x10\xcf\xe2\x51\xb0\x63\xd9\x43\x02\x12\x87\x47\x24\x90\xad\x52\xda\xdf\x2f\xcd\xa3\x22\x2f\x5c\x9b\x4c\xd9\x63\xee\xcd\x28\x39\x78\x3c\x4d\xf9\x2a\x6f\xcf\x54\x4c\x62\xa5\x40\x4a\xde\x00\x99\x12\x7b\x44\xd5\x12\x6c\x1b\xaa\x14\x35\xff\xb4\x7e\x76\x2d\x7a\x7c\x1b\x00\xb8\xbf\x73\xaf\x92\x5d\x8b\xeb\x8b\x87\x38\xe1\xf4\x77\x06\x7d\xf7\xd0\x9d\x4f\x2b\xa4\x31\x48\x85\x2d\x70\x9a\x8a\x5b\x96\xe5\x96\x6b\xfd\x60\x3c\xee\xe0\x9a\x52\x55\x0e\xc7\x41\x65\x0a\x5f\xc7\xfc\x2e\x33\x6f\xfa\xc9\xc3\xb6\x17\xf6\x0a\x1b\xf7\xe4\x77\xc7\xe5\x7c\xe9\xcd\x4f\x00\x00\x00\xff\xff\xbe\xde\x3b\xdc\x13\x01\x00\x00") func manifestsScriptConfigmapYamlBytes() ([]byte, error) { return bindataRead( @@ -137,7 +137,7 @@ func manifestsScriptConfigmapYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/script.configmap.yaml", size: 253, mode: os.FileMode(420), modTime: time.Unix(1764220580, 0)} + info := bindataFileInfo{name: "manifests/script.configmap.yaml", size: 275, mode: os.FileMode(420), modTime: time.Unix(1769170913, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -157,7 +157,7 @@ func metadataAnnotationsYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metadata/annotations.yaml", size: 732, mode: os.FileMode(420), modTime: time.Unix(1759972370, 0)} + info := bindataFileInfo{name: "metadata/annotations.yaml", size: 732, mode: os.FileMode(420), modTime: time.Unix(1756998653, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -177,7 +177,7 @@ func metadataPropertiesYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "metadata/properties.yaml", size: 73, mode: os.FileMode(420), modTime: time.Unix(1759972370, 0)} + info := bindataFileInfo{name: "metadata/properties.yaml", size: 73, mode: os.FileMode(420), modTime: time.Unix(1759823502, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -197,7 +197,7 @@ func testsScorecardConfigYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "tests/scorecard/config.yaml", size: 1614, mode: os.FileMode(420), modTime: time.Unix(1759972370, 0)} + info := bindataFileInfo{name: "tests/scorecard/config.yaml", size: 1614, mode: os.FileMode(420), modTime: time.Unix(1756998653, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/openshift/tests-extension/test/olmv1-incompatible.go b/openshift/tests-extension/test/olmv1-incompatible.go index d4ccb963c..7df63c4f9 100644 --- a/openshift/tests-extension/test/olmv1-incompatible.go +++ b/openshift/tests-extension/test/olmv1-incompatible.go @@ -10,7 +10,6 @@ import ( configv1 "github.com/openshift/api/config/v1" operatorv1 "github.com/openshift/api/operator/v1" - "github.com/openshift/origin/test/extended/util/image" "sigs.k8s.io/controller-runtime/pkg/client" catalogdata "github.com/openshift/operator-framework-operator-controller/openshift/tests-extension/pkg/bindata/catalog" @@ -30,7 +29,7 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM] OLMv1 operator installation // Using the shell image provided by origin as the controller image. // The image is mirrored into disconnected environments for testing. - "{{ TEST-CONTROLLER }}": image.ShellImage(), + "{{ TEST-CONTROLLER }}": "registry.k8s.io/e2e-test-images/busybox:1.36.1-1", } unique, nsName, ccName, opName = helpers.NewCatalogAndClusterBundles(ctx, replacements, catalogdata.AssetNames, catalogdata.Asset, diff --git a/openshift/tests-extension/testdata/operator/manifests/registry.clusterserviceversion.yaml b/openshift/tests-extension/testdata/operator/manifests/registry.clusterserviceversion.yaml index e6f9340cc..b1090e321 100644 --- a/openshift/tests-extension/testdata/operator/manifests/registry.clusterserviceversion.yaml +++ b/openshift/tests-extension/testdata/operator/manifests/registry.clusterserviceversion.yaml @@ -69,14 +69,14 @@ spec: readOnly: true livenessProbe: httpGet: - path: /healthz + path: /live port: 8081 initialDelaySeconds: 15 periodSeconds: 20 name: manager readinessProbe: httpGet: - path: /readyz + path: /ready port: 8081 initialDelaySeconds: 5 periodSeconds: 10 diff --git a/openshift/tests-extension/testdata/operator/manifests/script.configmap.yaml b/openshift/tests-extension/testdata/operator/manifests/script.configmap.yaml index 29ba9b0db..be9b3851c 100644 --- a/openshift/tests-extension/testdata/operator/manifests/script.configmap.yaml +++ b/openshift/tests-extension/testdata/operator/manifests/script.configmap.yaml @@ -6,7 +6,8 @@ data: httpd.sh: | #!/bin/sh echo "Version 1.2.0" - echo true > /var/www/started - echo true > /var/www/ready - echo true > /var/www/live - exec httpd -f -h /var/www -p 8081 + mkdir -p /tmp/www + echo true > /tmp/www/started + echo true > /tmp/www/ready + echo true > /tmp/www/live + exec httpd -f -h /tmp/www -p 8081