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.

Sign up for GitHub

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

Jump to bottom

Update kind to 1.24.0 and node to 1.31.0 #570

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Update kind to 1.24.0 and node to 1.31.0 #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c347953
Update kind to 1.24.0 and node to 1.31.0
marcushines Nov 4, 2024
ce665c2
fix logging
marcushines Nov 4, 2024
99822aa
add node updates
marcushines Nov 5, 2024
1b19d44
Update packers to build with new version of kind
marcushines Nov 6, 2024
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 cloudbuild/external.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ build {
provisioner "shell" {
inline = [
"echo Installing kind...",
"/usr/local/go/bin/go install sigs.k8s.io/kind@v0.22.0",
"/usr/local/go/bin/go install sigs.k8s.io/kind@v0.24.0",
"curl --create-dirs -o third_party/licenses/kind/LICENSE https://raw.githubusercontent.com/kubernetes-sigs/kind/main/LICENSE",
"sudo cp /home/$USER/go/bin/kind /usr/local/bin/",
"/home/$USER/go/bin/kind version",
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild/internal.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ build {
provisioner "shell" {
inline = [
"echo Installing kind...",
"/usr/local/go/bin/go install sigs.k8s.io/kind@v0.22.0",
"/usr/local/go/bin/go install sigs.k8s.io/kind@v0.24.0",
"sudo cp /home/$USER/go/bin/kind /usr/local/bin/",
"/home/$USER/go/bin/kind version",
]
Expand Down
4 changes: 2 additions & 2 deletions cloudbuild/vendors/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cluster:
spec:
name: kne
recycle: True
version: v0.17.0
image: kindest/node:v1.26.0
version: v0.24.0
image: kindest/node:v1.31.0
googleArtifactRegistries:
- us-west1-docker.pkg.dev
config: ../../manifests/kind/config.yaml
Expand Down
2 changes: 0 additions & 2 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
"k8s.io/client-go/util/homedir"
log "k8s.io/klog/v2"
)

func New() *cobra.Command {
Expand Down Expand Up @@ -141,7 +140,6 @@ func createFn(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
log.Infof(bp)
topopb, err := topo.Load(args[0])
if err != nil {
return fmt.Errorf("%s: %w", cmd.Use, err)
Expand Down
4 changes: 2 additions & 2 deletions deploy/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,7 @@ func (k *KindSpec) Deploy(ctx context.Context) error {
if len(k.AdditionalManifests) > 0 {
log.Infof("Waiting for potential manifest-issued deployments to complete")
if err := run.LogCommand("kubectl", "rollout", "status", "deployment", "-w"); err != nil {
log.Warningf("Unable to wait for deployments to complete: %w", err)
log.Warningf("Unable to wait for deployments to complete: %v", err)
}
}
return nil
Expand Down Expand Up @@ -783,7 +783,7 @@ func (k *KindSpec) loadContainerImages() error {
err = fmt.Errorf("container not found: %w", err)
break
}
log.Warningf("Failed to pull %q: %w (will retry %d times)", s, err, retries)
log.Warningf("Failed to pull %q: %v (will retry %d times)", s, err, retries)
time.Sleep(pullRetryDelay)
}
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions deploy/kne/kind-bridge-cdnos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cluster:
spec:
name: kne
recycle: True
version: v0.17.0
image: kindest/node:v1.26.0
version: v0.24.0
image: kindest/node:v1.31.0
config: ../../manifests/kind/config.yaml
additionalManifests:
- ../../manifests/kind/bridge.yaml
Expand Down
4 changes: 2 additions & 2 deletions deploy/kne/kind-bridge.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cluster:
spec:
name: kne
recycle: True
version: v0.17.0
image: kindest/node:v1.26.0
version: v0.24.0
image: kindest/node:v1.31.0
config: ../../manifests/kind/config.yaml
additionalManifests:
- ../../manifests/kind/bridge.yaml
Expand Down
76 changes: 34 additions & 42 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openconfig/kne

go 1.21
go 1.22.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are Go 1.21 version references in:

cloudbuild/external.pkr.hcl
cloudbuild/internal.pkr.hcl
.github/workflows/go.yml
docs/setup.md
x/wire/forward/Dockerfile

We should use the same go version in all of these (and use 1.23.2?)


require (
cloud.google.com/go/pubsub v1.36.1
Expand All @@ -22,71 +22,67 @@ require (
github.com/openconfig/ondatra v0.5.8
github.com/pborman/uuid v1.2.1
github.com/pkg/errors v0.9.1
github.com/scrapli/scrapligo v1.1.11
github.com/scrapli/scrapligo v1.3.2
github.com/scrapli/scrapligocfg v1.0.0
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.17.0
github.com/srl-labs/srl-controller v0.6.1
github.com/srl-labs/srlinux-scrapli v0.6.0
github.com/wI2L/jsondiff v0.5.1
go.universe.tf/metallb v0.13.5
golang.org/x/oauth2 v0.18.0
go.universe.tf/metallb v0.14.8
golang.org/x/oauth2 v0.21.0
golang.org/x/sync v0.7.0
google.golang.org/api v0.169.0
google.golang.org/grpc v1.64.1
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/client-go v0.26.3
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
sigs.k8s.io/controller-runtime v0.14.5
sigs.k8s.io/yaml v1.3.0
k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/client-go v0.31.2
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/yaml v1.4.0
)

require (
bitbucket.org/creachadair/stringset v0.0.14 // indirect
cloud.google.com/go v0.112.1 // indirect
cloud.google.com/go/compute v1.25.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.6 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/Microsoft/go-winio v0.6.0 // indirect
github.com/carlmontanari/difflibgo v0.0.0-20210718194309-31b9e131c298 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/creack/pty v1.1.18 // indirect
github.com/creack/pty v1.1.21 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
github.com/googleapis/gax-go/v2 v2.12.2 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/imdario/mergo v0.3.14 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -95,14 +91,14 @@ require (
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/spdystream v0.4.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/openconfig/attestz v0.2.0 // indirect
github.com/openconfig/gnoi v0.2.0 // indirect
github.com/openconfig/gnoigo v0.0.0-20231026010722-87413fdb22e7 // indirect
Expand All @@ -117,11 +113,7 @@ require (
github.com/p4lang/p4runtime v1.3.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sirikothe/gotextfsm v1.0.1-0.20200816110946-6aa2cfd355e4 // indirect
Expand All @@ -133,6 +125,7 @@ require (
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/sjson v1.2.5 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.einride.tech/aip v0.66.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
Expand All @@ -144,23 +137,22 @@ require (
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
golang.org/x/tools v0.22.0 // indirect
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiextensions-apiserver v0.26.3 // indirect
k8s.io/component-base v0.26.3 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading
Loading