fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ObjectKeyFromObject instead of ObjectKey 

controller-runtime's client package provides ObjectKeyFromObject() to
extract NamespacedName from a given object. ObjectKey() in
internal/util package is a helper for the same. Replace the internal
helper with controller-runtime's helper for the same.

Signed-off-by: Sunny <darkowlzz@protonmail.com>
This commit is contained in:
Sunny 2021-07-26 04:31:24 +05:30
parent 40a47670aa
commit 9825a60b74
No known key found for this signature in database
GPG Key ID: 9C5F586ACB6590EA
2 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/helmchart_controller.go
View File

@ -61,7 +61,6 @@ import (
sourcev1 "github.com/fluxcd/source-controller/api/v1beta1" sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
"github.com/fluxcd/source-controller/internal/helm" "github.com/fluxcd/source-controller/internal/helm"
"github.com/fluxcd/source-controller/internal/util"
) )
// +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts,verbs=get;list;watch;create;update;patch;delete // +kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=helmcharts,verbs=get;list;watch;create;update;patch;delete
@ -926,7 +925,7 @@ func (r *HelmChartReconciler) requestsForHelmRepositoryChange(o client.Object) [
// enqueued twice. // enqueued twice.
var reqs []reconcile.Request var reqs []reconcile.Request
for _, i := range list.Items { for _, i := range list.Items {
reqs = append(reqs, reconcile.Request{NamespacedName: util.ObjectKey(&i)}) reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&i)})
} }
return reqs return reqs
} }
@ -955,7 +954,7 @@ func (r *HelmChartReconciler) requestsForGitRepositoryChange(o client.Object) []
// enqueued twice. // enqueued twice.
var reqs []reconcile.Request var reqs []reconcile.Request
for _, i := range list.Items { for _, i := range list.Items {
reqs = append(reqs, reconcile.Request{NamespacedName: util.ObjectKey(&i)}) reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&i)})
} }
return reqs return reqs
} }
@ -984,7 +983,7 @@ func (r *HelmChartReconciler) requestsForBucketChange(o client.Object) []reconci
// enqueued twice. // enqueued twice.
var reqs []reconcile.Request var reqs []reconcile.Request
for _, i := range list.Items { for _, i := range list.Items {
reqs = append(reqs, reconcile.Request{NamespacedName: util.ObjectKey(&i)}) reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&i)})
} }
return reqs return reqs
} }

30
internal/util/util.go
View File

@ -1,30 +0,0 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package util
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
)
// ObjectKey returns client.ObjectKey for the object.
func ObjectKey(object metav1.Object) client.ObjectKey {
return client.ObjectKey{
Namespace: object.GetNamespace(),
Name: object.GetName(),
}
}