Merge pull request #6099 from dlipovetsky/main

k8s-ci-robot · web-flow · commit 45c8b28635b6 · 2022-02-11T03:38:03.000-08:00
🌱 [controllers/external] Accept narrower interfaces
diff --git a/controllers/external/util.go b/controllers/external/util.go
@@ -31,7 +31,7 @@ import (
 )
 
 // Get uses the client and reference to get an external, unstructured object.
-func Get(ctx context.Context, c client.Client, ref *corev1.ObjectReference, namespace string) (*unstructured.Unstructured, error) {
+func Get(ctx context.Context, c client.Reader, ref *corev1.ObjectReference, namespace string) (*unstructured.Unstructured, error) {
 	if ref == nil {
 		return nil, errors.Errorf("cannot get object - object reference not set")
 	}
@@ -47,7 +47,7 @@ func Get(ctx context.Context, c client.Client, ref *corev1.ObjectReference, name
 }
 
 // Delete uses the client and reference to delete an external, unstructured object.
-func Delete(ctx context.Context, c client.Client, ref *corev1.ObjectReference) error {
+func Delete(ctx context.Context, c client.Writer, ref *corev1.ObjectReference) error {
 	obj := new(unstructured.Unstructured)
 	obj.SetAPIVersion(ref.APIVersion)
 	obj.SetKind(ref.Kind)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`)`
`32`	`32`
`33`	`33`	`// Get uses the client and reference to get an external, unstructured object.`
`34`		`-func Get(ctx context.Context, c client.Client, ref corev1.ObjectReference, namespace string) (unstructured.Unstructured, error) {`
	`34`	`+func Get(ctx context.Context, c client.Reader, ref corev1.ObjectReference, namespace string) (unstructured.Unstructured, error) {`
`35`	`35`	`if ref == nil {`
`36`	`36`	`return nil, errors.Errorf("cannot get object - object reference not set")`
`37`	`37`	`}`
`@@ -47,7 +47,7 @@ func Get(ctx context.Context, c client.Client, ref *corev1.ObjectReference, name`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Delete uses the client and reference to delete an external, unstructured object.`
`50`		`-func Delete(ctx context.Context, c client.Client, ref *corev1.ObjectReference) error {`
	`50`	`+func Delete(ctx context.Context, c client.Writer, ref *corev1.ObjectReference) error {`
`51`	`51`	`obj := new(unstructured.Unstructured)`
`52`	`52`	`obj.SetAPIVersion(ref.APIVersion)`
`53`	`53`	`obj.SetKind(ref.Kind)`