From bf4fdb4568708fc17eb604bb3b9ace0c2e60c8fe Mon Sep 17 00:00:00 2001 From: Nicola Ferraro Date: Sat, 22 Feb 2020 10:14:02 +0100 Subject: [PATCH] Fix #1233: fix dev mode test and rebase --- deploy/resources.go | 8 ++++---- e2e/dev_mode_test.go | 4 ++-- pkg/cmd/run.go | 2 +- pkg/install/operator.go | 10 +++++++--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/deploy/resources.go b/deploy/resources.go index 518327e0a6..77c65423ac 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -189,9 +189,9 @@ var assets = func() http.FileSystem { "/operator-role-kubernetes.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-role-kubernetes.yaml", modTime: time.Time{}, - uncompressedSize: 2260, + uncompressedSize: 2249, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\x41\x73\xdb\x36\x13\xbd\xe3\x57\xbc\x11\x2f\xc9\x37\x96\xfc\xa5\xa7\x8e\x7a\x52\x1d\xbb\xd5\x34\x23\xcd\x98\x4a\x33\x39\x2e\xc1\x15\x85\x1a\xc4\xa2\x00\x28\xd9\xfd\xf5\x1d\x40\x54\x22\x47\x49\xa7\x87\x4c\xcd\x8b\x16\xe0\xf2\xed\xdb\xf7\x56\x5b\x61\xfa\xfd\x1e\x55\xe1\x9d\xd1\xec\x22\xb7\x48\x82\xb4\x63\x2c\x3c\xe9\x1d\xa3\x96\x6d\x3a\x50\x60\xdc\xc9\xe0\x5a\x4a\x46\x1c\x5e\x2d\xea\xbb\xd7\x18\x5c\xcb\x01\xe2\x18\x12\xd0\x4b\x60\x55\x41\x8b\x4b\xc1\x34\x43\x92\x00\x7b\x04\x04\x75\x81\xb9\x67\x97\xe2\x0c\xa8\x99\x0b\xfa\x6a\xbd\x59\xde\xdc\x62\x6b\x2c\xa3\x35\xf1\xf8\x11\xb7\x38\x98\xb4\x53\x15\xd2\xce\x44\x1c\x24\x3c\x60\x2b\x01\xd4\xb6\x26\x17\x26\x0b\xe3\xb6\x12\xfa\x23\x8d\xc0\x1d\x85\xd6\xb8\x0e\x5a\xfc\x53\x30\xdd\x2e\x41\x0e\x8e\x43\xdc\x19\x3f\x53\x15\x36\xb9\x8d\xfa\xee\xc4\x24\x1e\x61\x4b\xcd\x24\xf8\x28\xc3\xd8\xc3\x59\xbb\xa3\x0a\x57\xf8\x9d\x43\xcc\x45\x7e\x98\xfd\x5f\x55\x78\x95\x53\x26\xe3\xcb\xc9\xeb\x9f\xf0\x24\x03\x7a\x7a\x82\x93\x84\x21\xf2\x19\x32\x3f\x6a\xf6\x09\xc6\x41\x4b\xef\xad\x21\xa7\xf9\x73\x5b\x9f\x2a\xcc\x50\x08\x64\x0c\x69\x12\x19\x07\x2a\x6d\x40\xb6\xe7\x69\xa0\xa4\x2a\x55\xa1\x3c\xbb\x94\xfc\xfc\xfa\xfa\x70\x38\xcc\xa8\xd0\x9d\x49\xe8\xae\x4f\xdd\x5d\xbf\x5b\xde\xdc\xae\xea\xdb\x69\xa1\xac\x2a\xbc\x77\x96\x63\x44\xe0\x3f\x07\x13\xb8\x45\xf3\x04\xf2\xde\x1a\x4d\x8d\x65\x58\x3a\x64\xe3\x8a\x3b\xc5\x74\xe3\x70\x08\x26\x19\xd7\x5d\x21\x8e\xae\xab\xea\x99\x3b\x9f\xe5\x3a\xd1\x33\xf1\x59\x82\x38\x90\xc3\x64\x51\x63\x59\x4f\xf0\xf3\xa2\x5e\xd6\x57\xaa\xc2\x87\xe5\xe6\xd7\xf5\xfb\x0d\x3e\x2c\xee\xef\x17\xab\xcd\xf2\xb6\xc6\xfa\x1e\x37\xeb\xd5\xdb\xe5\x66\xb9\x5e\xd5\x58\xdf\x61\xb1\xfa\x88\xdf\x96\xab\xb7\x57\x60\x93\x76\x1c\xc0\x8f\x3e\x64\xfe\x12\x60\xb2\x90\xdc\x66\x4f\x4f\x03\x74\x22\x90\xe7\x23\x9f\xa3\x67\x6d\xb6\x46\xc3\x92\xeb\x06\xea\x18\x9d\xec\x39\xb8\x3c\x1e\x9e\x43\x6f\x62\xb6\x33\x82\x5c\xab\x2a\x58\xd3\x9b\x54\xa6\x28\x5e\x36\x95\xcb\x7c\xcf\xff\x96\x7a\x30\xae\x9d\xe3\x5e\x2c\x2b\xf2\x66\x9c\xac\x39\x42\x43\x7a\x46\x43\xda\x49\x30\x7f\x15\x32\xb3\x87\x1f\xe3\xcc\xc8\xf5\xfe\x4d\xc3\x89\xde\xa8\x9e\x13\xb5\x94\x68\xae\x00\x47\x3d\xcf\xa1\xa9\x67\x3b\x7d\x98\x8a\xe7\x40\x49\x82\x02\x2c\x35\x6c\x63\x4e\x41\xf6\x77\x8e\xc9\x98\x34\x51\x61\xb0\x1c\xe7\x6a\x0a\xf2\xe6\x97\x20\x83\x2f\x69\xd3\x23\xca\xd9\x0c\x29\x20\x70\x94\x21\x68\x1e\x33\x26\xff\x9b\x28\x60\xcf\xa1\x39\xbb\xb8\xc0\x99\x4c\x2e\xbf\xf4\xd2\xc6\x12\x44\x0e\x7b\xa3\xf9\x78\x60\xd7\x7a\x31\x2e\x1d\x4f\x3e\x4b\x10\x13\xbb\xb4\x17\x3b\xf4\xac\x2d\x99\xfe\xf8\x4a\x8b\xdb\x9a\xae\x27\x7f\x02\xd1\x81\xd3\x33\x40\xd2\x5a\x86\x23\xd2\x19\x3f\x1d\x98\x12\x97\xb0\x65\xcb\xcf\x42\x2d\xd6\xb2\xce\x02\x97\xcb\x8e\x53\xf9\xb5\x26\x1e\x03\x4f\x49\xef\x4a\x34\xf8\xf6\x84\x72\x28\x97\x17\x2d\x7f\xd3\xb4\x4b\x25\x82\xd8\xb1\xfb\x1c\x35\xc6\xe5\x5d\xf5\x42\xb4\xbf\xe6\x14\xef\xf9\x9f\x64\xbc\xa8\xf7\x0d\x68\xf2\xc5\xab\x2f\xc0\x5b\xf6\x56\x9e\x7a\x3e\x59\x1e\xb8\x6c\x9e\xf8\xc9\xcc\x44\x89\xb7\x83\x1d\x2f\x5e\x40\x92\x66\xcc\xfd\x82\xb8\x0e\xe2\xfe\x90\xe6\x85\x48\x8d\x62\x52\x1a\x57\xea\x3d\xe7\xe5\x5a\xc0\xe3\x1c\x6e\xb0\xf6\x2b\x52\x13\xf7\xe2\x2e\x85\xfc\xb7\x06\xf2\x63\x62\x57\xb6\xe3\x25\xb6\x71\x5d\x5e\xc2\xfc\xdf\xc8\xf1\x77\x00\x00\x00\xff\xff\x62\x1c\x67\x57\xd4\x08\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\xc1\x6e\x1b\x37\x10\xbd\xf3\x2b\x1e\xb4\x97\xa4\xb0\xe4\xa6\xa7\x42\x3d\xa9\x8e\xdd\x0a\x0d\x24\xc0\xab\x34\xc8\x71\x96\x3b\x5a\xb1\xe6\x72\x58\x92\x2b\xd9\xfd\xfa\x82\xd4\x2a\x91\xa3\x04\xe8\x21\xa8\xf7\xa2\x21\x77\xf6\xcd\x9b\xf7\x46\x53\x61\xfa\xfd\x1e\x55\xe1\x9d\xd1\xec\x22\xb7\x48\x82\xb4\x63\x2c\x3c\xe9\x1d\xa3\x96\x6d\x3a\x50\x60\xdc\xc9\xe0\x5a\x4a\x46\x1c\x5e\x2d\xea\xbb\xd7\x18\x5c\xcb\x01\xe2\x18\x12\xd0\x4b\x60\x55\x41\x8b\x4b\xc1\x34\x43\x92\x00\x7b\x04\x04\x75\x81\xb9\x67\x97\xe2\x0c\xa8\x99\x0b\xfa\x6a\xbd\x59\xde\xdc\x62\x6b\x2c\xa3\x35\xf1\xf8\x11\xb7\x38\x98\xb4\x53\x15\xd2\xce\x44\x1c\x24\x3c\x60\x2b\x01\xd4\xb6\x26\x17\x26\x0b\xe3\xb6\x12\xfa\x23\x8d\xc0\x1d\x85\xd6\xb8\x0e\x5a\xfc\x53\x30\xdd\x2e\x41\x0e\x8e\x43\xdc\x19\x3f\x53\x15\x36\xb9\x8d\xfa\xee\xc4\x24\x1e\x61\x4b\xcd\x24\xf8\x28\xc3\xd8\xc3\x59\xbb\xa3\x0a\x57\xf8\x93\x43\xcc\x45\x7e\x9a\xfd\xa8\x2a\xbc\xca\x29\x93\xf1\xe5\xe4\xf5\x2f\x78\x92\x01\x3d\x3d\xc1\x49\xc2\x10\xf9\x0c\x99\x1f\x35\xfb\x04\xe3\xa0\xa5\xf7\xd6\x90\xd3\xfc\xb9\xad\x4f\x15\x66\x28\x04\x32\x86\x34\x89\x8c\x03\x95\x36\x20\xdb\xf3\x34\x50\x52\x95\xaa\x50\x9e\x5d\x4a\x7e\x7e\x7d\x7d\x38\x1c\x66\x54\xe8\xce\x24\x74\xd7\xa7\xee\xae\xdf\x2d\x6f\x6e\x57\xf5\xed\xb4\x50\x56\x15\xde\x3b\xcb\x31\x22\xf0\xdf\x83\x09\xdc\xa2\x79\x02\x79\x6f\x8d\xa6\xc6\x32\x2c\x1d\xb2\x71\xc5\x9d\x62\xba\x71\x38\x04\x93\x8c\xeb\xae\x10\x47\xd7\x55\xf5\xcc\x9d\xcf\x72\x9d\xe8\x99\xf8\x2c\x41\x1c\xc8\x61\xb2\xa8\xb1\xac\x27\xf8\x75\x51\x2f\xeb\x2b\x55\xe1\xc3\x72\xf3\xfb\xfa\xfd\x06\x1f\x16\xf7\xf7\x8b\xd5\x66\x79\x5b\x63\x7d\x8f\x9b\xf5\xea\xed\x72\xb3\x5c\xaf\x6a\xac\xef\xb0\x58\x7d\xc4\x1f\xcb\xd5\xdb\x2b\xb0\x49\x3b\x0e\xe0\x47\x1f\x32\x7f\x09\x30\x59\x48\x6e\xb3\xa7\xa7\x01\x3a\x11\xc8\xf3\x91\xcf\xd1\xb3\x36\x5b\xa3\x61\xc9\x75\x03\x75\x8c\x4e\xf6\x1c\x5c\x1e\x0f\xcf\xa1\x37\x31\xdb\x19\x41\xae\x55\x15\xac\xe9\x4d\x2a\x53\x14\x2f\x9b\xca\x65\xbe\xe7\x7f\x4b\x3d\x18\xd7\xce\x71\x2f\x96\x15\x79\x33\x4e\xd6\x1c\xa1\x21\x3d\xa3\x21\xed\x24\x98\x7f\x0a\x99\xd9\xc3\xcf\x71\x66\xe4\x7a\xff\xa6\xe1\x44\x6f\x54\xcf\x89\x5a\x4a\x34\x57\x80\xa3\x9e\xe7\xd0\xd4\xb3\x9d\x3e\x4c\xc5\x73\xa0\x24\x41\x01\x96\x1a\xb6\x31\xa7\x20\xfb\x3b\xc7\x64\x4c\x9a\xa8\x30\x58\x8e\x73\x35\x05\x79\xf3\x5b\x90\xc1\x97\xb4\xe9\x11\xe5\x6c\x86\x14\x10\x38\xca\x10\x34\x8f\x19\x93\x1f\x26\x0a\xd8\x73\x68\xce\x2e\x2e\x70\x26\x93\xcb\x2f\xbd\xb4\xb1\x04\x91\xc3\xde\x68\x3e\x1e\xd8\xb5\x5e\x8c\x4b\xc7\x93\xcf\x12\xc4\xc4\x2e\xed\xc5\x0e\x3d\x6b\x4b\xa6\x3f\xbe\xd2\xe2\xb6\xa6\xeb\xc9\x9f\x40\x74\xe0\xf4\x0c\x90\xb4\x96\xe1\x88\x74\xc6\x4f\x07\xa6\xc4\x25\x6c\xd9\xf2\xb3\x50\x8b\xb5\xac\xb3\xc0\xe5\xb2\xe3\x54\x7e\xad\x89\xc7\xc0\x53\xd2\xbb\x12\x0d\xbe\x3d\xa1\x1c\xca\xe5\x45\xcb\xdf\x34\xed\x52\x89\x20\x76\xec\x3e\x47\x8d\x71\x79\x57\xbd\x10\xed\xaf\x39\xc5\x7b\xbe\x90\xf1\xa2\xc8\x37\xf0\xc8\x17\x83\xbe\x40\x6c\xd9\x5b\x79\xea\xf9\xe4\x73\xe0\xb2\x6e\xe2\x27\x07\x13\x25\xde\x0e\x76\xbc\x78\x01\x1d\x9a\x31\xf7\x0b\xe2\x3a\x88\xfb\x4b\x9a\x17\x22\x35\x8a\x49\x69\xdc\xa3\xf7\x9c\x37\x6a\x01\x8f\x73\xb8\xc1\xda\xaf\x48\x4d\xdc\x8b\xbb\x14\xf2\xbf\x1a\xc8\x8f\x89\x5d\x59\x89\x97\xd8\xc6\x75\x79\xf3\xf2\xff\x23\xc7\xbf\x01\x00\x00\xff\xff\x25\x6a\xb3\x25\xc9\x08\x00\x00"), }, "/operator-role-olm.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-role-olm.yaml", @@ -203,9 +203,9 @@ var assets = func() http.FileSystem { "/operator-role-openshift.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-role-openshift.yaml", modTime: time.Time{}, - uncompressedSize: 3039, + uncompressedSize: 3028, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\xc1\x8e\xdb\x46\x0c\xbd\xeb\x2b\x08\xe9\x92\x14\x6b\xbb\xe9\xa9\x70\x4f\xee\x66\xb7\x35\x1a\xd8\xc0\xca\x69\x90\x23\x35\xa2\x25\x76\x47\xc3\xe9\xcc\xc8\x8a\xfb\xf5\x85\x46\x72\x62\xaf\x76\x9b\x06\x08\x60\x5f\x4c\x71\xa8\xc7\xc7\xf7\xa8\xc9\x60\xf6\xfd\x7e\x49\x06\xef\x58\x91\xf1\x54\x42\x10\x08\x35\xc1\xca\xa2\xaa\x09\x72\xd9\x87\x0e\x1d\xc1\xbd\xb4\xa6\xc4\xc0\x62\xe0\xd5\x2a\xbf\x7f\x0d\xad\x29\xc9\x81\x18\x02\x71\xd0\x88\xa3\x24\x03\x25\x26\x38\x2e\xda\x20\x0e\xf4\x00\x08\x58\x39\xa2\x86\x4c\xf0\x73\x80\x9c\x28\xa2\x6f\xb6\xbb\xf5\xed\x1d\xec\x59\x13\x94\xec\x87\x97\xa8\x84\x8e\x43\x9d\x64\x10\x6a\xf6\xd0\x89\x7b\x84\xbd\x38\xc0\xb2\xe4\xbe\x31\x6a\x60\xb3\x17\xd7\x0c\x34\x1c\x55\xe8\x4a\x36\x15\x28\xb1\x47\xc7\x55\x1d\x40\x3a\x43\xce\xd7\x6c\xe7\x49\x06\xbb\x7e\x8c\xfc\xfe\xc4\xc4\x0f\xb0\xb1\x67\x10\xf8\x28\xed\x38\xc3\xd9\xb8\xa3\x0a\x37\xf0\x27\x39\xdf\x37\xf9\x69\xfe\x63\x92\xc1\xab\xbe\x24\x1d\x0f\xd3\xd7\xbf\xc0\x51\x5a\x68\xf0\x08\x46\x02\xb4\x9e\xce\x90\xe9\x93\x22\x1b\x80\x0d\x28\x69\xac\x66\x34\x8a\xbe\x8c\xf5\xb9\xc3\x1c\x22\x81\x1e\x43\x8a\x80\x6c\x00\xe3\x18\x20\xfb\xf3\x32\xc0\x90\x64\x49\x06\xf1\x57\x87\x60\x97\x8b\x45\xd7\x75\x73\x8c\x74\xe7\xe2\xaa\xc5\x69\xba\xc5\xbb\xf5\xed\xdd\x26\xbf\x9b\x45\xca\x49\x06\xef\x8d\x26\xef\xc1\xd1\xdf\x2d\x3b\x2a\xa1\x38\x02\x5a\xab\x59\x61\xa1\x09\x34\x76\xbd\x71\xd1\x9d\x68\x3a\x1b\xe8\x1c\x07\x36\xd5\x0d\xf8\xd1\xf5\x24\xbb\x70\xe7\x8b\x5c\x27\x7a\xec\x2f\x0a\xc4\x00\x1a\x48\x57\x39\xac\xf3\x14\x7e\x5d\xe5\xeb\xfc\x26\xc9\xe0\xc3\x7a\xf7\xfb\xf6\xfd\x0e\x3e\xac\x1e\x1e\x56\x9b\xdd\xfa\x2e\x87\xed\x03\xdc\x6e\x37\x6f\xd7\xbb\xf5\x76\x93\xc3\xf6\x1e\x56\x9b\x8f\xf0\xc7\x7a\xf3\xf6\x06\x88\x43\x4d\x0e\xe8\x93\x75\x3d\x7f\x71\xc0\xbd\x90\x54\xf6\x9e\x9e\x16\xe8\x44\xa0\xdf\x8f\xfe\xd9\x5b\x52\xbc\x67\x05\x1a\x4d\xd5\x62\x45\x50\xc9\x81\x9c\xe9\xd7\xc3\x92\x6b\xd8\xf7\x76\x7a\x40\x53\x26\x19\x68\x6e\x38\xc4\x2d\xf2\xd3\xa1\xfa\x36\xdf\xf3\xdb\x4a\x1e\xd9\x94\x4b\x78\x10\x4d\x09\x5a\x1e\x37\x6b\x09\xae\x40\x35\xc7\x36\xd4\xe2\xf8\x9f\x48\x66\xfe\xf8\xb3\x9f\xb3\x2c\x0e\x6f\x0a\x0a\xf8\x26\x69\x28\x60\x89\x01\x97\x09\x80\xc1\x86\x96\xa0\xb0\x21\x3d\x7b\x9c\x89\x25\x87\x41\x5c\x02\xa0\xb1\x20\xed\xfb\x12\xe8\xfd\x5d\x42\x3a\x16\xa5\x89\x6b\x35\xf9\x65\x32\x03\xb4\xfc\x9b\x93\xd6\xc6\xb2\xd9\x80\x72\xb6\x43\x09\x80\x23\x2f\xad\x53\x34\x56\xa4\x3f\xa4\x09\xc0\x81\x5c\x71\x96\x98\xe0\xa4\xe9\xf4\x4d\x2b\xa5\x8f\x81\x27\x77\x60\x45\xc3\x03\x99\xd2\x0a\x9b\x30\x3c\xd9\x5e\x02\x1f\xc8\x84\x83\xe8\xb6\x21\xa5\x91\x9b\xe1\x48\x89\xd9\x73\xd5\xa0\x3d\x81\x28\x47\xe1\x02\x10\x95\x92\x76\x40\x3a\xe3\xa7\x1c\x61\xa0\x18\x96\xa4\xe9\x22\x54\xa2\x35\xa9\x5e\xe0\x98\xac\x28\xc4\x7f\xcd\x7e\x08\x2c\x06\x55\xc7\xa8\xb5\xe5\x09\xa5\x8b\xc9\xc9\xc8\x2f\x9a\x36\x55\xc2\x89\x1e\xa7\xef\xa3\x82\x4d\x7f\x57\x5d\x89\xf6\x73\x4e\xd1\x81\xfe\x4b\xc6\x49\xbf\x17\xa0\xd1\x46\xaf\x9e\x80\x97\x64\xb5\x1c\x1b\x3a\x59\xee\x28\xde\x3c\xfe\xb3\x99\x01\x03\xed\x5b\x3d\x26\xae\x20\x49\x31\xd6\x3e\x21\xae\x9c\x98\xbf\xa4\xb8\x12\xa9\x51\x4c\x0c\xe3\x95\xfa\x40\xfd\xe5\x1a\xc1\xfd\x12\x4c\xab\xf5\x33\x52\x23\x35\x62\xa6\x42\xfe\x5f\x03\xe3\x6e\xcc\x20\x2d\x5a\xd6\xe5\x5c\x2c\x19\x5f\xf3\x3e\xcc\x59\x9e\x59\x9a\x58\x34\x7c\xa4\x7e\x92\x58\x74\x54\xd4\x22\x8f\x67\x27\xd7\xdc\xf7\x19\xa4\xdc\x60\x45\x5f\x9b\x29\x16\xf9\xe0\x08\x9b\x21\x7c\x9a\x6d\xd0\xda\xf1\xdb\xbd\xc8\x4f\x13\x8b\xf3\x0b\xeb\xec\x20\xe0\x55\xbf\xfc\xd1\x8c\x0b\x21\xbe\x75\xcd\x2e\x8c\x66\xe3\x03\x9a\xc0\xa7\xe6\x2f\x1d\x16\x6c\xd0\x1d\xcf\xd6\x61\xa1\xb4\x18\x7a\x56\x8a\x17\x4d\x74\xd2\x86\xaf\x9a\x18\x8b\xae\xab\xf1\x94\xe7\x4b\x34\x17\xaa\xf5\x41\x9a\x59\x2d\xb1\xdb\x94\x72\xf2\x6f\x00\x00\x00\xff\xff\x78\xfc\x0e\xb9\xdf\x0b\x00\x00"), + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\xc1\x8e\xdb\x46\x0c\xbd\xeb\x2b\x08\xe9\x92\x14\x6b\xb9\xe9\xa9\x70\x4f\x6e\xb2\xdb\x1a\x0d\xbc\xc0\xca\x69\x90\x23\x35\xa2\x25\x76\x47\xc3\xe9\xcc\xc8\x8a\xfb\xf5\x85\x46\x72\x62\xaf\x76\x91\x16\x08\x60\x5f\x4c\x71\xa8\xc7\xc7\xf7\xa8\xc9\x60\xf1\xfd\x7e\x49\x06\xef\x59\x91\xf1\x54\x41\x10\x08\x0d\xc1\xda\xa2\x6a\x08\x0a\xd9\x87\x1e\x1d\xc1\x9d\x74\xa6\xc2\xc0\x62\xe0\xd5\xba\xb8\x7b\x0d\x9d\xa9\xc8\x81\x18\x02\x71\xd0\x8a\xa3\x24\x03\x25\x26\x38\x2e\xbb\x20\x0e\xf4\x08\x08\x58\x3b\xa2\x96\x4c\xf0\x39\x40\x41\x14\xd1\xb7\xf7\xbb\xcd\xdb\x5b\xd8\xb3\x26\xa8\xd8\x8f\x2f\x51\x05\x3d\x87\x26\xc9\x20\x34\xec\xa1\x17\xf7\x08\x7b\x71\x80\x55\xc5\x43\x63\xd4\xc0\x66\x2f\xae\x1d\x69\x38\xaa\xd1\x55\x6c\x6a\x50\x62\x8f\x8e\xeb\x26\x80\xf4\x86\x9c\x6f\xd8\xe6\x49\x06\xbb\x61\x8c\xe2\xee\xc4\xc4\x8f\xb0\xb1\x67\x10\xf8\x24\xdd\x34\xc3\xd9\xb8\x93\x0a\x37\xf0\x27\x39\x3f\x34\xf9\x29\xff\x31\xc9\xe0\xd5\x50\x92\x4e\x87\xe9\xeb\x5f\xe0\x28\x1d\xb4\x78\x04\x23\x01\x3a\x4f\x67\xc8\xf4\x59\x91\x0d\xc0\x06\x94\xb4\x56\x33\x1a\x45\x5f\xc7\xfa\xd2\x21\x87\x48\x60\xc0\x90\x32\x20\x1b\xc0\x38\x06\xc8\xfe\xbc\x0c\x30\x24\x59\x92\x41\xfc\x35\x21\xd8\xd5\x72\xd9\xf7\x7d\x8e\x91\x6e\x2e\xae\x5e\x9e\xa6\x5b\xbe\xdf\xbc\xbd\xdd\x16\xb7\x8b\x48\x39\xc9\xe0\x83\xd1\xe4\x3d\x38\xfa\xbb\x63\x47\x15\x94\x47\x40\x6b\x35\x2b\x2c\x35\x81\xc6\x7e\x30\x2e\xba\x13\x4d\x67\x03\xbd\xe3\xc0\xa6\xbe\x01\x3f\xb9\x9e\x64\x17\xee\x7c\x95\xeb\x44\x8f\xfd\x45\x81\x18\x40\x03\xe9\xba\x80\x4d\x91\xc2\xaf\xeb\x62\x53\xdc\x24\x19\x7c\xdc\xec\x7e\xbf\xff\xb0\x83\x8f\xeb\x87\x87\xf5\x76\xb7\xb9\x2d\xe0\xfe\x01\xde\xde\x6f\xdf\x6d\x76\x9b\xfb\x6d\x01\xf7\x77\xb0\xde\x7e\x82\x3f\x36\xdb\x77\x37\x40\x1c\x1a\x72\x40\x9f\xad\x1b\xf8\x8b\x03\x1e\x84\xa4\x6a\xf0\xf4\xb4\x40\x27\x02\xc3\x7e\x0c\xcf\xde\x92\xe2\x3d\x2b\xd0\x68\xea\x0e\x6b\x82\x5a\x0e\xe4\xcc\xb0\x1e\x96\x5c\xcb\x7e\xb0\xd3\x03\x9a\x2a\xc9\x40\x73\xcb\x21\x6e\x91\x9f\x0f\x35\xb4\xf9\x9e\xdf\x56\xf2\xc8\xa6\x5a\xc1\x83\x68\x4a\xd0\xf2\xb4\x59\x2b\x70\x25\xaa\x1c\xbb\xd0\x88\xe3\x7f\x22\x99\xfc\xf1\x67\x9f\xb3\x2c\x0f\x6f\x4a\x0a\xf8\x26\x69\x29\x60\x85\x01\x57\x09\x80\xc1\x96\x56\xa0\xb0\x25\xbd\x78\x5c\x88\x25\x87\x41\x5c\x02\xa0\xb1\x24\xed\x87\x12\x18\xfc\x5d\x41\x3a\x15\xa5\x89\xeb\x34\xf9\x55\xb2\x00\xb4\xfc\x9b\x93\xce\xc6\xb2\xc5\x88\x72\xb6\x43\x09\x80\x23\x2f\x9d\x53\x34\x55\xa4\x3f\xa4\x09\xc0\x81\x5c\x79\x96\x98\xe1\xa4\xe9\xfc\x4d\x2b\x95\x8f\x81\x27\x77\x60\x45\xe3\x03\x99\xca\x0a\x9b\x30\x3e\xd9\x41\x02\x1f\xc8\x84\x83\xe8\xae\x25\xa5\x91\xdb\xf1\x48\x89\xd9\x73\xdd\xa2\x3d\x81\x28\x47\xe1\x02\x10\x95\x92\x6e\x44\x3a\xe3\xa7\x1c\x61\xa0\x18\x56\xa4\xe9\x22\x54\xa2\x35\xa9\x41\xe0\x98\xac\x29\xc4\x7f\xcd\x7e\x0c\x2c\x06\xd5\xc4\xa8\xb3\xd5\x09\xa5\x8f\xc9\xd9\xc8\x2f\x9a\x36\x57\xc2\x89\x9e\xa6\x1f\xa2\x92\xcd\x70\x57\x5d\x89\xf6\x73\x4e\xd1\x81\x66\x32\xce\x9a\xbc\x80\x87\x36\x1a\xf4\x04\xb1\x22\xab\xe5\xd8\xd2\xc9\x67\x47\xf1\xba\xf1\x5f\x1c\x0c\x18\x68\xdf\xe9\x29\x71\x05\x1d\xca\xa9\xf6\x09\x71\xe5\xc4\xfc\x25\xe5\x95\x48\x4d\x62\x62\x98\xee\xd1\x07\x1a\x6e\xd4\x08\xee\x57\x60\x3a\xad\x9f\x91\x1a\xa9\x15\x33\x17\xf2\xbf\x1a\x18\x17\x62\x01\x69\xd9\xb1\xae\x72\xb1\x64\x7c\xc3\xfb\x90\xb3\x3c\xb3\x29\xb1\x68\xfc\x32\xfd\x2c\xb1\xec\xa9\x6c\x44\x1e\xcf\x4e\xae\xb9\xe4\x0b\x48\xb9\xc5\x9a\xbe\x35\x53\x2c\xf2\xc1\x11\xb6\x63\xf8\x34\xdb\xa2\xb5\xd3\x07\x7b\x91\x9f\x27\x96\xe7\xb7\xd4\xd9\x41\xc0\xab\x7e\xee\x93\x19\x17\x42\xfc\xdf\x35\xbb\x30\x9a\x8d\x0f\x68\x02\x9f\x9a\xbf\x74\x58\xb2\x41\x77\x3c\x5b\x87\xa5\xd2\x62\xe8\x59\x29\x5e\x34\xd1\x49\x17\xbe\x69\x62\x2c\xba\xae\xc6\x73\x9e\x2f\xd1\x5c\xaa\xce\x07\x69\x17\x8d\xc4\x6e\x73\xca\xc9\xbf\x01\x00\x00\xff\xff\x92\xd1\xad\xee\xd4\x0b\x00\x00"), }, "/operator-service-account.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-service-account.yaml", diff --git a/e2e/dev_mode_test.go b/e2e/dev_mode_test.go index a028917006..2b42ea7c37 100644 --- a/e2e/dev_mode_test.go +++ b/e2e/dev_mode_test.go @@ -48,11 +48,11 @@ func TestRunDevMode(t *testing.T) { kamelRun := kamelWithContext(ctx, "run", "-n", ns, file, "--dev") kamelRun.SetOut(pipew) - logScanner := util.NewLogScanner(ctx, piper, "Integration yaml in phase Running", "Magicstring!", "Magicjordan!") + logScanner := util.NewLogScanner(ctx, piper, `integration "yaml" in phase Running`, "Magicstring!", "Magicjordan!") go kamelRun.Execute() - Eventually(logScanner.IsFound("Integration yaml in phase Running"), 5*time.Minute).Should(BeTrue()) + Eventually(logScanner.IsFound(`integration "yaml" in phase Running`), 5*time.Minute).Should(BeTrue()) Eventually(logScanner.IsFound("Magicstring!"), 3*time.Minute).Should(BeTrue()) Expect(logScanner.IsFound("Magicjordan!")()).To(BeFalse()) diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go index 35e43e00a1..3755b6c29a 100644 --- a/pkg/cmd/run.go +++ b/pkg/cmd/run.go @@ -305,7 +305,7 @@ func (o *runCmdOptions) waitForIntegrationReady(cmd *cobra.Command, integration // if i.Status.Phase != "" { // TODO remove this log when we make sure that events are always created - fmt.Printf("progress: integration %q in phase %s\n", integration.Name, string(i.Status.Phase)) + fmt.Fprintf(cmd.OutOrStdout(), "Progress: integration %q in phase %s\n", integration.Name, string(i.Status.Phase)) } if i.Status.Phase == v1.IntegrationPhaseRunning || i.Status.Phase == v1.IntegrationPhaseError { return false diff --git a/pkg/install/operator.go b/pkg/install/operator.go index 28a2a580f5..9d3d3f4bdd 100644 --- a/pkg/install/operator.go +++ b/pkg/install/operator.go @@ -25,6 +25,7 @@ import ( appsv1 "k8s.io/api/apps/v1" "k8s.io/api/rbac/v1beta1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -126,7 +127,10 @@ func OperatorOrCollect(ctx context.Context, c client.Client, cfg OperatorConfigu return installKnative(ctx, c, cfg.Namespace, customizer, collection, force) } - if errevt := installEvents(ctx, c, cfg.Namespace, customizer, collection); errevt != nil { + if errevt := installEvents(ctx, c, cfg.Namespace, customizer, collection, force); errevt != nil { + if k8serrors.IsAlreadyExists(err) { + return err + } fmt.Println("Warning: the operator will not be able to publish Kubernetes events. Try installing as cluster-admin to allow it to generate events.") } @@ -158,8 +162,8 @@ func installKnative(ctx context.Context, c client.Client, namespace string, cust ) } -func installEvents(ctx context.Context, c client.Client, namespace string, customizer ResourceCustomizer, collection *kubernetes.Collection) error { - return ResourcesOrCollect(ctx, c, namespace, collection, customizer, +func installEvents(ctx context.Context, c client.Client, namespace string, customizer ResourceCustomizer, collection *kubernetes.Collection, force bool) error { + return ResourcesOrCollect(ctx, c, namespace, collection, force, customizer, "operator-role-events.yaml", "operator-role-binding-events.yaml", )