From 349130aeaab9adcd8108fbfb3aacdc5e9fe21387 Mon Sep 17 00:00:00 2001 From: Nick Hale Date: Wed, 22 Jul 2020 23:42:02 -0400 Subject: [PATCH] feat(operators): move type to v1 from v2alpha1 Move the Operator type from v2alpha1 to v1 before it's enabled by default in OLM. --- crds/operators.coreos.com_operators.yaml | 2 +- crds/zz_defs.go | 14 +- pkg/operators/install/install.go | 16 +- pkg/operators/v1/doc.go | 6 - .../{v2alpha1 => v1}/groupversion_info.go | 20 +- .../{v2alpha1 => v1}/operator_types.go | 17 +- pkg/operators/v1/operatorgroup_types.go | 4 + pkg/operators/v1/register.go | 49 ----- pkg/operators/v1/zz_generated.conversion.go | 185 ---------------- pkg/operators/v1/zz_generated.deepcopy.go | 173 ++++++++++++++- .../v2alpha1/zz_generated.deepcopy.go | 197 ------------------ 11 files changed, 195 insertions(+), 488 deletions(-) delete mode 100644 pkg/operators/v1/doc.go rename pkg/operators/{v2alpha1 => v1}/groupversion_info.go (50%) rename pkg/operators/{v2alpha1 => v1}/operator_types.go (83%) delete mode 100644 pkg/operators/v1/register.go delete mode 100644 pkg/operators/v1/zz_generated.conversion.go delete mode 100644 pkg/operators/v2alpha1/zz_generated.deepcopy.go diff --git a/crds/operators.coreos.com_operators.yaml b/crds/operators.coreos.com_operators.yaml index 6623061ee..05aa509b1 100644 --- a/crds/operators.coreos.com_operators.yaml +++ b/crds/operators.coreos.com_operators.yaml @@ -16,7 +16,7 @@ spec: singular: operator scope: Cluster versions: - - name: v2alpha1 + - name: v1 schema: openAPIV3Schema: description: Operator represents a cluster operator. diff --git a/crds/zz_defs.go b/crds/zz_defs.go index a0ac22de3..bc0da92d1 100644 --- a/crds/zz_defs.go +++ b/crds/zz_defs.go @@ -98,7 +98,7 @@ func operatorsCoreosCom_catalogsourcesYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operators.coreos.com_catalogsources.yaml", size: 7987, mode: os.FileMode(420), modTime: time.Unix(1595866185, 0)} + info := bindataFileInfo{name: "operators.coreos.com_catalogsources.yaml", size: 7987, mode: os.FileMode(420), modTime: time.Unix(1595947014, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -118,7 +118,7 @@ func operatorsCoreosCom_clusterserviceversionsYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operators.coreos.com_clusterserviceversions.yaml", size: 666332, mode: os.FileMode(420), modTime: time.Unix(1595866185, 0)} + info := bindataFileInfo{name: "operators.coreos.com_clusterserviceversions.yaml", size: 666332, mode: os.FileMode(420), modTime: time.Unix(1595947015, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -138,7 +138,7 @@ func operatorsCoreosCom_installplansYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operators.coreos.com_installplans.yaml", size: 13953, mode: os.FileMode(420), modTime: time.Unix(1595866186, 0)} + info := bindataFileInfo{name: "operators.coreos.com_installplans.yaml", size: 13953, mode: os.FileMode(420), modTime: time.Unix(1595947016, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -158,12 +158,12 @@ func operatorsCoreosCom_operatorgroupsYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operators.coreos.com_operatorgroups.yaml", size: 15412, mode: os.FileMode(420), modTime: time.Unix(1595866186, 0)} + info := bindataFileInfo{name: "operators.coreos.com_operatorgroups.yaml", size: 15412, mode: os.FileMode(420), modTime: time.Unix(1595947016, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _operatorsCoreosCom_operatorsYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x5a\x4b\x93\xdb\x36\x12\xbe\xcf\xaf\xe8\x52\x0e\x93\x54\xe9\x91\x38\x97\x2d\xdd\xa6\xc6\xc9\x96\x76\xb3\x63\x97\x67\xec\x4b\x2a\x87\x16\xd9\x12\xb1\x02\x01\x06\x0d\x4a\xa3\x75\xf9\xbf\x6f\x35\x40\x52\xd4\x8b\xe4\xac\xc7\x59\x5c\x3c\x02\x81\x46\x7f\xfd\x6e\xc0\x58\xa8\x4f\xe4\x58\x59\x33\x07\x2c\x14\x3d\x7b\x32\xf2\x8b\xa7\x9b\xbf\xf1\x54\xd9\xd9\xf6\xa7\x9b\x8d\x32\xe9\x1c\xee\x4b\xf6\x36\xff\x40\x6c\x4b\x97\xd0\x5b\x5a\x29\xa3\xbc\xb2\xe6\x26\x27\x8f\x29\x7a\x9c\xdf\x00\xa0\x31\xd6\xa3\x4c\xb3\xfc\x04\x48\xac\xf1\xce\x6a\x4d\x6e\xb2\x26\x33\xdd\x94\x4b\x5a\x96\x4a\xa7\xe4\x02\xf1\xfa\xe8\xed\x8f\xd3\x9f\xa7\x3f\xde\x00\x24\x8e\xc2\xf6\x27\x95\x13\x7b\xcc\x8b\x39\x98\x52\xeb\x1b\x00\x83\x39\xcd\xc1\x16\xe4\xd0\x5b\xc7\xd3\xc3\x5f\x89\x75\x64\xe5\x9f\xfc\x86\x0b\x4a\xe4\xe0\xb5\xb3\x65\xd1\x5e\xdd\x5a\x13\x49\xd5\xfc\xa1\xa7\xb5\x75\xaa\xfe\x3d\x01\xab\xf3\xf0\x57\x44\xfd\xae\xa2\x10\xa6\xb4\x62\xff\xcf\xa3\xe9\xdf\x14\xfb\xf0\xa9\xd0\xa5\x43\xdd\x3a\x31\xcc\xb2\x32\xeb\x52\xa3\x3b\xcc\xdf\x00\x70\x62\x0b\x9a\xc3\xbd\x2e\xd9\x93\x4c\x54\x52\x08\x1c\x4c\x2a\x9c\xdb\x37\xa8\x8b\x0c\x7f\x8a\x64\x92\x8c\x72\x8c\x0c\x82\x90\x32\x77\xef\x17\x9f\x7e\x7e\x3c\x9a\x06\x48\x89\x13\xa7\x0a\x1f\x24\x5a\x73\x08\x8e\x0a\x47\x4c\xc6\x33\x20\x24\xf1\xd0\x86\x9d\x69\xb3\xd9\xef\x85\x29\xbb\xfc\x37\x25\xbe\x99\x2c\x9c\x2c\xf4\x8d\x74\xe2\x68\xd9\x4c\x6b\xf6\xe4\xfc\x5b\x61\x31\xae\x82\x54\x8c\x85\x18\x7c\x46\x35\x58\x4a\x2b\x54\x60\x57\xe0\x33\xc5\x07\x3e\x83\xfe\x8f\x08\x83\x2c\x42\x53\x71\x37\x85\x47\x72\x42\x06\x38\xb3\xa5\x4e\xc5\xc6\xb6\xe4\x3c\x38\x4a\xec\xda\xa8\xff\x34\xb4\x19\xbc\x0d\x87\x6a\xf4\xc4\xfe\x84\xa6\x32\x9e\x9c\x41\x0d\x5b\xd4\x25\x8d\x01\x4d\x0a\x39\xee\xc1\x91\x9c\x02\xa5\x69\xd1\x0b\x4b\x78\x0a\xff\xb2\x8e\x40\x99\x95\x9d\x43\xe6\x7d\xc1\xf3\xd9\x6c\xad\x7c\xed\x2b\x89\xcd\xf3\xd2\x28\xbf\x9f\x05\xb3\x57\xcb\x52\x2c\x61\x96\xd2\x96\xf4\x8c\xd5\x7a\x82\x2e\xc9\x94\xa7\xc4\x97\x8e\x66\x58\xa8\x49\x60\xdd\x04\x7f\x99\xe6\xe9\x77\xae\xf2\x2e\xbe\x3d\xe2\x35\xea\x86\xbd\x53\x66\xdd\xfa\x10\x2c\xb4\x43\x03\x62\xaa\xa0\x44\xed\x71\x6b\x44\x71\x10\xb4\x4c\x89\x74\x3e\xfc\xf2\xf8\x04\xf5\xd1\x41\x19\xa7\xd2\x0f\x72\x6f\x59\xd2\x41\x05\x22\x30\x65\x56\xe4\xa2\x12\x57\xce\xe6\x81\x26\x99\xb4\xb0\xca\xf8\xf0\x23\xd1\x8a\xcc\xa9\xf8\xb9\x5c\xe6\xca\x8b\xde\xff\x2c\x89\xbd\xe8\x6a\x0a\xf7\x21\x80\xc0\x92\xa0\x2c\x52\xf4\x94\x4e\x61\x61\xe0\x1e\x73\xd2\xf7\xc8\xf4\xcd\x15\x20\x92\xe6\x89\x08\x76\x98\x0a\xda\xb1\xef\x74\xf1\x89\x2f\x01\xd4\xc1\xe9\x8a\xbe\x6a\x8f\x7d\x2c\x28\x39\x72\x99\x94\x58\x39\x31\x6a\x8f\x9e\xc4\x15\x8e\x82\x52\xdf\xa1\x1e\x7d\xc9\x43\x8e\x0d\x0b\xab\x6f\xcb\xea\x68\xbb\x64\x51\x74\xeb\x6c\x71\xc3\x4b\xc7\x43\xf0\x1f\x51\x68\x62\xf3\xc2\x9a\x60\x26\x43\x18\xbc\x16\x65\x20\x64\x8f\x9a\xd4\xe9\x97\x13\x10\xf7\xcd\xc2\x16\x80\xc6\x9b\xc0\x67\xe8\x23\x31\xa6\x88\xeb\x2c\xfe\xf5\x72\x29\x43\x6c\x55\x54\x71\xce\xcd\x04\x34\x2e\x49\x3f\x92\xa6\xe4\x5c\x34\x5d\x18\x65\x1c\xed\xbd\xb4\xe0\x04\xee\x6f\xed\xf5\xd1\xc5\x03\x09\xf8\xb3\x24\xb7\x07\xbb\x25\x27\x5e\x4f\x5e\x34\xd6\x88\xe1\x22\x5d\x80\x92\x29\x95\x40\xc9\x81\xde\x91\x78\x6e\xdb\xda\xbc\xb8\xbd\x53\x5c\xfd\xc0\x65\xe4\xe8\x93\xec\x97\x67\x89\x2d\x7c\x28\x1c\x7a\x65\x70\xba\xad\x12\x83\xe2\x00\x3a\x8a\x83\xaf\xa9\xe3\x30\x2a\x95\xe6\x31\xac\x3d\x65\x74\x34\x03\xe8\x08\xee\x1e\xde\x52\x7a\x6e\x29\xc7\x22\x40\xe7\x70\x7f\x75\x8d\xf2\x94\x77\x00\x3b\x81\x76\x77\xc2\x7e\x9b\xa5\x2a\xa0\xf7\x03\x83\xda\xea\x8d\x47\x65\xb8\x4a\x61\x63\x40\xd8\xd0\x3e\x66\xbb\x96\x2f\xc7\xc5\x8e\x42\xa6\xec\xa1\x4a\x42\x21\x10\xa8\xd2\x62\xc7\xfa\x5e\xfb\x88\xe3\xba\x63\x1d\xc6\x44\x8e\xed\xfc\x7e\x25\x30\xb5\x47\xbf\x39\xc6\xb1\xa1\x7d\xf7\x82\x13\x95\x89\x44\x14\x57\xc5\x86\xe8\x4e\x26\x82\x4c\x65\x6a\x90\xba\x20\x94\x56\x85\x56\x14\x72\x61\xcf\xda\x2b\x09\xe9\x7c\xd4\x42\x79\x11\x1c\x7b\xb1\x7a\xdc\xd0\xfe\x96\xa3\x91\x88\xc7\x65\xaa\xe8\x05\xe4\xed\x21\x10\xd5\x45\xd4\x27\xd4\x2a\x3d\x54\xca\xc1\xc7\x16\x66\x0c\x0f\xd6\x2f\xcc\xb8\x97\xe4\x2f\xcf\x4a\xca\x05\xb1\xbf\xb7\x96\xf8\xc1\xfa\x30\xf3\x6a\x02\x8b\x6c\xbe\x48\x5c\x71\x4b\x70\x4d\x13\x23\x81\xe0\x6d\x57\x5d\x3c\x85\xc5\xaa\x5f\x5a\xad\xd8\x2b\xd4\x16\x06\xac\xab\xe4\x12\xab\xe7\x78\x50\x3c\x22\x2f\xcf\x6a\xda\xf3\xb1\x24\x30\xd6\x4c\x28\x2f\xfc\x5e\x78\x38\x3b\xa3\x12\xa7\x75\x47\xd2\xec\x57\xc3\x45\x76\xe4\xb8\xea\xa8\x27\xa9\x07\xe3\x97\x58\xdd\x6b\x4c\x28\xed\x25\x9b\x96\x41\x68\xa1\x66\x95\xde\x4c\x25\x90\x93\x5b\x13\x14\x12\xef\x87\x29\xb9\x3b\x16\xc7\xd1\x1b\x91\xdb\x04\x3b\xad\x26\x24\xa2\x90\x91\x5f\x94\xba\xe2\x8e\x18\xce\x73\x2c\xc4\x60\x3e\x4b\x64\x0e\x32\xfd\x02\x05\x2a\xc7\x53\xb8\xeb\xe0\x50\xba\x4b\x4d\x47\xbb\x94\x09\x7a\x69\x1f\x20\xb4\x15\x83\x04\xd8\x2d\xea\xf3\x3a\xfc\x08\xad\x15\x03\x26\x1d\x33\x8d\x5d\x9d\x25\xd9\x31\xec\x32\xa9\xa1\x24\xba\xad\x14\xe9\xd0\x5f\x8c\x36\xb4\x1f\x75\x19\xcc\xa9\xc9\x8d\x16\x66\x14\x33\xd0\x99\x11\x35\xe9\xca\x1a\xdd\xa5\xc2\x51\xd8\x35\xfa\x9a\x8c\xdd\x93\x94\x30\x4d\xc3\xfd\x06\xea\xf7\x83\x72\x46\x8f\xa5\x38\x5a\x5d\xd9\x7e\x64\x1a\x1f\x68\x15\x21\xb4\xca\xb7\x15\x39\x32\xa1\x8c\xb5\x57\xab\xb3\x2b\x8c\x35\xb5\xdf\xb8\xca\x41\x94\xc2\x4e\xf9\xec\xb8\x82\xbc\x2c\xa9\x3e\x5f\xea\xf4\xa0\x63\x50\x2a\xc9\x3e\xd4\x30\xa2\xc5\x37\xa8\x62\x86\xa8\xf9\x1c\x03\x19\xa7\x92\xac\x23\x50\x04\xf6\xa5\xcf\x88\x9d\x8d\x58\x4c\x54\xd4\xd5\x3a\x64\x80\xba\x87\x94\x05\xd7\xae\x3d\x3a\x80\xdf\xbd\x5f\xd4\x17\x1e\xf1\x9e\x83\x6a\xe0\x9d\xe9\x6a\x50\xaa\x3a\xe0\x1e\xcc\xce\x7d\xb3\xa5\x9d\xd7\x0f\x17\x24\x87\x2e\xcf\x67\xd4\x19\x1a\x1b\xbb\xeb\x87\xd1\x17\x8c\x07\x04\xe2\xcb\x20\x0e\x18\xda\x10\x70\x8b\x4a\xe3\x52\x77\xf3\x0f\x55\x67\x1b\x0b\x99\xaa\xaf\x6d\x40\xdd\x46\xe3\xa2\xee\x6c\x33\xb0\xb4\x1d\x56\xdc\x4a\xf9\x1a\x0d\xba\x67\x91\x9c\xda\xb9\x64\x68\x85\x2b\x5d\x27\xfb\x27\x87\x86\x55\x7d\xe3\xda\x9f\x0f\x4f\xda\x50\xf6\xe0\x55\x1e\x7b\xea\xc6\x20\xc1\x37\x44\x07\x24\x7c\x88\x97\x46\xd6\x50\xed\xd1\x21\x0b\x59\x9f\xd1\x95\xc0\xd4\x1e\x83\xab\xba\x70\x90\x75\x39\xfa\x39\xa4\xe8\x69\x22\x7c\x0f\x10\xd0\xc7\x70\x0f\xf5\x8a\xc2\xd9\x21\x8b\x8e\x96\x03\x44\xf3\x4d\xc1\xe5\xc4\x8c\xeb\x97\xa2\xba\x83\xac\xcc\x51\x7c\x0f\x53\xf1\xb2\x9a\x0c\x28\x93\xaa\x04\xc3\x9d\x62\x4a\x1e\x95\xee\x36\xe4\x38\x70\x69\xcb\xe8\xbd\x07\x93\x79\x55\x9d\x3b\x42\xee\x8e\xd7\x17\x30\xc6\x92\x42\x36\x8a\x50\x8f\xd5\x77\xcb\xc1\x2a\xbe\x15\xbf\x97\x6e\xeb\x7a\xf9\xad\x6e\xee\xaa\x04\xd3\xb0\x3a\x0e\x3e\x65\x57\xf0\xe4\x4a\xea\xaf\xe7\x01\x7e\x45\xcd\x34\x86\x8f\x66\x63\xec\xee\x75\x71\x85\xa5\x2f\xd4\xc2\xbe\x08\xdc\x37\x78\x5e\x89\xa1\x50\xb6\xbe\x47\x9f\x0d\x4e\x9b\xb7\x8b\xaa\x0a\x0b\x9d\x49\xa8\x57\x0a\x45\x09\x1d\xbd\x4a\x80\x32\xec\x09\xbb\x9d\x3a\x6e\x20\xe3\x95\xa3\x6a\xdf\x38\x5e\x9c\x57\xbd\xe2\xe1\x45\x43\xaa\x60\x40\x29\x8e\x55\x37\xcd\x7f\x3c\xbe\x7b\x98\xfd\xdd\x56\xe5\x38\x26\x09\x71\x95\xbe\xa4\x1e\x1e\x03\x97\x49\x06\xc8\xf5\x2d\xf2\x63\x48\x6c\x39\x1a\xb5\x22\xf6\xd3\xea\x24\x72\xfc\xfb\x9b\x3f\xba\x25\xfc\xab\x75\x40\xcf\x98\x17\x9a\xc6\xa0\xaa\x46\xb2\x7e\x19\x68\x15\x77\x41\x40\x0d\xdd\x4e\x92\x52\xcb\x05\x98\x85\x4d\x2b\x41\xec\x82\x00\x3c\x6e\x08\x6c\x25\x80\x92\x40\xab\x0d\xcd\x61\xc4\x05\x25\x2d\x96\x3f\x1b\xcc\xe9\xcb\xa8\xf3\x88\xef\x77\x19\x39\x82\x91\x2c\x1d\x45\x46\x9b\x42\x5a\xe6\x5a\x6e\x13\xa9\x86\x5b\x9b\xee\xc4\xef\xd4\x7a\x4d\x8e\x62\xfb\x42\x5b\x32\xfe\x07\xe9\x9f\xd5\x0a\x8c\x6d\x11\x0a\xe4\x45\xb7\x05\x25\x6a\xa5\x7a\x02\xfe\x29\xb8\xdf\xdf\xfc\x31\x82\xef\x0f\xd4\x62\xdd\x6b\x52\x7a\x86\x37\xb1\xcf\x53\x2c\x72\xfb\xa1\x5b\x6b\xa1\x0d\xe7\xbd\xf1\xf8\x2c\xbc\x24\xd2\xbe\x99\xd0\x5d\x89\x14\x32\xdc\x12\xb0\xcd\x09\x76\xa4\xf5\x24\xbe\x3a\xa4\xb0\xeb\x69\x9f\x5b\x6d\x49\x6c\xd6\x0b\x74\xfe\xe4\x91\xee\xe9\xdd\xdb\x77\xf3\xc8\xa5\x98\xde\xfa\xf4\x49\xef\x78\x28\x06\x63\x3d\xac\x94\x41\x5d\x75\x86\x8a\x0f\x2d\x26\x97\xd1\xd0\xbc\x85\x24\x43\x13\xf2\x4d\x6f\x91\xba\x2a\x7d\xe9\x68\x7a\xfb\xb5\x95\xf6\xf9\x3b\xdb\xf1\xb8\xf0\xea\x76\x5a\xec\xff\xdf\xde\xad\xfe\x07\xb8\xe1\x01\x7a\x30\xdc\x87\x96\x0f\x75\xc2\xdd\x94\x4b\x72\x86\x3c\x05\xc4\xa9\x4d\x58\xc0\x26\x54\x78\x9e\xd9\x2d\xb9\xad\xa2\xdd\x6c\x67\xdd\x46\x99\xf5\x44\x8c\x7d\x12\x2d\x89\x67\xe1\xb9\x7e\xf6\x5d\xf8\xe7\x55\xd0\x71\x81\xc9\x0b\x21\x86\x2d\x7f\x05\x4e\x39\x87\x67\x5f\x0d\xb3\x6e\xa8\x5f\xda\xb1\xde\x3e\xc6\x60\x95\x9c\x52\x10\xd7\xdb\x65\x2a\xc9\xea\xd7\xfa\x2a\xe2\xf7\x79\x75\x8e\x69\x4c\x17\x68\xf6\xdf\xdc\x0d\x44\xd0\xa5\x13\xbe\xf6\x93\xea\x7f\x9e\x4c\xd0\xa4\xf2\x37\x2b\xf6\x32\xff\xd5\x92\x2d\xd5\x0b\x82\xc1\xc7\xc5\xdb\xbf\xc6\x39\x4a\xf5\x42\xcf\x8f\xef\xba\x73\xf0\xae\x8c\x3a\x64\x6f\x9d\xf4\x03\xad\x99\x72\xd9\xdc\x1f\xd5\x90\xab\x02\x15\x3e\x7f\xb9\xf9\x6f\x00\x00\x00\xff\xff\x89\x7a\x14\xa2\x3b\x24\x00\x00") +var _operatorsCoreosCom_operatorsYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x5a\x4b\x73\xdb\x38\x12\xbe\xfb\x57\x74\x69\x0e\x9e\xa9\xd2\x63\x1e\x97\x2d\xdd\x5c\x4e\x66\x4b\xbb\xb3\x4e\x2a\x76\x72\x99\x9a\x03\x44\xb6\x44\xac\x48\x80\x83\x6e\x4a\xd6\xa6\xf2\xdf\xb7\x1a\x20\x29\x92\x92\x48\x7a\xe3\xcc\xe2\x12\x0b\x04\x1a\xfd\xf5\xbb\x81\xa8\x5c\x7f\x42\x47\xda\x9a\x25\xa8\x5c\xe3\x33\xa3\x91\x5f\x34\xdf\xfd\x8d\xe6\xda\x2e\xf6\x3f\xdd\xec\xb4\x89\x97\x70\x5f\x10\xdb\xec\x03\x92\x2d\x5c\x84\x6f\x70\xa3\x8d\x66\x6d\xcd\x4d\x86\xac\x62\xc5\x6a\x79\x03\xa0\x8c\xb1\xac\x64\x9a\xe4\x27\x40\x64\x0d\x3b\x9b\xa6\xe8\x66\x5b\x34\xf3\x5d\xb1\xc6\x75\xa1\xd3\x18\x9d\x27\x5e\x1d\xbd\xff\x71\xfe\xcb\xfc\xc7\x1b\x80\xc8\xa1\xdf\xfe\xa4\x33\x24\x56\x59\xbe\x04\x53\xa4\xe9\x0d\x80\x51\x19\x2e\xc1\xe6\xe8\x14\x5b\x47\xf3\xd3\x5f\x91\x75\x68\xe5\x9f\xec\x86\x72\x8c\xe4\xe0\xad\xb3\x45\xde\x5c\xdd\x58\x13\x48\x55\xfc\x29\xc6\xad\x75\xba\xfa\x3d\x03\x9b\x66\xfe\xaf\x80\xfa\x5d\x49\xc1\x4f\xa5\x9a\xf8\x9f\xad\xe9\xdf\x34\xb1\xff\x94\xa7\x85\x53\x69\xe3\x44\x3f\x4b\xda\x6c\x8b\x54\xb9\xd3\xfc\x0d\x00\x45\x36\xc7\x25\xdc\xa7\x05\x31\xca\x44\x29\x05\xcf\xc1\xac\xc4\xb9\xff\x29\x10\x88\x12\xcc\x54\x60\x0d\x84\x88\xb9\x7b\xbf\xfa\xf4\xcb\x63\x6b\x1a\x20\x46\x8a\x9c\xce\xd9\xcb\xb2\xe2\x0d\x1c\xe6\x0e\x09\x0d\x13\x28\x88\xc2\x71\x35\x23\xf3\x7a\x33\x1f\x85\x1d\xbb\xfe\x37\x46\x5c\x4f\xe6\x4e\x16\x72\x2d\x97\x30\x1a\xd6\xd2\x98\xed\x9c\x7f\x2b\x2c\x86\x55\x10\x8b\x99\x20\x01\x27\x58\xc1\xc4\xb8\x44\x05\x76\x03\x9c\x68\x3a\xf1\xe9\x35\xdf\x22\x0c\xb2\x48\x99\x92\xbb\x39\x3c\xa2\x13\x32\x40\x89\x2d\xd2\x58\xac\x6b\x8f\x8e\xc1\x61\x64\xb7\x46\xff\xa7\xa6\x4d\xc0\xd6\x1f\x9a\x2a\x46\xe2\x0e\x4d\x6d\x18\x9d\x51\x29\xec\x55\x5a\xe0\x14\x94\x89\x21\x53\x47\x70\x28\xa7\x40\x61\x1a\xf4\xfc\x12\x9a\xc3\xbf\xac\x43\xd0\x66\x63\x97\x90\x30\xe7\xb4\x5c\x2c\xb6\x9a\x2b\x2f\x89\x6c\x96\x15\x46\xf3\x71\xe1\x0d\x5e\xaf\x0b\xb1\x81\x45\x8c\x7b\x4c\x17\xa4\xb7\x33\xe5\xa2\x44\x33\x46\x5c\x38\x5c\xa8\x5c\xcf\x3c\xeb\xc6\x7b\xca\x3c\x8b\xbf\x73\xa5\x5f\xd1\x6d\x8b\xd7\xa0\x1b\x62\xa7\xcd\xb6\xf1\xc1\xdb\x66\x8f\x06\xc4\x48\x41\x8b\xda\xc3\xd6\x80\xe2\x24\x68\x99\x12\xe9\x7c\x78\xfb\xf8\x04\xd5\xd1\x5e\x19\x5d\xe9\x7b\xb9\x37\x2c\xe9\xa4\x02\x11\x98\x36\x1b\x74\x41\x89\x1b\x67\x33\x4f\x13\x4d\x9c\x5b\x6d\xd8\xff\x88\x52\x8d\xa6\x2b\x7e\x2a\xd6\x99\x66\xd1\xfb\x9f\x05\x12\x8b\xae\xe6\x70\xef\x43\x07\xac\x11\x8a\x3c\x56\x8c\xf1\x1c\x56\x06\xee\x55\x86\xe9\xbd\x22\xfc\xe6\x0a\x10\x49\xd3\x4c\x04\x3b\x4e\x05\xcd\xa8\xd7\x5d\xdc\xf1\x25\x80\x2a\x2c\x5d\xd1\x57\xe5\xb1\x8f\x39\x46\x2d\x97\x89\x91\xb4\x13\xa3\x66\xc5\x28\xae\xd0\x0a\x47\x43\x87\xb2\xe2\x82\xc6\x1c\xeb\x17\x96\xdf\xd6\xe5\xd1\x76\x4d\xa2\xe8\xc6\xd9\xe2\x86\x97\x8e\x07\xef\x3f\xa2\xd0\xc8\x66\xb9\x35\xde\x4c\xc6\x30\x78\x2d\xca\x80\xcf\x1b\x15\xa9\xee\x97\x0e\x88\xfb\x7a\x61\x03\x40\xed\x4d\xc0\x89\xe2\x40\x8c\x30\xe0\x3a\x8b\x7f\x83\x5c\xca\x10\x5b\x15\x55\x9c\x73\x33\x83\x54\xad\x31\x7d\xc4\x14\xa3\x73\xd1\xf4\x61\x94\xd1\xda\x7b\x69\x41\x07\xee\x6f\xcd\xf5\xc1\xc5\x3d\x09\xf8\xb3\x40\x77\x04\xbb\x47\x27\x5e\x8f\x2c\x1a\xab\xc5\x70\x91\x2e\x40\x41\x18\x4b\xa0\x24\x4f\xaf\x25\x9e\xdb\xa6\x36\x2f\x6e\xef\x15\xd7\x30\x70\x19\x99\xe2\x28\x79\xfb\x2c\xb1\x85\x4e\x25\xc3\xa0\x0c\xba\xdb\x4a\x31\x68\xf2\xa0\x83\x38\xe8\x9a\x3a\x4e\xa3\x54\x69\x16\xc2\xda\x53\x82\xad\x19\x50\x0e\xe1\xee\xe1\x0d\xc6\xe7\x96\xd2\x16\x81\x72\x4e\x1d\xaf\xae\xd1\x8c\x59\x0f\xb0\x0e\xb4\xbb\x0e\xfb\x4d\x96\xca\x80\x3e\x0c\x0c\x2a\xab\x37\xac\xb4\xa1\x32\x85\x4d\x41\xc1\x0e\x8f\x21\xdb\x35\x7c\x39\x2c\x76\xe8\x33\xe5\x00\x55\x14\x0a\x9e\x40\x99\x16\x7b\xd6\x0f\xda\x47\x18\xd7\x1d\xeb\x34\x66\x72\x6c\xef\xf7\x2b\x81\xa9\x39\x86\xcd\x31\x8c\x1d\x1e\xfb\x17\x74\x54\x26\x12\xd1\x54\x16\x1b\xa2\x3b\x99\xf0\x32\x95\xa9\x51\xea\x02\x5f\x5a\xe5\xa9\x46\x9f\x0b\x07\xd6\x5e\x49\x48\xe7\xa3\x12\xca\x8b\xe0\xd8\x8b\xd5\xe3\x0e\x8f\xb7\x14\x8c\x44\x3c\x2e\xd1\xf9\x20\x20\xb6\xa7\x40\x54\x15\x51\x9f\x54\xaa\xe3\x53\x8d\xec\x7d\x6c\x65\xa6\xf0\x60\x79\x65\xa6\x83\x24\xdf\x3e\x6b\x29\x17\xc4\xfe\xde\x58\xa4\x07\xcb\x7e\xe6\xd5\x04\x16\xd8\x7c\x91\xb8\xc2\x16\xef\x9a\x26\x44\x02\xc1\xdb\xac\xba\x68\x0e\xab\xcd\xb0\xb4\x1a\xb1\x57\xa8\xad\x0c\x58\x57\xca\x25\x54\xcf\xe1\xa0\x70\x44\x56\x9c\xd5\xb4\xe7\x63\x8d\x60\xac\x99\x61\x96\xf3\x51\x78\x38\x3b\xa3\x14\xa7\x75\x2d\x69\x0e\xab\xe1\x22\x3b\x72\x5c\x79\xd4\x93\xd4\x83\xe1\x4b\xa8\xee\x53\x15\x61\x3c\x48\x36\x2e\xbc\xd0\x7c\xcd\x2a\x5d\x99\x8e\x20\x43\xb7\x45\xc8\x25\xde\x8f\x53\x72\x7f\x2c\x0e\x63\x30\x22\x37\x09\xf6\x5a\x8d\x4f\x44\x3e\x23\xbf\x28\x75\x85\x1d\x21\x9c\x67\x2a\x17\x83\xf9\x2c\x91\xd9\xcb\xf4\x0b\xe4\x4a\x3b\x9a\xc3\x5d\x0f\x87\xd2\x57\xa6\xd8\xda\xa5\x8d\xd7\x4b\xf3\x00\xa1\xad\x09\x24\xc0\xee\x55\x7a\x5e\x87\xb7\xd0\x5a\x31\x60\x4c\x43\xa6\xb1\x9b\xb3\x24\x3b\x85\x43\x22\x35\x94\x44\xb7\x8d\xc6\xd4\xf7\x17\x93\x1d\x1e\x27\x7d\x06\xd3\x35\xb9\xc9\xca\x4c\x42\x06\x3a\x33\xa2\x3a\x5d\x59\x93\xf6\xa9\x70\xe2\x77\x4d\xbe\x26\x63\x0f\x24\x25\x15\xc7\xfe\x66\x43\xa5\xef\x47\xe5\x8c\x01\x4b\x71\xb8\xb9\xb2\xbd\x65\x1a\x1f\x70\x13\x20\x34\xca\xb7\x0d\x3a\x34\xbe\x8c\xb5\x57\xab\xb3\x2b\x8c\xd5\xb5\xdf\xb4\xcc\x41\x18\xc3\x41\x73\xd2\xae\x20\x2f\x4b\x6a\xc8\x97\x7a\x3d\xa8\x0d\x4a\x47\xc9\x87\x0a\x46\xb0\xf8\x1a\x55\xc8\x10\x15\x9f\x53\x40\xe3\x74\x94\xf4\x04\x0a\xcf\xbe\xf4\x19\xa1\xb3\x11\x8b\x09\x8a\xba\x5a\x87\x8c\x50\xf7\x98\xb2\xe0\xda\xb5\x47\x0f\xf0\xbb\xf7\xab\xea\xc2\x23\xdc\x73\x60\x05\xbc\x37\x5d\x8d\x4a\x55\x27\xdc\xa3\xd9\xb9\xaf\xb7\x34\xf3\xfa\xe9\x82\xe4\xd4\xe5\x71\x82\xbd\xa1\xb1\xb6\xbb\x61\x18\x43\xc1\x78\x44\x20\xbe\x0c\xe2\x84\xa1\x09\x41\xed\x95\x4e\xd5\x3a\xed\xe7\x1f\xca\xce\x36\x14\x32\x65\x5f\x5b\x83\xba\x0d\xc6\x85\xfd\xd9\x66\x64\x69\x3b\xae\xb8\x95\xf2\x35\x18\xf4\xc0\x22\x39\xb5\x77\xc9\xd8\x0a\x57\xba\x4e\xe2\x27\xa7\x0c\xe9\xea\xae\x75\x38\x1f\x76\xda\x50\x62\x60\x9d\x85\x9e\xba\x36\x48\xe0\x9a\xe8\x88\x84\x0f\xe1\xd2\xc8\x1a\xac\x3c\xda\x67\x21\xcb\x09\x5e\x09\x4c\xcd\x31\xba\xaa\xf3\x07\x59\x97\x29\x5e\x42\xac\x18\x67\xc2\xf7\x08\x01\x7d\xf4\xf7\x50\xaf\x28\x9c\x83\x22\xd1\xd1\x7a\x84\x68\xbe\x29\xb8\x0c\x89\xd4\xf6\xa5\xa8\xee\x20\x29\x32\x25\xbe\xa7\x62\xf1\xb2\x8a\x0c\x68\x13\xeb\x48\xf9\x3b\xc5\x18\x59\xe9\xb4\xdf\x90\xc3\x50\x6b\x5b\x04\xef\x3d\x99\xcc\xab\xea\xdc\xa1\xa2\xfe\x78\x7d\x01\x63\x28\x29\x64\xa3\x08\xb5\xad\xbe\x5b\xf2\x56\xf1\xad\xf8\xbd\x74\x5b\x37\xc8\x6f\x79\x73\x57\x26\x98\x9a\xd5\xa9\xf7\x29\xbb\x81\x27\x57\xe0\x70\x3d\x0f\xf0\xab\x4a\x09\xa7\xf0\xd1\xec\x8c\x3d\xbc\x2e\x2e\xbf\xf4\x85\x5a\x38\xe6\x9e\xfb\x1a\xcf\x2b\x31\xe4\xcb\xd6\xf7\x8a\x93\xd1\x69\xf3\x76\x55\x56\x61\xbe\x33\xf1\xf5\x4a\xae\x31\xc2\xd6\xab\x04\x68\x43\x8c\xaa\xdf\xa9\xc3\x06\x34\xac\x1d\x96\xfb\xa6\xe1\xe2\xbc\xec\x15\x4f\x2f\x1a\x52\x05\x83\x92\xe2\x58\xf7\xd3\xfc\xc7\xe3\xbb\x87\xc5\xdf\x6d\x59\x8e\xab\x28\x42\x2a\xd3\x97\xd4\xc3\x53\xa0\x22\x4a\x40\x51\x75\x8b\xfc\xe8\x13\x5b\xa6\x8c\xde\x20\xf1\xbc\x3c\x09\x1d\xfd\xfe\xf3\x1f\xfd\x12\xfe\xd5\x3a\xc0\x67\x95\xe5\x29\x4e\x41\x97\x8d\x64\xf5\x32\xd0\x28\xee\xbc\x80\x6a\xba\xbd\x24\xa5\x96\xf3\x30\x73\x1b\x97\x82\x38\x78\x01\xb0\xda\x21\xd8\x52\x00\x05\x42\xaa\x77\xb8\x84\x09\xe5\x18\x35\x58\xfe\x6c\x54\x86\x5f\x26\xbd\x47\x7c\x7f\x48\xd0\x21\x4c\x64\xe9\x24\x30\x5a\x17\xd2\x32\xd7\x70\x9b\x40\xd5\xdf\xda\xf4\x27\x7e\xa7\xb7\x5b\x74\x18\xda\x17\xdc\xa3\xe1\x1f\xa4\x7f\xd6\x1b\x30\xb6\x41\xc8\x93\x17\xdd\xe6\x18\xe9\x8d\x1e\x08\xf8\x5d\x70\xbf\xff\xfc\xc7\x04\xbe\x3f\x51\x0b\x75\xaf\x89\xf1\x19\x7e\x0e\x7d\x9e\x26\x91\xdb\x0f\xfd\x5a\xf3\x6d\x38\x1d\x0d\xab\x67\xe1\x25\x92\xf6\xcd\xf8\xee\x4a\xa4\x90\xa8\x3d\x02\xd9\x0c\xe1\x80\x69\x3a\x0b\xaf\x0e\x31\x1c\x06\xda\xe7\x46\x5b\x12\x9a\xf5\x5c\x39\xee\x3c\xd2\x3d\xbd\x7b\xf3\x6e\x19\xb8\x14\xd3\xdb\x76\x9f\xf4\xda\x43\x13\x18\xcb\xb0\xd1\x46\xa5\x65\x67\xa8\xe9\xd4\x62\x52\x11\x0c\x8d\x2d\x44\x89\x32\x3e\xdf\x0c\x16\xa9\x9b\x82\x0b\x87\xf3\xdb\xaf\xad\xb4\xcf\xdf\xd9\xda\xe3\xc2\xab\x5b\xb7\xd8\xff\xbf\xbd\x5b\xfd\x0f\x70\xfd\xd3\xf3\x68\xb8\x0f\x0d\x1f\xea\x85\xbb\x2b\xd6\xe8\x0c\x32\x7a\xc4\xb1\x8d\x48\xc0\x46\x98\x33\x2d\xec\x1e\xdd\x5e\xe3\x61\x71\xb0\x6e\xa7\xcd\x76\x26\xc6\x3e\x0b\x96\x44\x0b\xff\x50\xbf\xf8\xce\xff\xf3\x2a\xe8\x28\x57\xd1\x0b\x21\xfa\x2d\x7f\x05\x4e\x39\x87\x16\x5f\x0d\xb3\x6a\xa8\x5f\xda\xb1\xde\x3e\x86\x60\x15\x75\x29\x88\xeb\x1d\x12\x1d\x25\xd5\x6b\x7d\x19\xf1\x87\xbc\x3a\x53\x71\x48\x17\xca\x1c\xbf\xb9\x1b\x88\xa0\x0b\x27\x7c\x1d\x67\xe5\xff\x39\x99\x29\x13\xcb\xdf\xa4\x89\x65\xfe\xab\x25\x5b\xe8\x17\x04\x83\x8f\xab\x37\x7f\x8d\x73\x14\xfa\x85\x9e\x1f\xde\x75\x97\xc0\xae\x08\x3a\x24\xb6\x4e\xfa\x81\xc6\x4c\xb1\xae\xef\x8f\x2a\xc8\x65\x81\x0a\x9f\xbf\xdc\xfc\x37\x00\x00\xff\xff\xf9\xff\x6e\x49\x35\x24\x00\x00") func operatorsCoreosCom_operatorsYamlBytes() ([]byte, error) { return bindataRead( @@ -178,7 +178,7 @@ func operatorsCoreosCom_operatorsYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operators.coreos.com_operators.yaml", size: 9275, mode: os.FileMode(420), modTime: time.Unix(1595866186, 0)} + info := bindataFileInfo{name: "operators.coreos.com_operators.yaml", size: 9269, mode: os.FileMode(420), modTime: time.Unix(1595947017, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -198,7 +198,7 @@ func operatorsCoreosCom_subscriptionsYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "operators.coreos.com_subscriptions.yaml", size: 111704, mode: os.FileMode(420), modTime: time.Unix(1595866187, 0)} + info := bindataFileInfo{name: "operators.coreos.com_subscriptions.yaml", size: 111704, mode: os.FileMode(420), modTime: time.Unix(1595947017, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/pkg/operators/install/install.go b/pkg/operators/install/install.go index 7c5c08f5b..d4bc598ea 100644 --- a/pkg/operators/install/install.go +++ b/pkg/operators/install/install.go @@ -5,18 +5,16 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "github.com/operator-framework/api/pkg/operators" - v1 "github.com/operator-framework/api/pkg/operators/v1" - "github.com/operator-framework/api/pkg/operators/v1alpha1" - "github.com/operator-framework/api/pkg/operators/v1alpha2" - "github.com/operator-framework/api/pkg/operators/v2alpha1" + operatorsv1 "github.com/operator-framework/api/pkg/operators/v1" + operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" + operatorsv1alpha2 "github.com/operator-framework/api/pkg/operators/v1alpha2" ) // Install registers the API group and adds all of its types to the given scheme. func Install(scheme *runtime.Scheme) { utilruntime.Must(operators.AddToScheme(scheme)) - utilruntime.Must(v1alpha1.AddToScheme(scheme)) - utilruntime.Must(v1alpha2.AddToScheme(scheme)) - utilruntime.Must(v1.AddToScheme(scheme)) - utilruntime.Must(v2alpha1.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(v2alpha1.GroupVersion, v1.SchemeGroupVersion, v1alpha2.GroupVersion, v1alpha1.SchemeGroupVersion)) + utilruntime.Must(operatorsv1alpha1.AddToScheme(scheme)) + utilruntime.Must(operatorsv1alpha2.AddToScheme(scheme)) + utilruntime.Must(operatorsv1.AddToScheme(scheme)) + utilruntime.Must(scheme.SetVersionPriority(operatorsv1.GroupVersion, operatorsv1alpha2.GroupVersion, operatorsv1alpha1.SchemeGroupVersion)) } diff --git a/pkg/operators/v1/doc.go b/pkg/operators/v1/doc.go deleted file mode 100644 index 9dcbd4d16..000000000 --- a/pkg/operators/v1/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// +k8s:deepcopy-gen=package -// +k8s:conversion-gen=github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators -// +groupName=operators.coreos.com - -// Package v1 contains resources types for version v1 of the operators.coreos.com API group. -package v1 diff --git a/pkg/operators/v2alpha1/groupversion_info.go b/pkg/operators/v1/groupversion_info.go similarity index 50% rename from pkg/operators/v2alpha1/groupversion_info.go rename to pkg/operators/v1/groupversion_info.go index f115fe528..e3c213e51 100644 --- a/pkg/operators/v2alpha1/groupversion_info.go +++ b/pkg/operators/v1/groupversion_info.go @@ -1,21 +1,7 @@ -/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Package v2alpha1 contains API Schema definitions for the discovery v2alpha1 API group. +// Package v1 contains API Schema definitions for the operator v1 API group. // +kubebuilder:object:generate=true // +groupName=operators.coreos.com -package v2alpha1 +package v1 import ( "k8s.io/apimachinery/pkg/runtime/schema" @@ -24,7 +10,7 @@ import ( var ( // GroupVersion is group version used to register these objects. - GroupVersion = schema.GroupVersion{Group: "operators.coreos.com", Version: "v2alpha1"} + GroupVersion = schema.GroupVersion{Group: "operators.coreos.com", Version: "v1"} // SchemeGroupVersion is required for compatibility with client generation. SchemeGroupVersion = GroupVersion diff --git a/pkg/operators/v2alpha1/operator_types.go b/pkg/operators/v1/operator_types.go similarity index 83% rename from pkg/operators/v2alpha1/operator_types.go rename to pkg/operators/v1/operator_types.go index 68399d9b7..930bd3dd3 100644 --- a/pkg/operators/v2alpha1/operator_types.go +++ b/pkg/operators/v1/operator_types.go @@ -1,19 +1,4 @@ -/* - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package v2alpha1 +package v1 import ( corev1 "k8s.io/api/core/v1" diff --git a/pkg/operators/v1/operatorgroup_types.go b/pkg/operators/v1/operatorgroup_types.go index 884b8899f..f5d112668 100644 --- a/pkg/operators/v1/operatorgroup_types.go +++ b/pkg/operators/v1/operatorgroup_types.go @@ -144,3 +144,7 @@ func (o *OperatorGroup) NamespaceLabelSelector() (*metav1.LabelSelector, error) func IsOperatorGroupLabel(label string) bool { return strings.HasPrefix(label, OperatorGroupLabelPrefix) } + +func init() { + SchemeBuilder.Register(&OperatorGroup{}, &OperatorGroupList{}) +} diff --git a/pkg/operators/v1/register.go b/pkg/operators/v1/register.go deleted file mode 100644 index aef814810..000000000 --- a/pkg/operators/v1/register.go +++ /dev/null @@ -1,49 +0,0 @@ -package v1 - -import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - - "github.com/operator-framework/api/pkg/operators" -) - -const ( - // GroupName is the group name used in this package. - GroupName = operators.GroupName - // GroupVersion is the group version used in this package. - GroupVersion = "v1" -) - -// SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: GroupVersion} - -// Kind takes an unqualified kind and returns back a Group qualified GroupKind -func Kind(kind string) schema.GroupKind { - return SchemeGroupVersion.WithKind(kind).GroupKind() -} - -// Resource takes an unqualified resource and returns a Group qualified GroupResource -func Resource(resource string) schema.GroupResource { - return SchemeGroupVersion.WithResource(resource).GroupResource() -} - -var ( - // SchemeBuilder initializes a scheme builder - SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes) - // AddToScheme is a global function that registers this API group & version to a scheme - AddToScheme = SchemeBuilder.AddToScheme - - // localSchemeBuilder is expected by generated conversion functions - localSchemeBuilder = &SchemeBuilder -) - -// addKnownTypes adds the list of known types to Scheme -func addKnownTypes(scheme *runtime.Scheme) error { - scheme.AddKnownTypes(SchemeGroupVersion, - &OperatorGroup{}, - &OperatorGroupList{}, - ) - metav1.AddToGroupVersion(scheme, SchemeGroupVersion) - return nil -} diff --git a/pkg/operators/v1/zz_generated.conversion.go b/pkg/operators/v1/zz_generated.conversion.go deleted file mode 100644 index a5cdff87f..000000000 --- a/pkg/operators/v1/zz_generated.conversion.go +++ /dev/null @@ -1,185 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2020 Red Hat, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by conversion-gen. DO NOT EDIT. - -package v1 - -import ( - unsafe "unsafe" - - operators "github.com/operator-framework/api/pkg/operators" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" -) - -func init() { - localSchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(s *runtime.Scheme) error { - if err := s.AddGeneratedConversionFunc((*OperatorGroup)(nil), (*operators.OperatorGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_OperatorGroup_To_operators_OperatorGroup(a.(*OperatorGroup), b.(*operators.OperatorGroup), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*operators.OperatorGroup)(nil), (*OperatorGroup)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_operators_OperatorGroup_To_v1_OperatorGroup(a.(*operators.OperatorGroup), b.(*OperatorGroup), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*OperatorGroupList)(nil), (*operators.OperatorGroupList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_OperatorGroupList_To_operators_OperatorGroupList(a.(*OperatorGroupList), b.(*operators.OperatorGroupList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*operators.OperatorGroupList)(nil), (*OperatorGroupList)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_operators_OperatorGroupList_To_v1_OperatorGroupList(a.(*operators.OperatorGroupList), b.(*OperatorGroupList), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*OperatorGroupSpec)(nil), (*operators.OperatorGroupSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_OperatorGroupSpec_To_operators_OperatorGroupSpec(a.(*OperatorGroupSpec), b.(*operators.OperatorGroupSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*operators.OperatorGroupSpec)(nil), (*OperatorGroupSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_operators_OperatorGroupSpec_To_v1_OperatorGroupSpec(a.(*operators.OperatorGroupSpec), b.(*OperatorGroupSpec), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*OperatorGroupStatus)(nil), (*operators.OperatorGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_v1_OperatorGroupStatus_To_operators_OperatorGroupStatus(a.(*OperatorGroupStatus), b.(*operators.OperatorGroupStatus), scope) - }); err != nil { - return err - } - if err := s.AddGeneratedConversionFunc((*operators.OperatorGroupStatus)(nil), (*OperatorGroupStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { - return Convert_operators_OperatorGroupStatus_To_v1_OperatorGroupStatus(a.(*operators.OperatorGroupStatus), b.(*OperatorGroupStatus), scope) - }); err != nil { - return err - } - return nil -} - -func autoConvert_v1_OperatorGroup_To_operators_OperatorGroup(in *OperatorGroup, out *operators.OperatorGroup, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1_OperatorGroupSpec_To_operators_OperatorGroupSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1_OperatorGroupStatus_To_operators_OperatorGroupStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1_OperatorGroup_To_operators_OperatorGroup is an autogenerated conversion function. -func Convert_v1_OperatorGroup_To_operators_OperatorGroup(in *OperatorGroup, out *operators.OperatorGroup, s conversion.Scope) error { - return autoConvert_v1_OperatorGroup_To_operators_OperatorGroup(in, out, s) -} - -func autoConvert_operators_OperatorGroup_To_v1_OperatorGroup(in *operators.OperatorGroup, out *OperatorGroup, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_operators_OperatorGroupSpec_To_v1_OperatorGroupSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_operators_OperatorGroupStatus_To_v1_OperatorGroupStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_operators_OperatorGroup_To_v1_OperatorGroup is an autogenerated conversion function. -func Convert_operators_OperatorGroup_To_v1_OperatorGroup(in *operators.OperatorGroup, out *OperatorGroup, s conversion.Scope) error { - return autoConvert_operators_OperatorGroup_To_v1_OperatorGroup(in, out, s) -} - -func autoConvert_v1_OperatorGroupList_To_operators_OperatorGroupList(in *OperatorGroupList, out *operators.OperatorGroupList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]operators.OperatorGroup)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_v1_OperatorGroupList_To_operators_OperatorGroupList is an autogenerated conversion function. -func Convert_v1_OperatorGroupList_To_operators_OperatorGroupList(in *OperatorGroupList, out *operators.OperatorGroupList, s conversion.Scope) error { - return autoConvert_v1_OperatorGroupList_To_operators_OperatorGroupList(in, out, s) -} - -func autoConvert_operators_OperatorGroupList_To_v1_OperatorGroupList(in *operators.OperatorGroupList, out *OperatorGroupList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]OperatorGroup)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_operators_OperatorGroupList_To_v1_OperatorGroupList is an autogenerated conversion function. -func Convert_operators_OperatorGroupList_To_v1_OperatorGroupList(in *operators.OperatorGroupList, out *OperatorGroupList, s conversion.Scope) error { - return autoConvert_operators_OperatorGroupList_To_v1_OperatorGroupList(in, out, s) -} - -func autoConvert_v1_OperatorGroupSpec_To_operators_OperatorGroupSpec(in *OperatorGroupSpec, out *operators.OperatorGroupSpec, s conversion.Scope) error { - out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector)) - out.TargetNamespaces = *(*[]string)(unsafe.Pointer(&in.TargetNamespaces)) - out.ServiceAccountName = in.ServiceAccountName - out.StaticProvidedAPIs = in.StaticProvidedAPIs - return nil -} - -// Convert_v1_OperatorGroupSpec_To_operators_OperatorGroupSpec is an autogenerated conversion function. -func Convert_v1_OperatorGroupSpec_To_operators_OperatorGroupSpec(in *OperatorGroupSpec, out *operators.OperatorGroupSpec, s conversion.Scope) error { - return autoConvert_v1_OperatorGroupSpec_To_operators_OperatorGroupSpec(in, out, s) -} - -func autoConvert_operators_OperatorGroupSpec_To_v1_OperatorGroupSpec(in *operators.OperatorGroupSpec, out *OperatorGroupSpec, s conversion.Scope) error { - out.Selector = (*metav1.LabelSelector)(unsafe.Pointer(in.Selector)) - out.TargetNamespaces = *(*[]string)(unsafe.Pointer(&in.TargetNamespaces)) - out.ServiceAccountName = in.ServiceAccountName - out.StaticProvidedAPIs = in.StaticProvidedAPIs - return nil -} - -// Convert_operators_OperatorGroupSpec_To_v1_OperatorGroupSpec is an autogenerated conversion function. -func Convert_operators_OperatorGroupSpec_To_v1_OperatorGroupSpec(in *operators.OperatorGroupSpec, out *OperatorGroupSpec, s conversion.Scope) error { - return autoConvert_operators_OperatorGroupSpec_To_v1_OperatorGroupSpec(in, out, s) -} - -func autoConvert_v1_OperatorGroupStatus_To_operators_OperatorGroupStatus(in *OperatorGroupStatus, out *operators.OperatorGroupStatus, s conversion.Scope) error { - out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) - out.ServiceAccountRef = (*corev1.ObjectReference)(unsafe.Pointer(in.ServiceAccountRef)) - out.LastUpdated = (*metav1.Time)(unsafe.Pointer(in.LastUpdated)) - return nil -} - -// Convert_v1_OperatorGroupStatus_To_operators_OperatorGroupStatus is an autogenerated conversion function. -func Convert_v1_OperatorGroupStatus_To_operators_OperatorGroupStatus(in *OperatorGroupStatus, out *operators.OperatorGroupStatus, s conversion.Scope) error { - return autoConvert_v1_OperatorGroupStatus_To_operators_OperatorGroupStatus(in, out, s) -} - -func autoConvert_operators_OperatorGroupStatus_To_v1_OperatorGroupStatus(in *operators.OperatorGroupStatus, out *OperatorGroupStatus, s conversion.Scope) error { - out.Namespaces = *(*[]string)(unsafe.Pointer(&in.Namespaces)) - out.ServiceAccountRef = (*corev1.ObjectReference)(unsafe.Pointer(in.ServiceAccountRef)) - out.LastUpdated = (*metav1.Time)(unsafe.Pointer(in.LastUpdated)) - return nil -} - -// Convert_operators_OperatorGroupStatus_To_v1_OperatorGroupStatus is an autogenerated conversion function. -func Convert_operators_OperatorGroupStatus_To_v1_OperatorGroupStatus(in *operators.OperatorGroupStatus, out *OperatorGroupStatus, s conversion.Scope) error { - return autoConvert_operators_OperatorGroupStatus_To_v1_OperatorGroupStatus(in, out, s) -} diff --git a/pkg/operators/v1/zz_generated.deepcopy.go b/pkg/operators/v1/zz_generated.deepcopy.go index 7b56a2b46..a7e9acc50 100644 --- a/pkg/operators/v1/zz_generated.deepcopy.go +++ b/pkg/operators/v1/zz_generated.deepcopy.go @@ -22,9 +22,86 @@ package v1 import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" + runtime "k8s.io/apimachinery/pkg/runtime" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Components) DeepCopyInto(out *Components) { + *out = *in + if in.LabelSelector != nil { + in, out := &in.LabelSelector, &out.LabelSelector + *out = new(metav1.LabelSelector) + (*in).DeepCopyInto(*out) + } + if in.Refs != nil { + in, out := &in.Refs, &out.Refs + *out = make([]RichReference, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Components. +func (in *Components) DeepCopy() *Components { + if in == nil { + return nil + } + out := new(Components) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Condition) DeepCopyInto(out *Condition) { + *out = *in + if in.LastUpdateTime != nil { + in, out := &in.LastUpdateTime, &out.LastUpdateTime + *out = (*in).DeepCopy() + } + if in.LastTransitionTime != nil { + in, out := &in.LastTransitionTime, &out.LastTransitionTime + *out = (*in).DeepCopy() + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Condition. +func (in *Condition) DeepCopy() *Condition { + if in == nil { + return nil + } + out := new(Condition) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *Operator) DeepCopyInto(out *Operator) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + out.Spec = in.Spec + in.Status.DeepCopyInto(&out.Status) +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Operator. +func (in *Operator) DeepCopy() *Operator { + if in == nil { + return nil + } + out := new(Operator) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *Operator) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OperatorGroup) DeepCopyInto(out *OperatorGroup) { *out = *in @@ -137,3 +214,97 @@ func (in *OperatorGroupStatus) DeepCopy() *OperatorGroupStatus { in.DeepCopyInto(out) return out } + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OperatorList) DeepCopyInto(out *OperatorList) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ListMeta.DeepCopyInto(&out.ListMeta) + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]Operator, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorList. +func (in *OperatorList) DeepCopy() *OperatorList { + if in == nil { + return nil + } + out := new(OperatorList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *OperatorList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OperatorSpec) DeepCopyInto(out *OperatorSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorSpec. +func (in *OperatorSpec) DeepCopy() *OperatorSpec { + if in == nil { + return nil + } + out := new(OperatorSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OperatorStatus) DeepCopyInto(out *OperatorStatus) { + *out = *in + if in.Components != nil { + in, out := &in.Components, &out.Components + *out = new(Components) + (*in).DeepCopyInto(*out) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorStatus. +func (in *OperatorStatus) DeepCopy() *OperatorStatus { + if in == nil { + return nil + } + out := new(OperatorStatus) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RichReference) DeepCopyInto(out *RichReference) { + *out = *in + if in.ObjectReference != nil { + in, out := &in.ObjectReference, &out.ObjectReference + *out = new(corev1.ObjectReference) + **out = **in + } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RichReference. +func (in *RichReference) DeepCopy() *RichReference { + if in == nil { + return nil + } + out := new(RichReference) + in.DeepCopyInto(out) + return out +} diff --git a/pkg/operators/v2alpha1/zz_generated.deepcopy.go b/pkg/operators/v2alpha1/zz_generated.deepcopy.go deleted file mode 100644 index e8ca503cf..000000000 --- a/pkg/operators/v2alpha1/zz_generated.deepcopy.go +++ /dev/null @@ -1,197 +0,0 @@ -// +build !ignore_autogenerated - -/* - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by controller-gen. DO NOT EDIT. - -package v2alpha1 - -import ( - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" -) - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Components) DeepCopyInto(out *Components) { - *out = *in - if in.LabelSelector != nil { - in, out := &in.LabelSelector, &out.LabelSelector - *out = new(v1.LabelSelector) - (*in).DeepCopyInto(*out) - } - if in.Refs != nil { - in, out := &in.Refs, &out.Refs - *out = make([]RichReference, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Components. -func (in *Components) DeepCopy() *Components { - if in == nil { - return nil - } - out := new(Components) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Condition) DeepCopyInto(out *Condition) { - *out = *in - if in.LastUpdateTime != nil { - in, out := &in.LastUpdateTime, &out.LastUpdateTime - *out = (*in).DeepCopy() - } - if in.LastTransitionTime != nil { - in, out := &in.LastTransitionTime, &out.LastTransitionTime - *out = (*in).DeepCopy() - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Condition. -func (in *Condition) DeepCopy() *Condition { - if in == nil { - return nil - } - out := new(Condition) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *Operator) DeepCopyInto(out *Operator) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) - out.Spec = in.Spec - in.Status.DeepCopyInto(&out.Status) -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Operator. -func (in *Operator) DeepCopy() *Operator { - if in == nil { - return nil - } - out := new(Operator) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *Operator) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *OperatorList) DeepCopyInto(out *OperatorList) { - *out = *in - out.TypeMeta = in.TypeMeta - in.ListMeta.DeepCopyInto(&out.ListMeta) - if in.Items != nil { - in, out := &in.Items, &out.Items - *out = make([]Operator, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorList. -func (in *OperatorList) DeepCopy() *OperatorList { - if in == nil { - return nil - } - out := new(OperatorList) - in.DeepCopyInto(out) - return out -} - -// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. -func (in *OperatorList) DeepCopyObject() runtime.Object { - if c := in.DeepCopy(); c != nil { - return c - } - return nil -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *OperatorSpec) DeepCopyInto(out *OperatorSpec) { - *out = *in -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorSpec. -func (in *OperatorSpec) DeepCopy() *OperatorSpec { - if in == nil { - return nil - } - out := new(OperatorSpec) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *OperatorStatus) DeepCopyInto(out *OperatorStatus) { - *out = *in - if in.Components != nil { - in, out := &in.Components, &out.Components - *out = new(Components) - (*in).DeepCopyInto(*out) - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OperatorStatus. -func (in *OperatorStatus) DeepCopy() *OperatorStatus { - if in == nil { - return nil - } - out := new(OperatorStatus) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *RichReference) DeepCopyInto(out *RichReference) { - *out = *in - if in.ObjectReference != nil { - in, out := &in.ObjectReference, &out.ObjectReference - *out = new(corev1.ObjectReference) - **out = **in - } - if in.Conditions != nil { - in, out := &in.Conditions, &out.Conditions - *out = make([]Condition, len(*in)) - for i := range *in { - (*in)[i].DeepCopyInto(&(*out)[i]) - } - } -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RichReference. -func (in *RichReference) DeepCopy() *RichReference { - if in == nil { - return nil - } - out := new(RichReference) - in.DeepCopyInto(out) - return out -}