Update deps

Signed-off-by: Tamal Saha <tamal@appscode.com>
kubedb · Jan 17, 2023 · d93fabe · d93fabe
1 parent c221f8b
commit d93fabe
Show file tree

Hide file tree

Showing 9 changed files with 240 additions and 180 deletions.
diff --git a/go.mod b/go.mod
@@ -26,7 +26,7 @@ require (
 	k8s.io/kube-aggregator v0.25.1
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
 	k8s.io/metrics v0.25.1
-	kmodules.xyz/client-go v0.25.14
+	kmodules.xyz/client-go v0.25.16
 	kmodules.xyz/crd-schema-fuzz v0.25.0
 	kmodules.xyz/custom-resources v0.25.1
 	kmodules.xyz/monitoring-agent-api v0.25.0

diff --git a/go.sum b/go.sum
@@ -1365,8 +1365,8 @@ k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85 h1:cTdVh7LYu82xeClmfzGtgyspNh6Ux
 k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
-kmodules.xyz/client-go v0.25.14 h1:8znhvnL73etOVeTGNcSQjqOAt5bK9vxin9dZPQUNtA4=
-kmodules.xyz/client-go v0.25.14/go.mod h1:PG0s5FqmCvIKXudUhaJELBVbKbX6ESoefVR1cibkl+0=
+kmodules.xyz/client-go v0.25.16 h1:B9gf90o+eWFlGgXv+hx0k8atkCRjMpDgAWycvA/obfk=
+kmodules.xyz/client-go v0.25.16/go.mod h1:PG0s5FqmCvIKXudUhaJELBVbKbX6ESoefVR1cibkl+0=
 kmodules.xyz/crd-schema-fuzz v0.25.0 h1:c5ZxNRqJak1bkGhECmyrKpzKGThFMB4088Kynyvngbc=
 kmodules.xyz/crd-schema-fuzz v0.25.0/go.mod h1:VigFz19GwCxMGhb3YjCtlSXmfXb0J/g9du1So6rvqsk=
 kmodules.xyz/custom-resources v0.25.1 h1:0qHPTxbT/q0afl2GCOnwPFaoxKziRIPXgVu77YwrCa4=

diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go
diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto
diff --git a/vendor/kmodules.xyz/client-go/api/v1/image.go b/vendor/kmodules.xyz/client-go/api/v1/image.go
@@ -26,12 +26,13 @@ type Lineage struct {
 }
 
 type ImageInfo struct {
-	Image       string       `json:"image,omitempty" protobuf:"bytes,1,opt,name=image"`
-	Lineages    []Lineage    `json:"lineages,omitempty" protobuf:"bytes,2,rep,name=lineages"`
-	PullSecrets *PullSecrets `json:"pullSecrets" protobuf:"bytes,3,opt,name=pullSecrets"`
+	Image           string           `json:"image" protobuf:"bytes,1,opt,name=image"`
+	Lineages        []Lineage        `json:"lineages,omitempty" protobuf:"bytes,2,rep,name=lineages"`
+	PullCredentials *PullCredentials `json:"pullCredentials,omitempty" protobuf:"bytes,3,opt,name=pullCredentials"`
 }
 
-type PullSecrets struct {
-	Namespace string                      `json:"namespace,omitempty" protobuf:"bytes,1,opt,name=namespace"`
-	Refs      []core.LocalObjectReference `json:"refs,omitempty" protobuf:"bytes,2,rep,name=refs"`
+type PullCredentials struct {
+	Namespace          string                      `json:"namespace" protobuf:"bytes,1,opt,name=namespace"`
+	ServiceAccountName string                      `json:"serviceAccountName,omitempty" protobuf:"bytes,2,opt,name=serviceAccountName"`
+	SecretRefs         []core.LocalObjectReference `json:"secretRefs,omitempty" protobuf:"bytes,3,rep,name=secretRefs"`
 }
diff --git a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go
diff --git a/vendor/kmodules.xyz/client-go/api/v1/resource.go b/vendor/kmodules.xyz/client-go/api/v1/resource.go
@@ -148,6 +148,12 @@ func ExtractResourceID(mapper meta.RESTMapper, in ResourceID) (*ResourceID, erro
 	if in.Group == "core" {
 		in.Group = ""
 	}
+	if in.Version != "" &&
+		in.Kind != "" &&
+		in.Name != "" &&
+		in.Scope != "" {
+		return &in, nil
+	}
 
 	kindFound := in.Kind != ""
 	resFOund := in.Name != ""

diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1288,7 +1288,7 @@ k8s.io/utils/trace
 # kmodules.xyz/apiversion v0.2.0
 ## explicit; go 1.14
 kmodules.xyz/apiversion
-# kmodules.xyz/client-go v0.25.14
+# kmodules.xyz/client-go v0.25.16
 ## explicit; go 1.18
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1