From faa5439f08f7c0145b17b2a19ef9169c368c7fb9 Mon Sep 17 00:00:00 2001 From: Cesar Wong Date: Thu, 21 Jan 2021 09:59:27 -0500 Subject: [PATCH 1/3] Move kube controller manager arguments to command line --- .../assets/controlplane/hypershift/bindata.go | 24 +++++++------- .../kube-controller-manager-deployment.yaml | 32 +++++++++++++++++++ 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/hypershift-operator/assets/controlplane/hypershift/bindata.go b/hypershift-operator/assets/controlplane/hypershift/bindata.go index bd80bf3bc3d6..fc80ae0bf22e 100644 --- a/hypershift-operator/assets/controlplane/hypershift/bindata.go +++ b/hypershift-operator/assets/controlplane/hypershift/bindata.go @@ -31,8 +31,8 @@ // hypershift-operator/assets/controlplane/hypershift/control-plane-operator/cp-operator-serviceaccount.yaml (115B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-cluster-crd.yaml (444B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-cluster.yaml (265B) -// hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-cluster-role-binding.yaml (277B) -// hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-cluster-role.yaml (651B) +// hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-cluster-role-binding.yaml (272B) +// hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-cluster-role.yaml (646B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator-serviceaccount.yaml (68B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-operator.yaml (643B) // hypershift-operator/assets/controlplane/hypershift/etcd/etcd-secret-template.yaml (220B) @@ -57,7 +57,7 @@ // hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/config.yaml (1.531kB) // hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-config-configmap.yaml (158B) // hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-configmap.yaml (194B) -// hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-deployment.yaml (3.266kB) +// hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-deployment.yaml (4.787kB) // hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-secret.yaml (289B) // hypershift-operator/assets/controlplane/hypershift/kube-scheduler/config.yaml (185B) // hypershift-operator/assets/controlplane/hypershift/kube-scheduler/kube-scheduler-config-configmap.yaml (140B) @@ -839,7 +839,7 @@ func etcdEtcdClusterYaml() (*asset, error) { return a, nil } -var _etcdEtcdOperatorClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x8d\xb1\x4e\xc4\x30\x10\x44\x7b\x7f\xc5\xfe\x40\x8c\xd2\x21\x77\x40\x41\x47\x11\x24\xfa\x8d\xbd\xc0\x92\xc4\x6b\xad\xd7\x29\x88\xf2\xef\xa7\xd3\xdd\x55\xa7\x5c\x39\x33\x7a\xf3\xb0\xf0\x17\x69\x65\xc9\x01\x74\xc4\xe8\xb1\xd9\xaf\x28\xff\xa3\xb1\x64\x3f\x3d\x57\xcf\xf2\xb4\xf6\x23\x19\xf6\x6e\xe2\x9c\x02\xbc\xcd\xad\x1a\xe9\x20\x33\xbd\x72\x4e\x9c\x7f\xdc\x42\x86\x09\x0d\x83\x03\xc8\xb8\x50\x00\xb2\x98\x3a\x29\xa4\x68\xa2\x4e\x65\xa6\x81\xbe\xcf\x33\x16\x7e\x57\x69\xe5\x81\xcf\x01\xdc\x99\x0e\x8e\x6b\x1b\xff\x28\x5a\x0d\xae\xbb\x32\x9f\xa4\x2b\x47\x7a\x89\x51\x5a\xb6\x03\xec\xd2\xd6\x82\x91\x02\x6c\x1b\xf8\x8f\x5b\x84\x7d\x77\xa7\x00\x00\x00\xff\xff\x68\xf2\xac\x10\x15\x01\x00\x00") +var _etcdEtcdOperatorClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x8d\xb1\x6e\xc3\x30\x0c\x44\x77\x7d\x05\x7f\xc0\x2a\xba\x15\xda\xda\x0e\xdd\x3a\xb8\x40\x77\x5a\x62\x1b\xc6\xb6\x28\x50\x94\x87\x18\xfe\xf7\x20\x48\x32\x05\xce\x78\x77\x78\xf7\xb0\xf0\x2f\x69\x65\xc9\x01\x74\xc0\xe8\xb1\xd9\x41\x94\x4f\x68\x2c\xd9\x8f\x6f\xd5\xb3\xbc\x2c\xaf\x6e\xe4\x9c\x02\x7c\x4e\xad\x1a\x69\x2f\x13\x7d\x70\x4e\x9c\xff\xdd\x4c\x86\x09\x0d\x83\x03\xc8\x38\x53\x00\xb2\x98\x3a\x29\xa4\x68\xa2\x4e\x65\xa2\x9e\xfe\x2e\x33\x16\xfe\x52\x69\xe5\x89\xca\x01\x3c\x98\x76\x8e\x6b\x1b\x8e\x14\xad\x06\xd7\xdd\x98\x1f\xd2\x85\x23\xbd\xc7\x28\x2d\xdb\x0e\x76\x6d\x6b\xc1\x48\x01\xd6\x15\xfc\xf7\x3d\xc2\xb6\xb9\x73\x00\x00\x00\xff\xff\x9d\xba\xd3\xf1\x10\x01\x00\x00") func etcdEtcdOperatorClusterRoleBindingYamlBytes() ([]byte, error) { return bindataRead( @@ -854,12 +854,12 @@ func etcdEtcdOperatorClusterRoleBindingYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role-binding.yaml", size: 277, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x80, 0x8, 0xef, 0xaa, 0xbf, 0xd, 0x2b, 0x81, 0x6c, 0x9, 0xfa, 0xc, 0x13, 0x90, 0x98, 0xae, 0x2, 0x59, 0x14, 0x3b, 0x1d, 0x91, 0x77, 0x3, 0xd0, 0x70, 0x40, 0xcd, 0x30, 0xd6, 0x4c, 0xee}} + info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role-binding.yaml", size: 272, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x9d, 0x48, 0x75, 0x9b, 0xcd, 0xb, 0x2, 0x44, 0xcf, 0x36, 0xc3, 0xf1, 0xd2, 0xb7, 0xa5, 0x56, 0x3c, 0x19, 0x52, 0x60, 0xd9, 0x6, 0x4c, 0x46, 0x3b, 0xe7, 0x66, 0xcd, 0x5c, 0x5a, 0x95, 0xef}} return a, nil } -var _etcdEtcdOperatorClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x91\xbd\x6e\xdc\x40\x0c\x84\x7b\x3d\x05\x71\xe9\x02\x9c\x02\x23\x4d\xa0\x36\x45\x9a\x54\xb1\x91\x9e\xda\x9d\xb3\x89\xd3\x2e\x17\x24\x57\xf9\x79\xfa\x40\xa7\xcb\x0f\x7c\x01\xec\x92\xc4\x47\xce\x70\xc8\x4d\xbe\xc2\x5c\xb4\x4e\x64\x33\xa7\x91\x7b\x3c\xa9\xc9\x4f\x0e\xd1\x3a\x9e\x3f\xf8\x28\xfa\x6e\xbd\x9b\x11\x7c\x37\x9c\xa5\xe6\x89\x3e\x2e\xdd\x03\xf6\x45\x17\x0c\x05\xc1\x99\x83\xa7\x81\xa8\x72\xc1\x44\x88\x94\x8f\xda\x60\x1c\x6a\x83\xf5\x05\x3e\x0d\x47\xe2\x26\x9f\x4c\x7b\xf3\x8d\x3c\x5e\xa8\x71\x1b\x9c\xd9\x31\x26\x35\xa8\x8f\x49\xcb\x40\x64\x70\xed\x96\xf0\x0f\x99\x76\x45\xff\xd3\x98\x39\x9d\x7b\xfb\x5b\x1b\x3c\xd4\xb0\x35\x56\xd8\x7c\x1d\x3d\xbc\x3d\xdc\x2a\x73\x13\x7c\x0f\xd4\xed\x66\xbf\x1e\x78\xab\x9a\xba\x87\x96\xdf\xcd\x8c\x93\x54\xd9\x12\x79\x8d\xc2\xe1\x70\xbb\xaf\x69\xde\xdd\x3a\x6c\x95\x84\xab\xf5\x9a\x9b\x4a\x8d\xbd\x6a\xdb\x23\x3c\x50\x63\xd5\xa5\x17\xa4\x85\xa5\x5c\xc1\x15\x3b\xf5\xf2\x75\x97\x54\x9e\xa9\x67\xb4\x45\x7f\x94\xff\xef\x78\x43\x0f\x4f\xa0\x93\x2e\x8b\x7e\x93\xfa\xb8\xd9\x28\xe2\x97\x78\x28\x71\xa5\x19\x64\x28\xba\x22\x93\x9c\xa8\x6a\x50\xf7\x8d\xbb\x7f\x4f\xfb\x1b\x88\x6b\xa6\x87\xcf\xf7\xaf\x4b\xc2\x91\x0c\xcf\x7d\x3c\x22\x86\x5f\x01\x00\x00\xff\xff\x57\xc2\xf0\x2f\x8b\x02\x00\x00") +var _etcdEtcdOperatorClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x91\x3f\x6f\x1b\x31\x0c\xc5\xf7\xfb\x14\xc4\x75\x2b\xe0\x2b\x8a\x2e\xc5\xad\x1d\xba\x64\x8a\x8d\xec\x3c\x89\xb6\x09\x4b\xa2\x40\x4a\x97\x3f\x9f\x3e\x90\xef\xf2\x07\x76\x80\x78\x24\xf1\x23\xdf\xe3\x23\x66\x7e\x20\x35\x96\x34\x82\x4e\xe8\x06\xac\xe5\x28\xca\x2f\x58\x58\xd2\x70\xfa\x6b\x03\xcb\xaf\xf9\x77\x77\xe2\xe4\x47\xf8\x17\xaa\x15\xd2\x7b\x09\xd4\x45\x2a\xe8\xb1\xe0\xd8\x01\x24\x8c\x34\x02\x15\xe7\x37\x92\x49\xb1\x88\x76\x5a\x03\xd9\xd8\x6d\x00\x33\xff\x57\xa9\xd9\x1a\xb9\x39\x53\x43\x1b\x9c\xd0\x68\x70\xa2\x24\x36\x38\x89\x1d\x80\x92\x49\x55\x47\x9f\x48\xb7\x28\xda\x7b\x63\x42\x77\xaa\xf9\xa3\x56\xb2\x22\x4a\xad\x31\x93\x4e\xeb\x68\xff\xb3\xbf\x56\xc6\xcc\xf4\x54\x28\xb5\x73\x6d\xbd\xed\x5a\xd5\x55\x2b\x12\xdf\x9a\x9e\xf6\x9c\xb8\x85\x71\x8b\x42\xdf\x5f\xef\xcb\xe2\x17\xb7\x46\x3a\xb3\xa3\xd5\x7a\xf2\x59\x38\x95\xa5\xca\xed\x07\x56\x28\x95\x59\x42\x8d\xe4\x02\x72\x5c\xc1\x99\x16\xea\xfb\xeb\xce\xa9\x5c\xa8\x7b\xca\x41\x9e\xe3\xd7\x3b\x7e\xc0\xee\x48\xb0\x97\x10\xe4\x91\xd3\xa1\xd9\x88\x6c\xe7\x78\xc0\x61\x82\x89\x40\x29\xca\x4c\x1e\x78\x0f\x49\x0a\x54\x6b\xdc\xf6\x0f\x2c\x6f\x00\x4c\x1e\x76\x77\xdb\xdb\x92\x30\x72\x4a\x97\x3e\x0e\x54\xba\xd7\x00\x00\x00\xff\xff\x76\x23\xaa\xf0\x86\x02\x00\x00") func etcdEtcdOperatorClusterRoleYamlBytes() ([]byte, error) { return bindataRead( @@ -874,8 +874,8 @@ func etcdEtcdOperatorClusterRoleYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role.yaml", size: 651, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x73, 0x9e, 0x1b, 0x8, 0x5b, 0xe6, 0xf2, 0x28, 0x3f, 0xb4, 0xb7, 0x37, 0xdc, 0x10, 0x4f, 0xab, 0x3c, 0x48, 0x1a, 0xd2, 0xcf, 0xbb, 0x8, 0xc9, 0x45, 0x9a, 0xa7, 0xe8, 0x48, 0xab, 0x58, 0xcb}} + info := bindataFileInfo{name: "etcd/etcd-operator-cluster-role.yaml", size: 646, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x3a, 0xd3, 0xd8, 0x97, 0xce, 0x24, 0xc3, 0x77, 0xfb, 0x80, 0xc4, 0x2b, 0xd5, 0xd7, 0x8b, 0xab, 0x20, 0x51, 0xbb, 0x2c, 0xe8, 0xdf, 0xbf, 0xe3, 0x11, 0xe9, 0x5a, 0x74, 0xfb, 0xc4, 0x1c, 0xff}} return a, nil } @@ -1359,7 +1359,7 @@ func kubeControllerManagerKubeControllerManagerConfigmapYaml() (*asset, error) { return a, nil } -var _kubeControllerManagerKubeControllerManagerDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x56\x3d\x6f\xe3\x48\x0c\xed\xfd\x2b\x08\xf5\xb2\x37\xb8\x4e\xc0\x15\x41\x9c\x03\x82\xdd\x04\x41\xb2\xb9\xe6\x70\x05\x2d\x51\xf2\xc0\xf3\x15\xce\x8c\x37\x5a\xc3\xff\xfd\x30\x92\x25\x4b\xfe\x88\xb3\x69\x0e\x58\x35\x89\x38\xe4\x23\xf9\xf8\x86\xf2\x4a\xe8\x22\x83\x39\x59\x69\x6a\x45\xda\x4f\xd0\x8a\xbf\x89\x9d\x30\x3a\x03\xb4\xd6\xcd\xd6\x57\x13\x45\x1e\x0b\xf4\x98\x4d\x00\x34\x2a\xca\x60\x15\x16\x94\xe6\x46\x7b\x36\x52\x12\xa7\x0a\x35\x56\xc4\x13\x67\x29\x8f\x5e\x4c\x56\x8a\x1c\x5d\x06\x9b\x0d\x4c\x9f\x76\x6f\xb0\xdd\x4e\x00\x9c\x67\xf4\x54\xd5\xd1\x0f\xc0\xd7\x96\x32\x78\x32\x52\x0a\x5d\xbd\xd8\x02\x3d\x35\x76\x1e\x5a\x5a\x57\x00\x85\x6f\xcf\x81\x2b\xca\xe0\x8f\xbd\xe5\x45\xe3\x1a\x85\xc4\x85\xa4\x0c\xae\x62\x02\x92\x94\x7b\xc3\x6d\x94\x42\x9f\x2f\xbf\xe1\x82\xa4\xeb\x60\xd0\xda\xf3\x2d\x00\x78\x52\x56\xf6\x59\x87\xcd\xc7\x47\x8e\xa0\x2e\x82\xb5\x4f\x2e\x83\xf3\xc4\x77\xf3\x0c\x92\xc8\xc8\x4d\xf7\x0e\xdb\x6d\x32\xd9\x6c\x40\x94\x91\x26\xe7\x91\xfd\x1c\x3d\xb5\x4c\x35\xf0\x5a\x1b\x8f\x5e\x18\x3d\xc8\x69\x2c\x69\xb7\x14\xa5\x9f\x0a\x33\xe3\x36\x8c\x8a\x6b\xbf\x43\x1f\x03\x35\xf8\xa4\x8b\x0e\xb3\x9b\x51\xc3\xbe\x91\xc4\x87\xe8\x29\xac\xa8\xce\x20\x51\x41\x7a\x91\xe2\xcf\xf4\x87\xe1\x15\x71\xd2\x3b\x34\x05\x30\x46\x8a\x21\xb9\x7d\x0d\x28\x87\x67\x6b\x94\x81\x32\x48\x3c\x07\x1a\xda\xa9\x2c\x29\xf7\x19\x3c\x98\xe7\x7c\x49\x45\x90\xd4\xb5\x58\x96\x42\x0b\x5f\xef\x2b\xb0\xa6\xb8\x3e\x32\x02\x58\xa6\x92\x98\xa9\x98\x07\x16\xba\xda\xc1\x08\x5d\xdd\x55\xda\xf4\xe6\xdb\x37\xca\x43\x6c\x69\x18\x1a\xbb\xfa\x41\xa2\x5a\xfa\x0c\xae\xbe\x7c\x19\x9d\x8c\xf2\x7d\x27\x56\xd9\xc1\xf1\x6e\xe8\xcf\x23\x5d\x8d\x9f\x46\x65\xb7\x6f\x96\xc9\xb9\x31\x9b\xe3\x1a\x1a\x66\x7b\x35\x9c\x74\x1a\xb2\x7b\xa7\xcf\xb8\x34\x24\xbb\x0c\xfe\x39\x96\xd3\xbf\x47\x21\xde\x58\x23\x4d\x55\x7f\x6d\xc6\x1a\xb5\xca\x9a\x3c\xb9\xa8\x9e\xa5\x71\x3e\xde\xe9\x64\x44\xbe\xf6\xe2\xd4\x00\x98\x5e\x83\xf8\x34\xff\x17\x48\xfc\x08\x85\x3b\x02\xd1\xda\x93\xbc\x5c\x24\x6e\x4f\xdb\x99\x1b\x7b\xc4\xde\xaf\x71\xf7\xdb\x34\x5a\xa2\x90\x81\x29\x2d\x8c\x42\xa1\xa7\x0b\xf2\x38\x1d\x37\xff\xd3\xe8\xbe\x71\x0c\xde\x28\x13\xb4\x7f\x26\x5e\x8b\x9c\xae\xf3\x3c\xbe\x7d\x37\x2b\xd2\x19\x94\x28\x1d\x75\x4b\xee\x1e\xa3\x52\x1f\x59\x18\x16\xbe\xbe\x91\xe8\xdc\x7e\xd9\xd9\xa1\xf9\xa1\xf9\xd2\x44\x79\x9f\x89\x19\xaf\x35\x80\xd8\x24\x0a\x4d\xdc\x33\x9a\x5e\xf8\x5c\x75\xbd\x0b\x85\x55\x9b\xab\xf9\xef\x2f\xc3\x90\x2c\x6b\x4b\x1c\x03\x93\x7d\x86\x98\x43\x29\xd4\xc5\x70\x59\xf6\x8e\xc3\x05\x7a\x21\x21\x72\x35\x5a\xb8\x49\x9a\xf6\x3b\x3d\xc6\x95\xa2\xfa\x73\x46\x3e\x9f\xed\x39\x9f\xe5\xaa\x3d\x98\xb5\x7f\xa6\x35\xaa\xc1\xde\x6d\x30\xa2\xf7\x99\x68\x47\x39\x93\x9f\xed\x3d\xfa\xcf\xce\xd7\xb0\xa0\x9b\xbe\xd4\xfb\xb6\xd2\x27\x72\x26\x70\x4e\x6e\xd8\x3c\x77\xc6\x6c\xb3\x01\x46\x5d\xd1\x07\xa2\xf7\xae\x9d\xf5\x89\x5e\x03\x39\x3f\x44\x6e\x57\x0b\x39\xdf\xfe\x62\x88\x65\xdd\x3c\xbe\x8c\x3d\x00\x72\x1b\x5a\x41\xb4\x67\xfd\xfc\x3b\x69\x91\x32\x5c\x1f\x06\xa9\xc6\xba\x13\x52\xe7\x31\x0c\xed\xff\x39\x28\xf3\x9b\x50\xe2\xa0\x48\x19\x4d\xff\x67\x89\x3b\xbd\x1f\x2a\x1f\x60\x6d\x64\x50\x74\x1f\x6f\xdd\x48\x58\xcd\xad\x7c\x44\xbf\xcc\xe0\x9c\x9e\x06\xa5\xb4\xb7\xe5\xe8\xe0\x7d\x98\x33\x20\xbf\x00\xd1\x6a\xf3\x08\xe2\xc0\x3c\x86\x58\x23\xcf\x38\xe8\x01\xcc\x71\x09\xc4\xbe\x10\xfc\x0e\x80\x34\xd5\xec\xd2\x55\xed\xd0\xa4\xa9\xf6\x29\xe2\x2f\x22\xa1\xab\xb9\xe0\x0f\x23\xb5\x13\x1a\xac\xa6\xb6\xbd\xe1\xf2\x6f\x2d\x0f\x1f\x5a\x59\x27\x28\x4a\x77\xa4\xdf\xa3\xcd\x8e\xca\x3f\x83\x97\x1e\xcc\xe9\xa4\x02\x3e\x03\x7c\x88\x38\xc6\x23\x65\x7d\xdd\xb0\xb7\xd9\x4e\xce\xf2\xfc\xae\x5f\x37\xdd\xff\x02\x00\x00\xff\xff\xb3\x82\xa7\xdb\xc2\x0c\x00\x00") +var _kubeControllerManagerKubeControllerManagerDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x57\x4d\x6f\xdb\x38\x13\xbe\xe7\x57\x10\xc6\x7b\x7a\x01\xc6\x49\x8b\xee\x2e\x04\xf8\x50\x24\xe9\x22\x68\x53\x04\x49\xbb\x97\xc5\x1e\x18\x6a\x24\x13\xa6\x48\x66\x38\x74\xad\x06\xf9\xef\x0b\x8a\x96\xad\x2f\xc7\xfd\x58\x60\x81\xf5\xc5\xd2\x70\xe6\x99\x99\x87\xc3\xe1\x68\xa5\x4c\x9e\xb1\x4b\x70\xda\xd6\x15\x18\x3a\x11\x4e\xfd\x01\xe8\x95\x35\x19\x13\xce\xf9\xf9\xfa\xfc\xa4\x02\x12\xb9\x20\x91\x9d\x30\x66\x44\x05\x19\x5b\x85\x07\xe0\xd2\x1a\x42\xab\x35\x20\xaf\x84\x11\x25\xe0\x89\x77\x20\xa3\x16\x82\xd3\x4a\x0a\x9f\xb1\xa7\x27\x76\x7a\xb7\x7d\x63\xcf\xcf\x27\x8c\x79\x42\x41\x50\xd6\x51\x8f\x31\xaa\x1d\x64\xec\xce\x6a\xad\x4c\xf9\xd9\xe5\x82\xa0\x91\x63\x57\x92\x54\x19\xab\xc4\xe6\x3e\x60\x09\x19\x7b\xbd\x97\x7c\x36\x62\x2d\x94\x16\x0f\x1a\x32\x76\x1e\x1d\x80\x06\x49\x16\x93\x55\x25\x48\x2e\x3f\x88\x07\xd0\xbe\x85\x11\xce\x1d\x4e\x81\x31\x82\xca\xe9\x9d\xd7\x6e\xf2\xf1\xa7\x7b\x50\x47\xc1\xd2\x4f\xea\xe0\x09\xf0\xfa\x32\x63\xb3\xc8\xc8\x45\xfb\xce\x9e\x9f\x67\x27\x4f\x4f\x4c\x15\x91\x26\x4f\x02\xe9\x52\x10\x24\xa6\x1a\x78\x63\x2c\x09\x52\xd6\x74\x7c\x5a\x07\xc6\x2f\x55\x41\xa7\xca\xce\x31\x99\x41\xfe\x96\xb6\xe8\x7d\xa0\x06\x1f\x4c\xde\x62\xb6\x7b\xd4\xb0\x6f\x35\xe0\x10\x9d\xb3\x15\xd4\x19\x9b\x55\x41\x93\xe2\xe2\x2b\xff\x62\x71\x05\x38\xdb\x29\x34\x01\xa0\x88\x14\xb3\xd9\xd5\x63\x10\xba\xbb\xb6\x16\x3a\x40\xc6\x66\x84\x01\xba\x72\x28\x0a\x90\x94\xb1\x8f\xf6\x5e\x2e\x21\x0f\x1a\xda\x14\x8b\x42\x19\x45\xf5\x3e\x02\x67\xf3\xb7\x23\x21\x63\x0e\xa1\x00\x44\xc8\x2f\x03\x2a\x53\x6e\x61\x94\x29\xaf\x4b\x63\x77\xe2\xab\x0d\xc8\x10\x53\xea\x9a\xc6\xac\xbe\x80\x2a\x97\x94\xb1\xf3\xb3\xb3\xde\x4a\xcf\xdf\x27\xc0\x2a\x1b\x2c\x6f\x37\xfd\xbe\x57\x57\xfd\x5f\x53\x65\x57\x1b\x87\xe0\x7d\x9f\xcd\x7e\x0c\x0d\xb3\xbb\x6a\x98\x54\xea\xb2\x7b\x6d\x0e\xa8\x34\x24\xfb\x8c\xfd\x39\x2e\xa7\xbf\x46\x26\x64\x9d\xd5\xb6\xac\xdf\x37\xdb\x1a\x6b\x15\x0d\x10\xf8\x58\x3d\x4b\xeb\x29\x9e\xe9\x59\x8f\x7c\x43\x6a\x6a\x03\x10\x1e\x83\xfa\x61\xfe\x8f\x90\xf8\x2d\x14\x6e\x09\x14\xce\x4d\xf2\x72\x94\xb8\x3d\x6d\x07\x4e\xec\x88\xbd\xef\xe3\xee\x3f\x93\x68\x21\x94\x0e\x08\x3c\xb7\x95\x50\xe6\xf4\x01\x48\x9c\xf6\x93\xff\x6a\xcd\x2e\x71\x11\xc8\x56\x36\x18\xba\x07\x5c\x2b\x09\x6f\xa5\x8c\x6f\x9f\xec\x0a\x4c\xc6\x0a\xa1\x3d\xb4\x4d\xee\x46\xc4\x4a\xbd\x45\x65\x51\x51\x7d\xa1\x85\xf7\xfb\x66\xe7\xba\xe2\x8f\xcd\x4d\x13\xcb\xfb\x80\x4d\xbf\xad\x31\x16\x93\x14\xca\x00\xee\x18\xe5\x47\xae\xab\x36\x77\x55\x89\x32\xf9\x6a\x9e\xde\x59\x64\xb3\x65\xed\x00\xa3\xe1\x6c\xef\x21\xfa\xa8\x2a\x61\xf2\x6e\xb3\xdc\x29\x76\x1b\xe8\x11\x87\x02\xcb\x5e\xc3\x9d\x71\xbe\xeb\xe9\xd1\xae\x50\xe5\x62\x0e\x24\xe7\x7b\xce\xe7\xb2\x4a\x0b\xf3\xf4\x77\x5a\x8b\xaa\xd3\x77\x1b\x8c\xa8\x7d\xc0\xda\x83\x44\xa0\xf9\x5e\x63\x60\x2a\x02\x2d\xc1\x90\x92\xcd\x6d\xf0\xb3\x48\x16\xd5\xd7\x9f\x07\xd2\xda\x4a\x41\xc0\x8d\xcd\x81\x4b\x95\xa3\x5f\xf4\x2f\x95\x46\x4d\x02\x12\xcf\x15\x2e\xe6\x6b\x81\x73\x0c\xa6\xe3\x63\xa8\x9a\xfa\x64\x83\xb5\x88\x95\x75\x6b\xf3\x8b\xeb\xcb\xbb\xe6\x96\x9c\xd4\xf4\xaa\x34\xca\x94\xc9\x49\xa1\x34\x1c\xca\xa2\x6b\x00\x78\x2a\x91\x8e\x20\xae\xa0\xfe\x1e\xc0\x15\xd4\x43\xc0\x86\xb3\x78\x48\xa5\xb6\x21\xe7\x68\x03\x81\x5f\x34\xa7\x6d\xac\xba\xad\x44\xbf\xf8\xff\x0b\x6b\x9c\x68\x58\x52\xbd\xe5\x07\x6b\x29\x8e\x6f\x2e\x05\xf5\x22\x52\x3c\xfb\x52\x83\x18\xeb\x81\x89\xb3\x1a\xcf\x6b\x23\x2a\x25\xb9\x43\xbb\x56\xb1\x11\x2a\x53\x4e\xed\x6f\xa1\x61\xc3\xd7\x56\x87\x0a\xb8\xd3\xa1\x54\x26\xed\xf6\x80\xb6\xf8\xa8\x81\xb6\x2a\x7e\x9e\x2c\xe6\xb0\x01\x39\x71\x4a\xb8\x70\x8a\x3f\x04\xf4\xb4\x78\x7d\x76\x76\x48\xe1\xd1\xf9\xc5\xf9\x9b\xe1\xb2\x06\x91\x03\xf2\xa6\xbf\x73\x04\x6f\x03\x4a\xe0\xda\xca\xd5\x22\xed\x49\x25\xdc\xb0\xf2\xba\x36\x53\x49\x0e\x30\x09\x6b\xee\x00\x95\xcd\x17\xaf\x87\x50\xce\x22\x2d\x86\x31\xa1\xb5\xc4\xa5\x98\xae\xa8\x6d\xdf\xd8\xea\x4c\xd4\xa6\x07\x19\xeb\xa8\x41\x3e\x3f\x7b\xf5\xe6\xd7\xd1\x7a\xd3\xd6\xb9\x48\x7d\x9d\x3b\x54\xeb\x78\x30\x8f\xd5\xf0\xc0\x6e\xa2\x88\x5b\x8d\xb6\xda\x95\xe3\x28\x4c\x09\xcd\xe9\xdc\xde\x26\xd3\x27\x34\x78\x18\xc5\x25\x11\xf2\xd8\xc4\x84\x9e\xec\x14\xb0\x89\x9c\xc6\xcf\x1c\xa1\x47\xe7\x31\x0f\x69\x10\x5e\xbc\xfa\xe5\xd5\x6f\x67\xcb\x66\x6a\x6e\x42\x61\xff\x2b\x40\x50\x40\xf8\x3d\xce\xd3\xd9\x82\x9d\x5e\x42\x21\x82\xa6\x77\x7b\xb1\xef\xde\x11\xa9\x6a\xd3\x22\x2f\xe3\x6a\xcc\xa6\x87\xd2\x9f\xca\x0f\x7b\xba\xda\x10\x8a\x7f\xd2\x4f\xbc\x82\xdf\x87\x07\xb8\xd8\x9d\xd5\x9b\x74\x35\xdd\x6d\xeb\xb8\xe7\xa1\x2d\x6e\x9f\xed\x42\x3c\x6e\xbd\x57\x6d\xa5\x77\xf0\x18\xc0\x53\x17\x39\xcd\x92\xe0\x29\x7d\x22\xc6\xb0\x2e\x6e\x3f\xf7\x35\x18\x93\x2e\xa4\x09\x20\xad\xed\x32\x69\x67\x09\xa8\x2c\xd6\x43\xa3\xaa\x91\x6e\x27\x87\x56\xa3\x6b\xba\x7b\x18\x84\xf9\x41\x55\x6a\x10\xa4\x8e\xa2\x7f\x33\xc4\xfd\xce\xf5\x46\x1d\xc6\x52\x7b\xbb\x89\x65\xdf\x9b\x24\x9a\x31\xec\x56\xd0\x32\x63\x87\x06\x88\x4e\x28\x69\x3c\x1a\x2d\xbc\x0c\x73\x00\xe4\x3b\x20\x52\x7b\x18\x41\x0c\xc4\x7d\x88\xf1\xe5\x3e\x0e\x01\x90\x72\x85\x2f\x00\x68\x5b\xce\x8f\xcd\x66\x2d\x9a\xb6\xe5\xde\x45\xfc\x04\x56\xa6\xbc\x54\xf8\xcd\x48\x69\x87\x3a\xb3\x68\x4a\xaf\x3b\xed\x27\xc9\xc7\x6f\x9a\x51\x27\x28\xe2\x5b\xd2\x6f\x84\xcb\x46\xe1\x1f\xc0\xe3\x83\x7d\x9a\xac\x80\x1f\x01\x1e\x22\xf6\xf1\xa0\x72\x54\x37\xec\x3d\x3d\x9f\x1c\xe4\xf9\x45\xbd\x76\x77\xff\x0e\x00\x00\xff\xff\xab\xf9\x5e\xc7\xb3\x12\x00\x00") func kubeControllerManagerKubeControllerManagerDeploymentYamlBytes() ([]byte, error) { return bindataRead( @@ -1374,8 +1374,8 @@ func kubeControllerManagerKubeControllerManagerDeploymentYaml() (*asset, error) return nil, err } - info := bindataFileInfo{name: "kube-controller-manager/kube-controller-manager-deployment.yaml", size: 3266, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} - a := &asset{bytes: bytes, info: info, digest: [32]uint8{0xab, 0xf6, 0x10, 0x93, 0x87, 0x20, 0x38, 0x2e, 0xf5, 0x54, 0xa8, 0x6d, 0x19, 0x7, 0xb5, 0xdd, 0x79, 0x1e, 0x8e, 0xdd, 0xfc, 0x80, 0xfc, 0x43, 0x1a, 0x4e, 0x93, 0x18, 0xd9, 0x5, 0x54, 0x88}} + info := bindataFileInfo{name: "kube-controller-manager/kube-controller-manager-deployment.yaml", size: 4787, mode: os.FileMode(0644), modTime: time.Unix(1, 0)} + a := &asset{bytes: bytes, info: info, digest: [32]uint8{0x6e, 0x8a, 0xa2, 0x27, 0x5d, 0x5f, 0x9e, 0x86, 0x6f, 0xf1, 0xd5, 0xe, 0xb, 0x74, 0xf8, 0xd8, 0xed, 0x84, 0x3e, 0x47, 0x7, 0x35, 0xed, 0x8f, 0x12, 0xfa, 0xba, 0x65, 0x25, 0xe2, 0xb5, 0x2f}} return a, nil } diff --git a/hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-deployment.yaml b/hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-deployment.yaml index 6113ed0e7052..c3ca5007bbbd 100644 --- a/hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-deployment.yaml +++ b/hypershift-operator/assets/controlplane/hypershift/kube-controller-manager/kube-controller-manager-deployment.yaml @@ -65,6 +65,38 @@ spec: args: - "--openshift-config=/etc/kubernetes/cmconfig/config.yaml" - "--kubeconfig=/etc/kubernetes/secret/kubeconfig" + - "--authentication-kubeconfig=/etc/kubernetes/secret/kubeconfig" + - "--authorization-kubeconfig=/etc/kubernetes/secret/kubeconfig" + - "--allocate-node-cidrs=true" + - "--cert-dir=/var/run/kubernetes" + - "--cluster-cidr={{ .PodCIDR }}" + - "--cluster-signing-cert-file=/etc/kubernetes/secret/cluster-signer.crt" + - "--cluster-signing-key-file=/etc/kubernetes/secret/cluster-signer.key" + - "--configure-cloud-routes=false" + - "--controllers=*" + - "--controllers=-ttl" + - "--controllers=-bootstrapsigner" + - "--controllers=-tokencleaner" + - "--enable-dynamic-provisioning=true" + - "--flex-volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec" + - "--kube-api-burst=300" + - "--kube-api-qps=150" + - "--leader-elect-resource-lock=configmaps" + - "--leader-elect=true" + - "--leader-elect-retry-period=3s" + - "--port=0" + - "--root-ca-file=/etc/kubernetes/config/root-ca.crt" + - "--secure-port=10257" + - "--service-account-private-key-file=/etc/kubernetes/secret/service-account.key" + - "--service-cluster-ip-range={{ .ServiceCIDR }}" + - "--use-service-account-credentials=true" + - "--experimental-cluster-signing-duration=26280h" +{{ range $featureGate := .DefaultFeatureGates }} + - "--feature-gates={{ $featureGate }}" +{{ end }} +{{ range $featureGate := .ExtraFeatureGates }} + - "--feature-gates={{ $featureGate }}" +{{ end }} {{ if .KubeControllerManagerResources }} resources:{{ range .KubeControllerManagerResources }}{{ range .ResourceRequest }} requests: {{ if .CPU }} From eaa39c1af38d10cbb84d0debba743044d39ffc5d Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Thu, 21 Jan 2021 10:37:07 -0600 Subject: [PATCH 2/3] config: update example cluster release image --- config/example-cluster/cluster.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/example-cluster/cluster.yaml b/config/example-cluster/cluster.yaml index fc62bb2e3fff..38cadd0e1bc7 100644 --- a/config/example-cluster/cluster.yaml +++ b/config/example-cluster/cluster.yaml @@ -4,7 +4,7 @@ metadata: name: example spec: release: - image: quay.io/openshift-release-dev/ocp-release:4.6.7-x86_64 + image: quay.io/openshift-release-dev/ocp-release:4.7.0-fc.3-x86_64 initialComputeReplicas: 2 serviceCIDR: 172.31.0.0/16 podCIDR: 10.132.0.0/14 @@ -13,4 +13,4 @@ spec: sshKey: name: ssh-key providerCreds: - name: provider-creds \ No newline at end of file + name: provider-creds From 7e948b37d4512d00e4e05bc5bd3dea7e023c6ba2 Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Thu, 21 Jan 2021 10:47:04 -0600 Subject: [PATCH 3/3] Makefile: make runtime switchable --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 76f4ab44bc9c..bd5891da53df 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,8 @@ DIR := ${CURDIR} IMG ?= hypershift:latest # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) CRD_OPTIONS ?= "crd:trivialVersions=true" +# Runtime CLI to use for building and pushing images +RUNTIME ?= docker CONTROLLER_GEN=GO111MODULE=on GOFLAGS=-mod=vendor go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen BINDATA=GO111MODULE=on GOFLAGS=-mod=vendor go run ./vendor/github.com/kevinburke/go-bindata/go-bindata @@ -79,11 +81,11 @@ vet: # Build the docker image docker-build: - docker build . -t ${IMG} + ${RUNTIME} build . -t ${IMG} # Push the docker image docker-push: - docker push ${IMG} + ${RUNTIME} push ${IMG} run-local: bin/hypershift-operator run