chore: update api and framework

Relates to halkyonio/operator-framework#15
halkyonio · Feb 19, 2020 · deefbeb · deefbeb
1 parent 777b790
commit deefbeb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -10,8 +10,8 @@ require (
 	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/prometheus/client_golang v1.4.1 // indirect
 	go.uber.org/zap v1.13.0 // indirect
-	halkyon.io/api v1.0.0-rc.4.0.20200217221003-af8973318c2d
-	halkyon.io/operator-framework v1.0.0-beta.4.0.20200219153202-7e58159b95d1
+	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/apiextensions-apiserver v0.17.3 // indirect
 	k8s.io/apimachinery v0.17.3
 	sigs.k8s.io/testing_frameworks v0.1.2 // indirect

diff --git a/go.sum b/go.sum
@@ -472,10 +472,10 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-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.20200219153202-7e58159b95d1 h1:zgjerq+mpwg0cj/3HvUhUJhx9aLWh8DZqqaQ51uFgJ8=
-halkyon.io/operator-framework v1.0.0-beta.4.0.20200219153202-7e58159b95d1/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-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=

diff --git a/pkg/plugin/rest-component/component.go b/pkg/plugin/rest-component/component.go
@@ -19,7 +19,7 @@ type component struct {
 	*framework.BaseDependentResource
 }
 
-func NewComponent(owner v1beta1.HalkyonResource) *component {
+func NewComponent(owner framework.SerializableResource) *component {
 	config := framework.NewConfig(gvk)
 	config.CheckedForReadiness = true
 	config.Created = false

diff --git a/pkg/plugin/rest-component/resource.go b/pkg/plugin/rest-component/resource.go
@@ -1,7 +1,6 @@
 package rest_component
 
 import (
-	beta1 "halkyon.io/api/v1beta1"
 	"halkyon.io/operator-framework"
 	"halkyon.io/operator-framework/plugins/capability"
 )
@@ -12,7 +11,7 @@ type Resource struct {
 	capability.SimplePluginResourceStem
 }
 
-func (m Resource) GetDependentResourcesWith(owner beta1.HalkyonResource) []framework.DependentResource {
+func (m Resource) GetDependentResourcesWith(owner framework.SerializableResource) []framework.DependentResource {
 	c := NewComponent(owner)
 	config := framework.NewDefaultSecretConfig()
 	config.CheckedForReadiness = true