Skip to content

Commit 9876048

Browse files
authored
Update client-go [return nil if capiProvider is empty] (#2)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 80d1100 commit 9876048

File tree

8 files changed

+16
-13
lines changed

8 files changed

+16
-13
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
k8s.io/klog/v2 v2.130.1
3131
k8s.io/kubectl v0.32.2
3232
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
33-
kmodules.xyz/client-go v0.32.6
33+
kmodules.xyz/client-go v0.32.8
3434
open-cluster-management.io/api v1.0.0
3535
open-cluster-management.io/cluster-proxy v0.7.0
3636
open-cluster-management.io/managed-serviceaccount v0.8.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us=
545545
k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8=
546546
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
547547
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
548-
kmodules.xyz/client-go v0.32.6 h1:/V9T0aLfe38PsyF+5FeU5QaC3GcqD8hQoWSCZw/uOpI=
549-
kmodules.xyz/client-go v0.32.6/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
548+
kmodules.xyz/client-go v0.32.8 h1:KZwJkv6U01kk8RR8M+ZWBhcyd5LusX4mDunJYXA7N3E=
549+
kmodules.xyz/client-go v0.32.8/go.mod h1:ZwLnc7UqEXUNSe43n/SnER6+7YAQCu38L2te6YefoHU=
550550
open-cluster-management.io/api v1.0.0 h1:54QllH9DTudCk6VrGt0q8CDsE3MghqJeTaTN4RHZpE0=
551551
open-cluster-management.io/api v1.0.0/go.mod h1:/OeqXycNBZQoe3WG6ghuWsMgsKGuMZrK8ZpsU6gWL0Y=
552552
open-cluster-management.io/cluster-proxy v0.7.0 h1:qOok0BIBL6j4mLRArzJdz0gK5nyynGKTwgBvnUHmfkE=

vendor/kmodules.xyz/client-go/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
5858
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12
5959
BASEIMAGE_DBG ?= debian:12
6060

61-
GO_VERSION ?= 1.24
61+
GO_VERSION ?= 1.25
6262
BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION)
6363

6464
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)

vendor/kmodules.xyz/client-go/api/v1/cluster_enum.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/client-go/api/v1/object_enum.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/client-go/cluster/lib.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,10 @@ func DetectCAPICluster(kc client.Reader) (*kmapi.CAPIClusterInfo, error) {
192192
return nil, err
193193
}
194194

195+
if getProviderName(capiProvider) == "" {
196+
return nil, nil
197+
}
198+
195199
return &kmapi.CAPIClusterInfo{
196200
Provider: getProviderName(capiProvider),
197201
Namespace: ns,

vendor/kmodules.xyz/client-go/meta/lib.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
// ref: https://github.com/kubernetes-sigs/application/blob/4ead7f1b87048b7717b3e474a21fdc07e6bce636/pkg/controller/application/application_controller.go#L28
3232
const (
3333
NameLabelKey = "app.kubernetes.io/name"
34+
NamespaceLabelKey = "app.kubernetes.io/namespace"
3435
VersionLabelKey = "app.kubernetes.io/version"
3536
InstanceLabelKey = "app.kubernetes.io/instance"
3637
PartOfLabelKey = "app.kubernetes.io/part-of"

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,7 @@ k8s.io/utils/net
14441444
k8s.io/utils/pointer
14451445
k8s.io/utils/ptr
14461446
k8s.io/utils/trace
1447-
# kmodules.xyz/client-go v0.32.6
1447+
# kmodules.xyz/client-go v0.32.8
14481448
## explicit; go 1.23.0
14491449
kmodules.xyz/client-go
14501450
kmodules.xyz/client-go/api/v1

0 commit comments

Comments
 (0)