{"action":"created","comment":{"url":"https://api.github.com/repos/openshift/cluster-operator/pulls/comments/157316065","pull_request_review_id":83945876,"id":157316065,"diff_hunk":"@@ -47,109 +48,279 @@ type ClusterList struct {\n \tItems []Cluster\n }\n \n+// ClusterSpec is the specification of a cluster's hardware and configuration\n type ClusterSpec struct {\n-\t// MasterNodeGroup specificies the configuration of the master node group\n-\tMasterNodeGroup ClusterNodeGroup\n+\t// Hardware specifies the hardware that the cluster will run on\n+\tHardware ClusterHardwareSpec\n \n-\t// ComputeNodeGroups specify the configurations of the compute node groups\n+\t// Config specifies cluster-wide OpenShift configuration\n+\tConfig ClusterConfigSpec\n+\n+\t// MachineSets specifies the configuration of all machine sets for the cluster\n+\tMachineSets []ClusterMachineSet\n+}\n+\n+// ClusterHardwareSpec specifies hardware for a cluster. The specification will\n+// be specific to each cloud provider.\n+type ClusterHardwareSpec struct {\n \t// +optional\n-\tComputeNodeGroups []ClusterComputeNodeGroup\n+\t// AWSConfig specifies cluster hardware configuration on AWS\n+\tAWS *AWSClusterSpec\n+\n+\t// TODO: Add other cloud-specific Specs as needed\n }\n \n-type ClusterStatus struct {\n-\t// MasterNodeGroups is the number of actual master node groups that are\n-\t// active for the cluster\n-\tMasterNodeGroups int\n+// AWSClusterSpec contains cluster-wide configuration for a cluster on AWS\n+type AWSClusterSpec struct {\n+\t// AccountSeceret refers to a secret that contains the AWS account access\n+\t// credentials\n+\tAccountSecret corev1.LocalObjectReference\n+\n+\t// Region specifies the AWS region where the cluster will be created\n+\tRegion string\n \n-\t// ComputeNodeGroups is the number of actual compute node groups that are\n-\t// active for the cluster\n-\tComputeNodeGroups int\n+\t// +optional\n+\t// VPCName specifies the name of the VPC to associate with the cluster.\n+\t// If existing, it will not be created. If left blank, the VPC name will\n+\t// be derived from the cluster name.\n+\tVPCName string\n+\n+\t// VPCSubnet specifies the subnet to use for the cluster's VPC. Only used\n+\t// when a new VPC is created for the cluster\n+\tVPCSubnet string\n }\n \n-// ClusterNodeGroup is a node group defined in a Cluster resource\n-type ClusterNodeGroup struct {\n-\tSize int\n+// ClusterConfigSpec contains OpenShift configuration for a cluster\n+type ClusterConfigSpec struct {\n+\t// DeploymentType indicates the type of OpenShift deployment to create\n+\tDeploymentType string\n+\n+\t// OpenShiftVersion is the version of OpenShift to install\n+\tOpenshiftVersion string\n+\n+\t// SDNPluginName is the name of the SDN plugin to use for this install\n+\tSDNPluginName string","path":"pkg/apis/clusteroperator/types.go","position":77,"original_position":77,"commit_id":"bba7f95f823e59a647b2af5a9d1720d6247e0f8a","original_commit_id":"692621fba1516f0960c4ac154727485c8cee6304","user":{"login":"csrwng","id":5834976,"avatar_url":"https://avatars1.githubusercontent.com/u/5834976?v=4","gravatar_id":"","url":"https://api.github.com/users/csrwng","html_url":"https://github.com/csrwng","followers_url":"https://api.github.com/users/csrwng/followers","following_url":"https://api.github.com/users/csrwng/following{/other_user}","gists_url":"https://api.github.com/users/csrwng/gists{/gist_id}","starred_url":"https://api.github.com/users/csrwng/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/csrwng/subscriptions","organizations_url":"https://api.github.com/users/csrwng/orgs","repos_url":"https://api.github.com/users/csrwng/repos","events_url":"https://api.github.com/users/csrwng/events{/privacy}","received_events_url":"https://api.github.com/users/csrwng/received_events","type":"User","site_admin":false},"body":"Actually for this one I'm less sure of confining it to a predefined set of options. We would normally pick between `ovs-subnet` ,`ovs-multitenant` and `ovs-networkpolicy`. But we also support other plugins from upstream like flannel. I'll leave it as a string.","created_at":"2017-12-15T22:53:15Z","updated_at":"2017-12-15T22:53:15Z","html_url":"https://github.com/openshift/cluster-operator/pull/26#discussion_r157316065","pull_request_url":"https://api.github.com/repos/openshift/cluster-operator/pulls/26","author_association":"NONE","_links":{"self":{"href":"https://api.github.com/repos/openshift/cluster-operator/pulls/comments/157316065"},"html":{"href":"https://github.com/openshift/cluster-operator/pull/26#discussion_r157316065"},"pull_request":{"href":"https://api.github.com/repos/openshift/cluster-operator/pulls/26"}},"in_reply_to_id":157249352},"pull_request":{"url":"https://api.github.com/repos/openshift/cluster-operator/pulls/26","id":158614983,"html_url":"https://github.com/openshift/cluster-operator/pull/26","diff_url":"https://github.com/openshift/cluster-operator/pull/26.diff","patch_url":"https://github.com/openshift/cluster-operator/pull/26.patch","issue_url":"https://api.github.com/repos/openshift/cluster-operator/issues/26","number":26,"state":"open","locked":false,"title":"API Updates","user":{"login":"csrwng","id":5834976,"avatar_url":"https://avatars1.githubusercontent.com/u/5834976?v=4","gravatar_id":"","url":"https://api.github.com/users/csrwng","html_url":"https://github.com/csrwng","followers_url":"https://api.github.com/users/csrwng/followers","following_url":"https://api.github.com/users/csrwng/following{/other_user}","gists_url":"https://api.github.com/users/csrwng/gists{/gist_id}","starred_url":"https://api.github.com/users/csrwng/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/csrwng/subscriptions","organizations_url":"https://api.github.com/users/csrwng/orgs","repos_url":"https://api.github.com/users/csrwng/repos","events_url":"https://api.github.com/users/csrwng/events{/privacy}","received_events_url":"https://api.github.com/users/csrwng/received_events","type":"User","site_admin":false},"body":"Implements the current state of the API proposal\r\nRenames NodeGroup -> MachineSet, Node -> Machine","created_at":"2017-12-15T14:26:05Z","updated_at":"2017-12-15T22:53:15Z","closed_at":null,"merged_at":null,"merge_commit_sha":"31a0c23103033e9241e80b488ae33b7f539a3d5b","assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/openshift/cluster-operator/pulls/26/commits","review_comments_url":"https://api.github.com/repos/openshift/cluster-operator/pulls/26/comments","review_comment_url":"https://api.github.com/repos/openshift/cluster-operator/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openshift/cluster-operator/issues/26/comments","statuses_url":"https://api.github.com/repos/openshift/cluster-operator/statuses/bba7f95f823e59a647b2af5a9d1720d6247e0f8a","head":{"label":"csrwng:update_api","ref":"update_api","sha":"bba7f95f823e59a647b2af5a9d1720d6247e0f8a","user":{"login":"csrwng","id":5834976,"avatar_url":"https://avatars1.githubusercontent.com/u/5834976?v=4","gravatar_id":"","url":"https://api.github.com/users/csrwng","html_url":"https://github.com/csrwng","followers_url":"https://api.github.com/users/csrwng/followers","following_url":"https://api.github.com/users/csrwng/following{/other_user}","gists_url":"https://api.github.com/users/csrwng/gists{/gist_id}","starred_url":"https://api.github.com/users/csrwng/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/csrwng/subscriptions","organizations_url":"https://api.github.com/users/csrwng/orgs","repos_url":"https://api.github.com/users/csrwng/repos","events_url":"https://api.github.com/users/csrwng/events{/privacy}","received_events_url":"https://api.github.com/users/csrwng/received_events","type":"User","site_admin":false},"repo":{"id":113883384,"name":"cluster-operator","full_name":"csrwng/cluster-operator","owner":{"login":"csrwng","id":5834976,"avatar_url":"https://avatars1.githubusercontent.com/u/5834976?v=4","gravatar_id":"","url":"https://api.github.com/users/csrwng","html_url":"https://github.com/csrwng","followers_url":"https://api.github.com/users/csrwng/followers","following_url":"https://api.github.com/users/csrwng/following{/other_user}","gists_url":"https://api.github.com/users/csrwng/gists{/gist_id}","starred_url":"https://api.github.com/users/csrwng/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/csrwng/subscriptions","organizations_url":"https://api.github.com/users/csrwng/orgs","repos_url":"https://api.github.com/users/csrwng/repos","events_url":"https://api.github.com/users/csrwng/events{/privacy}","received_events_url":"https://api.github.com/users/csrwng/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/csrwng/cluster-operator","description":null,"fork":true,"url":"https://api.github.com/repos/csrwng/cluster-operator","forks_url":"https://api.github.com/repos/csrwng/cluster-operator/forks","keys_url":"https://api.github.com/repos/csrwng/cluster-operator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/csrwng/cluster-operator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/csrwng/cluster-operator/teams","hooks_url":"https://api.github.com/repos/csrwng/cluster-operator/hooks","issue_events_url":"https://api.github.com/repos/csrwng/cluster-operator/issues/events{/number}","events_url":"https://api.github.com/repos/csrwng/cluster-operator/events","assignees_url":"https://api.github.com/repos/csrwng/cluster-operator/assignees{/user}","branches_url":"https://api.github.com/repos/csrwng/cluster-operator/branches{/branch}","tags_url":"https://api.github.com/repos/csrwng/cluster-operator/tags","blobs_url":"https://api.github.com/repos/csrwng/cluster-operator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/csrwng/cluster-operator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/csrwng/cluster-operator/git/refs{/sha}","trees_url":"https://api.github.com/repos/csrwng/cluster-operator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/csrwng/cluster-operator/statuses/{sha}","languages_url":"https://api.github.com/repos/csrwng/cluster-operator/languages","stargazers_url":"https://api.github.com/repos/csrwng/cluster-operator/stargazers","contributors_url":"https://api.github.com/repos/csrwng/cluster-operator/contributors","subscribers_url":"https://api.github.com/repos/csrwng/cluster-operator/subscribers","subscription_url":"https://api.github.com/repos/csrwng/cluster-operator/subscription","commits_url":"https://api.github.com/repos/csrwng/cluster-operator/commits{/sha}","git_commits_url":"https://api.github.com/repos/csrwng/cluster-operator/git/commits{/sha}","comments_url":"https://api.github.com/repos/csrwng/cluster-operator/comments{/number}","issue_comment_url":"https://api.github.com/repos/csrwng/cluster-operator/issues/comments{/number}","contents_url":"https://api.github.com/repos/csrwng/cluster-operator/contents/{+path}","compare_url":"https://api.github.com/repos/csrwng/cluster-operator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/csrwng/cluster-operator/merges","archive_url":"https://api.github.com/repos/csrwng/cluster-operator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/csrwng/cluster-operator/downloads","issues_url":"https://api.github.com/repos/csrwng/cluster-operator/issues{/number}","pulls_url":"https://api.github.com/repos/csrwng/cluster-operator/pulls{/number}","milestones_url":"https://api.github.com/repos/csrwng/cluster-operator/milestones{/number}","notifications_url":"https://api.github.com/repos/csrwng/cluster-operator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/csrwng/cluster-operator/labels{/name}","releases_url":"https://api.github.com/repos/csrwng/cluster-operator/releases{/id}","deployments_url":"https://api.github.com/repos/csrwng/cluster-operator/deployments","created_at":"2017-12-11T16:41:19Z","updated_at":"2017-12-11T16:41:21Z","pushed_at":"2017-12-15T20:53:31Z","git_url":"git://github.com/csrwng/cluster-operator.git","ssh_url":"git@github.com:csrwng/cluster-operator.git","clone_url":"https://github.com/csrwng/cluster-operator.git","svn_url":"https://github.com/csrwng/cluster-operator","homepage":null,"size":32842,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":null,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"openshift:master","ref":"master","sha":"801f81e2c26e1c0c9de206a7abd827c7c8bca57a","user":{"login":"openshift","id":792337,"avatar_url":"https://avatars3.githubusercontent.com/u/792337?v=4","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"repo":{"id":113197161,"name":"cluster-operator","full_name":"openshift/cluster-operator","owner":{"login":"openshift","id":792337,"avatar_url":"https://avatars3.githubusercontent.com/u/792337?v=4","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openshift/cluster-operator","description":null,"fork":false,"url":"https://api.github.com/repos/openshift/cluster-operator","forks_url":"https://api.github.com/repos/openshift/cluster-operator/forks","keys_url":"https://api.github.com/repos/openshift/cluster-operator/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openshift/cluster-operator/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openshift/cluster-operator/teams","hooks_url":"https://api.github.com/repos/openshift/cluster-operator/hooks","issue_events_url":"https://api.github.com/repos/openshift/cluster-operator/issues/events{/number}","events_url":"https://api.github.com/repos/openshift/cluster-operator/events","assignees_url":"https://api.github.com/repos/openshift/cluster-operator/assignees{/user}","branches_url":"https://api.github.com/repos/openshift/cluster-operator/branches{/branch}","tags_url":"https://api.github.com/repos/openshift/cluster-operator/tags","blobs_url":"https://api.github.com/repos/openshift/cluster-operator/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openshift/cluster-operator/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openshift/cluster-operator/git/refs{/sha}","trees_url":"https://api.github.com/repos/openshift/cluster-operator/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openshift/cluster-operator/statuses/{sha}","languages_url":"https://api.github.com/repos/openshift/cluster-operator/languages","stargazers_url":"https://api.github.com/repos/openshift/cluster-operator/stargazers","contributors_url":"https://api.github.com/repos/openshift/cluster-operator/contributors","subscribers_url":"https://api.github.com/repos/openshift/cluster-operator/subscribers","subscription_url":"https://api.github.com/repos/openshift/cluster-operator/subscription","commits_url":"https://api.github.com/repos/openshift/cluster-operator/commits{/sha}","git_commits_url":"https://api.github.com/repos/openshift/cluster-operator/git/commits{/sha}","comments_url":"https://api.github.com/repos/openshift/cluster-operator/comments{/number}","issue_comment_url":"https://api.github.com/repos/openshift/cluster-operator/issues/comments{/number}","contents_url":"https://api.github.com/repos/openshift/cluster-operator/contents/{+path}","compare_url":"https://api.github.com/repos/openshift/cluster-operator/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openshift/cluster-operator/merges","archive_url":"https://api.github.com/repos/openshift/cluster-operator/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openshift/cluster-operator/downloads","issues_url":"https://api.github.com/repos/openshift/cluster-operator/issues{/number}","pulls_url":"https://api.github.com/repos/openshift/cluster-operator/pulls{/number}","milestones_url":"https://api.github.com/repos/openshift/cluster-operator/milestones{/number}","notifications_url":"https://api.github.com/repos/openshift/cluster-operator/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openshift/cluster-operator/labels{/name}","releases_url":"https://api.github.com/repos/openshift/cluster-operator/releases{/id}","deployments_url":"https://api.github.com/repos/openshift/cluster-operator/deployments","created_at":"2017-12-05T15:09:17Z","updated_at":"2017-12-05T15:27:42Z","pushed_at":"2017-12-15T20:10:41Z","git_url":"git://github.com/openshift/cluster-operator.git","ssh_url":"git@github.com:openshift/cluster-operator.git","clone_url":"https://github.com/openshift/cluster-operator.git","svn_url":"https://github.com/openshift/cluster-operator","homepage":null,"size":32800,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":6,"mirror_url":null,"archived":false,"open_issues_count":6,"license":null,"forks":6,"open_issues":6,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openshift/cluster-operator/pulls/26"},"html":{"href":"https://github.com/openshift/cluster-operator/pull/26"},"issue":{"href":"https://api.github.com/repos/openshift/cluster-operator/issues/26"},"comments":{"href":"https://api.github.com/repos/openshift/cluster-operator/issues/26/comments"},"review_comments":{"href":"https://api.github.com/repos/openshift/cluster-operator/pulls/26/comments"},"review_comment":{"href":"https://api.github.com/repos/openshift/cluster-operator/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openshift/cluster-operator/pulls/26/commits"},"statuses":{"href":"https://api.github.com/repos/openshift/cluster-operator/statuses/bba7f95f823e59a647b2af5a9d1720d6247e0f8a"}},"author_association":"NONE"}}
{"actor":{"display_login":"csrwng"}}