Skip to content

Commit

Permalink
Use client.Reader instead of client.Client
Browse files Browse the repository at this point in the history
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
tamalsaha committed Oct 11, 2024
1 parent 8fc3d5e commit d759e6b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cluster/ace.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

func IsACEManaged(kc client.Client) bool {
func IsACEManaged(kc client.Reader) bool {
var list unstructured.UnstructuredList
list.SetAPIVersion("apps/v1")
list.SetKind("Deployment")
Expand Down
2 changes: 1 addition & 1 deletion cluster/lib.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func UpsertClusterMetadata(kc client.Client, md *kmapi.ClusterMetadata) error {
return err
}

func DetectCAPICluster(kc client.Client) (*kmapi.CAPIClusterInfo, error) {
func DetectCAPICluster(kc client.Reader) (*kmapi.CAPIClusterInfo, error) {
var list unstructured.UnstructuredList
list.SetGroupVersionKind(schema.GroupVersionKind{
Group: "cluster.x-k8s.io",
Expand Down
2 changes: 1 addition & 1 deletion cluster/ocm.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func IsOpenClusterHub(mapper meta.RESTMapper) bool {
return false
}

func IsOpenClusterSpoke(kc client.Client) bool {
func IsOpenClusterSpoke(kc client.Reader) bool {
var list unstructured.UnstructuredList
list.SetAPIVersion("operator.open-cluster-management.io/v1")
list.SetKind("Klusterlet")
Expand Down
6 changes: 3 additions & 3 deletions cluster/rancher.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,15 @@ func isInProject(kc client.Client, nsName, seedNS string) (bool, error) {
return projectId == seedProjectId, nil
}

func GetDefaultProjectId(kc client.Client) (string, bool, error) {
func GetDefaultProjectId(kc client.Reader) (string, bool, error) {
return GetProjectId(kc, metav1.NamespaceDefault)
}

func GetSystemProjectId(kc client.Client) (string, bool, error) {
func GetSystemProjectId(kc client.Reader) (string, bool, error) {
return GetProjectId(kc, metav1.NamespaceSystem)
}

func GetProjectId(kc client.Client, nsName string) (string, bool, error) {
func GetProjectId(kc client.Reader, nsName string) (string, bool, error) {
var ns core.Namespace
err := kc.Get(context.TODO(), client.ObjectKey{Name: nsName}, &ns)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions cluster/vcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

func IsVirtualCluster(kc client.Client) (bool, error) {
func IsVirtualCluster(kc client.Reader) (bool, error) {
var list core.NodeList
err := kc.List(context.TODO(), &list)
if err != nil {
Expand All @@ -44,7 +44,7 @@ func IsVirtualCluster(kc client.Client) (bool, error) {
return false, nil
}

func MustIsVirtualCluster(kc client.Client) bool {
func MustIsVirtualCluster(kc client.Reader) bool {
ok, _ := IsVirtualCluster(kc)
return ok
}

0 comments on commit d759e6b

Please sign in to comment.