Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: upgrade to go 1.23.4 #21

Merged
merged 15 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif
BUILDMNT = /go/src/$(GOTARGET)
# The version here should match the version of go configured in
# .github/workflows files.
BUILD_IMAGE ?= golang:1.21.5
BUILD_IMAGE ?= golang:1.23.4

HYPERFED_TARGET = bin/hyperfed
CONTROLLER_TARGET = bin/controller-manager
Expand Down
486 changes: 264 additions & 222 deletions charts/kubefed/charts/controllermanager/crds/crds.yaml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/kubefed

go 1.21
go 1.23.4

require (
github.com/evanphx/json-patch v5.6.0+incompatible
Expand All @@ -21,7 +21,7 @@ require (
k8s.io/apiserver v0.27.2
k8s.io/client-go v0.27.2
k8s.io/component-base v0.27.2
k8s.io/klog/v2 v2.90.1
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/kubectl v0.26.3
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
Expand All @@ -45,7 +45,7 @@ require (
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ github.com/ghodss/yaml v1.0.1-0.20220118164431-d8423dcdf344/go.mod h1:GIjDIg/heH
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
Expand Down Expand Up @@ -699,8 +699,8 @@ k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo=
k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo=
k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
k8s.io/kubectl v0.26.3 h1:bZ5SgFyeEXw6XTc1Qji0iNdtqAC76lmeIIQULg2wNXM=
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/status/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func StartKubeFedStatusController(controllerConfig *util.ControllerConfig, stopC
if controllerConfig.MinimizeLatency {
controller.minimizeLatency()
}
klog.Infof(fmt.Sprintf("Starting status controller for %q", typeConfig.GetFederatedType().Kind))
klog.Infof("Starting status controller for %q", typeConfig.GetFederatedType().Kind)
controller.Run(stopChan)
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/sync/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func StartKubeFedSyncController(controllerConfig *util.ControllerConfig, stopCha
if controllerConfig.MinimizeLatency {
controller.minimizeLatency()
}
klog.Infof(fmt.Sprintf("Starting sync controller for %q", typeConfig.GetFederatedType().Kind))
klog.Infof("Starting sync controller for %q", typeConfig.GetFederatedType().Kind)
controller.Run(stopChan)
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubefedctl/federate/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func getResourcesInNamespace(config *rest.Config, namespace string, skipAPIResou
klog.Warningf("Skipping resource %s of type %s because it does not conform to the DNS-1123 subdomain spec.", resource.GetName(), apiResource.Name)
klog.Warningf("The following error(s) were reported during DNS-1123 validation: ")
for _, err := range errors {
klog.Warningf(err)
klog.Warningf("%s", err)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubefedctl/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ func joinClusterForNamespace(hostConfig, clusterConfig *rest.Config, kubefedName
if clusterConfig.Proxy != nil {
url, err := clusterConfig.Proxy(nil)
if err != nil {
klog.V(2).Infof("Error getting proxy URL for host %s: %w", clusterConfig.Host, err)
klog.V(2).Infof("Error getting proxy URL for host %s: %v", clusterConfig.Host, err)
return nil, errors.Errorf("failed to create proxy URL request for kubefed cluster: %v", err)
}
if url != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/schedulingtypes/replicascheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func schedule(planner *planner.Planner, key string, clusterNames []string, curre
}
fmt.Fprintf(buf, "\n")
}
klog.V(4).Infof(buf.String())
klog.V(4).Infof("buf.string:%s", buf.String())
}
return result, nil
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/download-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ curl -Lo "${dest_dir}/kubectl" "https://dl.k8s.io/release/${kubectl_version}/bin
)
chmod +x "${dest_dir}/kubectl"

golint_version="1.55.2"
golint_version="1.63.4"
golint_dir="golangci-lint-${golint_version}-${platform}-amd64"
golint_tgz="${golint_dir}.tar.gz"
golint_url="https://github.com/golangci/golangci-lint/releases/download/v${golint_version}/${golint_tgz}"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/defaulting.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ var _ = Describe("Default", func() {
// is resolved.
It(fmt.Sprintf("%s does not cause controller-manager to fail", resourceName), func() {
if framework.TestContext.LimitedScope {
framework.Skipf(fmt.Sprintf("Testing of default %s requires an isolated test namespace which is only possible with a cluster-scoped control plane", resourceName))
framework.Skipf("Testing of default %s requires an isolated test namespace which is only possible with a cluster-scoped control plane", resourceName)
}

By(fmt.Sprintf("Creating a %s defaulted by the mutating admission webhook", resourceName))
Expand Down
41 changes: 39 additions & 2 deletions tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,45 @@
module github.com/mesosphere/kommander-cluster-lifecycle/tools

go 1.13
go 1.23.4

require (
github.com/go-bindata/go-bindata/v3 v3.1.3
sigs.k8s.io/controller-tools v0.11.3
sigs.k8s.io/controller-tools v0.17.1
)

require (
github.com/fatih/color v1.18.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/gobuffalo/flect v1.0.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/kisielk/errcheck v1.5.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/tools v0.29.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.32.0 // indirect
k8s.io/apiextensions-apiserver v0.32.0 // indirect
k8s.io/apimachinery v0.32.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
Loading
Loading