chore: update api and framework

Relates to halkyonio/operator-framework#15

go.mod

@@ -34,8 +34,8 @@ require (
 	go.uber.org/zap v1.13.0 // indirect
 	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
 	google.golang.org/api v0.15.0 // indirect
-	halkyon.io/api v1.0.0-rc.4.0.20200217221003-af8973318c2d
-	halkyon.io/operator-framework v1.0.0-beta.4.0.20200219111755-1e5b655e240f
+	halkyon.io/api v1.0.0-rc.4.0.20200219202646-b6b4240cae21
+	halkyon.io/operator-framework v1.0.0-beta.4.0.20200219203102-d2e8cd7fe849
 	k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
 	k8s.io/apimachinery v0.17.0
 	k8s.io/client-go v11.0.1-0.20190805182715-88a2adca7e76+incompatible

go.sum

@@ -527,10 +527,10 @@ gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-halkyon.io/api v1.0.0-rc.4.0.20200217221003-af8973318c2d h1:2SLqodMYtNPElZbt509SQ8MvNiX2VxySPHE9o3MYaBk=
-halkyon.io/api v1.0.0-rc.4.0.20200217221003-af8973318c2d/go.mod h1:bCOZh54+rJ4SQad0L0OMO0B+Jf7J3OtKp7SPmdLowGE=
-halkyon.io/operator-framework v1.0.0-beta.4.0.20200219111755-1e5b655e240f h1:LDdPWWgBD/Sh0tXdSrqqX0TRlu2Vrv51XACOxeDGUt0=
-halkyon.io/operator-framework v1.0.0-beta.4.0.20200219111755-1e5b655e240f/go.mod h1:++1+dHw3RnGlkZoly0UdzncWABnXfUhUbob6frH5PIw=
+halkyon.io/api v1.0.0-rc.4.0.20200219202646-b6b4240cae21 h1:8MBUVG97IYFSCqH1mk8mDU+p9OhcnbOPRSFoqBV/nGs=
+halkyon.io/api v1.0.0-rc.4.0.20200219202646-b6b4240cae21/go.mod h1:bCOZh54+rJ4SQad0L0OMO0B+Jf7J3OtKp7SPmdLowGE=
+halkyon.io/operator-framework v1.0.0-beta.4.0.20200219203102-d2e8cd7fe849 h1:DcYTElsk/ghv6sPfwZuVqEv0joBH1kMhINV81LePrUU=
+halkyon.io/operator-framework v1.0.0-beta.4.0.20200219203102-d2e8cd7fe849/go.mod h1:wxvHDC6ymM+F3NnPnPHPZL4ghIWPX9FkXEVSGTFRT0M=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

pkg/controller/capability/capability.go

@@ -54,7 +54,7 @@ func (in *Capability) Init() bool {
 	return false
 }
 
-func (in *Capability) GetAsHalkyonResource() v1beta1.HalkyonResource {
+func (in *Capability) GetUnderlyingAPIResource() framework.SerializableResource {
 	return in.Capability
 }
 

pkg/controller/component/component.go

@@ -219,7 +219,7 @@ func (in *Component) Init() bool {
 	return false
 }
 
-func (in *Component) GetAsHalkyonResource() v1beta1.HalkyonResource {
+func (in *Component) GetUnderlyingAPIResource() framework.SerializableResource {
 	return in.Component
 }
 
@@ -244,8 +244,8 @@ func (in *Component) ShouldDelete() bool {
 	return true
 }
 
-func (in *Component) Owner() v1beta1.HalkyonResource {
-	return in.Component
+func (in *Component) Owner() framework.SerializableResource {
+	return in.GetUnderlyingAPIResource()
 }
 
 func (in *Component) GetRoleName() string {

pkg/controller/component/names.go

@@ -2,7 +2,7 @@ package component
 
 import (
 	halkyon "halkyon.io/api/component/v1beta1"
-	"halkyon.io/api/v1beta1"
+	framework "halkyon.io/operator-framework"
 )
 
 func PVCName(c *halkyon.Component) string {
@@ -13,10 +13,10 @@ func PVCName(c *halkyon.Component) string {
 	return "m2-data-" + c.Name // todo: use better default name?
 }
 
-func ServiceAccountName(owner v1beta1.HalkyonResource) string {
+func ServiceAccountName(owner framework.SerializableResource) string {
 	return "build-bot"
 }
 
-func TaskName(owner v1beta1.HalkyonResource) string {
+func TaskName(owner framework.SerializableResource) string {
 	return "s2i-buildah-push"
 }