Skip to content

Commit

Permalink
Update kutil
Browse files Browse the repository at this point in the history 
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
@tamalsaha
tamalsaha committed Sep 18, 2022
1 parent 5c643b9 commit 7263b50
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 20 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
k8s.io/kube-aggregator v0.25.1
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea
k8s.io/metrics v0.25.1
kmodules.xyz/client-go v0.25.0
kmodules.xyz/client-go v0.25.2
kmodules.xyz/crd-schema-fuzz v0.25.0
kmodules.xyz/custom-resources v0.25.0
kmodules.xyz/monitoring-agent-api v0.25.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,8 +1434,8 @@ k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 h1:H9TCJUUx+2VA0ZiD9lvtaX8fthFsMoD+Izn93E/hm8U=
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
kmodules.xyz/client-go v0.25.0 h1:ItlaPAwQEzmle33ieIvT+zSIlZ0sZpwxgtCBD8OJnuE=
kmodules.xyz/client-go v0.25.0/go.mod h1:PQAVWlXoHmk/OXqIuUz3xEW5H04uidiLwVyGX0yYnBQ=
kmodules.xyz/client-go v0.25.2 h1:Uav3RB85b3Pz2dhWI3VQR4XYjSSklpw8EFb88HHpMjI=
kmodules.xyz/client-go v0.25.2/go.mod h1:PQAVWlXoHmk/OXqIuUz3xEW5H04uidiLwVyGX0yYnBQ=
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.0 h1:5JQTEuiv6lC/+VVFNKqzfX4YtJCmN5E7mcNtGnHGVQM=
Expand Down
2 changes: 1 addition & 1 deletion vendor/kmodules.xyz/client-go/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
BASEIMAGE_PROD ?= gcr.io/distroless/static-debian11
BASEIMAGE_DBG ?= debian:bullseye

GO_VERSION ?= 1.18
GO_VERSION ?= 1.19
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)

OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)
Expand Down
20 changes: 16 additions & 4 deletions vendor/kmodules.xyz/client-go/discovery/lib.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,23 @@ func CheckAPIVersion(client discovery.DiscoveryInterface, constraint string) (bo
}

func IsPreferredAPIResource(client discovery.DiscoveryInterface, groupVersion, kind string) bool {
return ExistsGroupVersionKind(client, groupVersion, kind)
if resourceList, err := client.ServerPreferredResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
for _, resources := range resourceList {
if resources.GroupVersion != groupVersion {
continue
}
for _, resource := range resources.APIResources {
if resource.Kind == kind {
return true
}
}
}
}
return false
}

func ExistsGroupVersionKind(client discovery.DiscoveryInterface, groupVersion, kind string) bool {
if resourceList, err := client.ServerPreferredResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
if _, resourceList, err := client.ServerGroupsAndResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
for _, resources := range resourceList {
if resources.GroupVersion != groupVersion {
continue
Expand All @@ -116,7 +128,7 @@ func ExistsGroupVersionKind(client discovery.DiscoveryInterface, groupVersion, k
}

func ExistsGroupKind(client discovery.DiscoveryInterface, group, kind string) bool {
if resourceList, err := client.ServerPreferredResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
if _, resourceList, err := client.ServerGroupsAndResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
for _, resources := range resourceList {
gv, err := schema.ParseGroupVersion(resources.GroupVersion)
if err != nil {
Expand All @@ -142,7 +154,7 @@ func ExistsGroupKinds(client discovery.DiscoveryInterface, gk schema.GroupKind,
desired[other] = false
}

if resourceList, err := client.ServerPreferredResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
if _, resourceList, err := client.ServerGroupsAndResources(); discovery.IsGroupDiscoveryFailedError(err) || err == nil {
for _, resources := range resourceList {
gv, err := schema.ParseGroupVersion(resources.GroupVersion)
if err != nil {
Expand Down
13 changes: 7 additions & 6 deletions vendor/kmodules.xyz/client-go/meta/cloud.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ package meta
import (
"crypto/x509"
"errors"
"io/ioutil"
"io"
"net/http"
"os"
"strings"
"time"

Expand All @@ -30,7 +31,7 @@ import (
// ref: https://cloud.google.com/compute/docs/storing-retrieving-metadata
func TestGKE() (string, error) {
// ref: https://github.com/kubernetes/kubernetes/blob/a0f94123616c275f94e7a5b680d60d6f34e92f37/pkg/credentialprovider/gcp/metadata.go#L115
data, err := ioutil.ReadFile("/sys/class/dmi/id/product_name")
data, err := os.ReadFile("/sys/class/dmi/id/product_name")
if err != nil {
return "", err
}
Expand All @@ -50,7 +51,7 @@ func TestGKE() (string, error) {
return "", err
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -79,13 +80,13 @@ func TestAKS(cert *x509.Certificate) (string, error) {

// ref: https://cloud.google.com/compute/docs/storing-retrieving-metadata
func isAKS() error {
data, err := ioutil.ReadFile("/sys/class/dmi/id/sys_vendor")
data, err := os.ReadFile("/sys/class/dmi/id/sys_vendor")
if err != nil {
return err
}
sysVendor := strings.TrimSpace(string(data))

data, err = ioutil.ReadFile("/sys/class/dmi/id/product_name")
data, err = os.ReadFile("/sys/class/dmi/id/product_name")
if err != nil {
return err
}
Expand All @@ -110,7 +111,7 @@ func TestEKS(cert *x509.Certificate) (string, error) {

// ref: https://cloud.google.com/compute/docs/storing-retrieving-metadata
func isEKS() error {
data, err := ioutil.ReadFile("/sys/class/dmi/id/sys_vendor")
data, err := os.ReadFile("/sys/class/dmi/id/sys_vendor")
if err != nil {
return err
}
Expand Down
1 change: 0 additions & 1 deletion vendor/kmodules.xyz/client-go/meta/encoding.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ func UnmarshalFromJSON(data []byte, gv schema.GroupVersion) (runtime.Object, err
//
// WARNING: `json` tags are not respected when struct converted to map[string]interface{}
// WARNING: Embedded structs are not decoded properly: https://github.com/mitchellh/mapstructure/pull/80
//
func Decode(input interface{}, output interface{}) error {
config := &mapstructure.DecoderConfig{
DecodeHook: StringToQuantityHookFunc(),
Expand Down
3 changes: 1 addition & 2 deletions vendor/kmodules.xyz/client-go/meta/incluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
Expand All @@ -44,7 +43,7 @@ func PodNamespace() string {
return ns
}

if data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
if data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
return ns
}
Expand Down
4 changes: 2 additions & 2 deletions vendor/kmodules.xyz/client-go/meta/ipv6.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package meta

import (
"context"
"io/ioutil"
"os"
"strings"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -43,7 +43,7 @@ func IPv6EnabledInCluster(kc kubernetes.Interface) (bool, error) {
}

func IPv6EnabledInKernel() (bool, error) {
content, err := ioutil.ReadFile("/sys/module/ipv6/parameters/disable")
content, err := os.ReadFile("/sys/module/ipv6/parameters/disable")
if err != nil {
return false, err
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ k8s.io/utils/path
k8s.io/utils/pointer
k8s.io/utils/strings/slices
k8s.io/utils/trace
# kmodules.xyz/client-go v0.25.0
# kmodules.xyz/client-go v0.25.2
## explicit; go 1.18
kmodules.xyz/client-go
kmodules.xyz/client-go/api/v1
Expand Down

0 comments on commit 7263b50

Please sign in to comment.