Skip to content

Commit f424701

Browse files
committed
update mock manager for golden tests to pass
1 parent 46c90d1 commit f424701

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

pkg/patterns/declarative/reconciler.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,7 @@ func (r *Reconciler) Init(mgr manager.Manager, prototype DeclarativeObject, opts
9696
}
9797
r.dynamicClient = d
9898

99-
restMapper, err := apiutil.NewDiscoveryRESTMapper(r.config)
100-
if err != nil {
101-
return err
102-
}
103-
r.restMapper = restMapper
99+
r.restMapper = mgr.GetRESTMapper()
104100

105101
if err = r.applyOptions(opts...); err != nil {
106102
return err

pkg/test/mocks/manager.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ limitations under the License.
1717
package mocks
1818

1919
import (
20-
"net/http"
21-
2220
"k8s.io/apimachinery/pkg/api/meta"
2321
"k8s.io/apimachinery/pkg/runtime"
22+
"k8s.io/client-go/kubernetes/scheme"
2423
"k8s.io/client-go/rest"
2524
"k8s.io/client-go/tools/record"
25+
"net/http"
2626
"sigs.k8s.io/controller-runtime/pkg/cache"
2727
"sigs.k8s.io/controller-runtime/pkg/client"
2828
"sigs.k8s.io/controller-runtime/pkg/healthz"
2929
"sigs.k8s.io/controller-runtime/pkg/manager"
3030
"sigs.k8s.io/controller-runtime/pkg/webhook"
31-
32-
"k8s.io/client-go/kubernetes/scheme"
3331
)
3432

3533
// Mock Types for Reconciler tests:
3634
type Manager struct {
37-
client client.Client
38-
cache cache.Cache
39-
config rest.Config
40-
Scheme *runtime.Scheme
35+
client client.Client
36+
cache cache.Cache
37+
config rest.Config
38+
Scheme *runtime.Scheme
39+
eventRecorder record.EventRecorder
40+
mapper meta.RESTMapper
4141
}
4242

4343
var _ manager.Manager = &Manager{}
@@ -91,16 +91,16 @@ func (Manager) GetRecorder(name string) record.EventRecorder {
9191
panic("implement me")
9292
}
9393

94-
func (Manager) GetRESTMapper() meta.RESTMapper {
95-
panic("implement me")
94+
func (m Manager) GetRESTMapper() meta.RESTMapper {
95+
return m.mapper
9696
}
9797

9898
func (Manager) GetAPIReader() client.Reader {
9999
panic("implement me")
100100
}
101101

102-
func (Manager) GetEventRecorderFor(name string) record.EventRecorder {
103-
panic("implement me")
102+
func (m Manager) GetEventRecorderFor(name string) record.EventRecorder {
103+
return m.eventRecorder
104104
}
105105

106106
func (Manager) GetWebhookServer() *webhook.Server {

0 commit comments

Comments
 (0)