-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Go to 1.21 and deps for k8s 1.27 (#152)
- Loading branch information
1 parent
df30d89
commit 41c07d0
Showing
5 changed files
with
349 additions
and
718 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| FROM golang:1.19.13-alpine3.18 | ||
| FROM golang:1.21-alpine3.18 | ||
|
|
||
| ARG DAPPER_HOST_ARCH | ||
| ENV ARCH $DAPPER_HOST_ARCH | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,119 +1,169 @@ | ||
| module github.com/rancher/system-agent | ||
|
|
||
| go 1.19 | ||
| go 1.21 | ||
|
|
||
| // after a release version > 1.1.1, remove this line and update the version in the require block with the latest tag | ||
| replace github.com/rancher/wrangler v1.1.1 => github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df | ||
|
|
||
| replace ( | ||
| k8s.io/api => k8s.io/api v0.24.2 | ||
| k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0 | ||
| k8s.io/apimachinery => k8s.io/apimachinery v0.24.2 | ||
| k8s.io/apiserver => k8s.io/apiserver v0.24.2 | ||
| k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0 | ||
| k8s.io/client-go => github.com/rancher/client-go v1.24.0-rancher1 | ||
| k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.8 | ||
| k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0 | ||
| k8s.io/code-generator => k8s.io/code-generator v0.24.0 | ||
| k8s.io/component-base => k8s.io/component-base v0.24.2 | ||
| k8s.io/component-helpers => k8s.io/component-helpers v0.24.0 | ||
| k8s.io/controller-manager => k8s.io/controller-manager v0.24.0 | ||
| k8s.io/cri-api => k8s.io/cri-api v0.24.0 | ||
| k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0 | ||
| k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0 | ||
| k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0 | ||
| k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0 | ||
| k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0 | ||
| k8s.io/kubectl => k8s.io/kubectl v0.24.2 | ||
| k8s.io/kubelet => k8s.io/kubelet v0.24.2 | ||
| k8s.io/kubernetes => k8s.io/kubernetes v1.24.2 | ||
| k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0 | ||
| k8s.io/metrics => k8s.io/metrics v0.24.0 | ||
| k8s.io/mount-utils => k8s.io/mount-utils v0.24.0 | ||
| k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.8 | ||
| k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0 | ||
| github.com/docker/cli => github.com/docker/cli v24.0.7+incompatible | ||
| github.com/docker/docker => github.com/docker/docker v24.0.7+incompatible | ||
|
|
||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.23.1 | ||
| golang.org/x/crypto => golang.org/x/crypto v0.17.0 | ||
|
|
||
| k8s.io/api => k8s.io/api v0.27.10 | ||
| k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.10 | ||
| k8s.io/apimachinery => k8s.io/apimachinery v0.27.10 | ||
| k8s.io/apiserver => k8s.io/apiserver v0.27.10 | ||
| k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.10 | ||
| k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1 | ||
| k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.10 | ||
| k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.10 | ||
| k8s.io/code-generator => k8s.io/code-generator v0.27.10 | ||
| k8s.io/component-base => k8s.io/component-base v0.27.10 | ||
| k8s.io/component-helpers => k8s.io/component-helpers v0.27.10 | ||
| k8s.io/controller-manager => k8s.io/controller-manager v0.27.10 | ||
| k8s.io/cri-api => k8s.io/cri-api v0.27.10 | ||
| k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.10 | ||
| k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.10 | ||
| k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.10 | ||
| k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.10 | ||
| k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.10 | ||
| k8s.io/kubectl => k8s.io/kubectl v0.27.10 | ||
| k8s.io/kubelet => k8s.io/kubelet v0.27.10 | ||
| k8s.io/kubernetes => k8s.io/kubernetes v1.27.10 | ||
| k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.10 | ||
| k8s.io/metrics => k8s.io/metrics v0.27.10 | ||
| k8s.io/mount-utils => k8s.io/mount-utils v0.27.10 | ||
| k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.10 | ||
| k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.10 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/google/go-containerregistry v0.16.1 | ||
| github.com/mattn/go-colorable v0.1.13 | ||
| github.com/rancher/lasso v0.0.0-20221227210133-6ea88ca2fbcc | ||
| github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 | ||
| github.com/rancher/wharfie v0.6.2 | ||
| github.com/rancher/wrangler v1.1.0 | ||
| github.com/rancher/wrangler v1.1.1 | ||
| github.com/sirupsen/logrus v1.9.3 | ||
| github.com/urfave/cli/v2 v2.25.7 | ||
| golang.org/x/sync v0.3.0 | ||
| k8s.io/api v0.25.4 | ||
| k8s.io/apimachinery v0.25.4 | ||
| k8s.io/client-go v0.25.4 | ||
| k8s.io/kubernetes v1.24.2 | ||
| golang.org/x/sync v0.5.0 | ||
| k8s.io/api v0.27.10 | ||
| k8s.io/apimachinery v0.27.10 | ||
| k8s.io/client-go v0.27.10 | ||
| k8s.io/kubernetes v1.27.10 | ||
| sigs.k8s.io/yaml v1.3.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/PuerkitoBio/purell v1.1.1 // indirect | ||
| github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect | ||
| github.com/NYTimes/gziphandler v1.1.1 // indirect | ||
| github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect | ||
| github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect | ||
| github.com/beorn7/perks v1.0.1 // indirect | ||
| github.com/blang/semver/v4 v4.0.0 // indirect | ||
| github.com/cespare/xxhash/v2 v2.1.2 // indirect | ||
| github.com/cenkalti/backoff/v4 v4.2.1 // indirect | ||
| github.com/cespare/xxhash/v2 v2.2.0 // indirect | ||
| github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect | ||
| github.com/coreos/go-semver v0.3.0 // indirect | ||
| github.com/coreos/go-systemd/v22 v22.4.0 // indirect | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/docker/cli v24.0.0+incompatible // indirect | ||
| github.com/docker/distribution v2.8.2+incompatible // indirect | ||
| github.com/docker/docker v24.0.0+incompatible // indirect | ||
| github.com/docker/docker-credential-helpers v0.7.0 // indirect | ||
| github.com/emicklei/go-restful/v3 v3.8.0 // indirect | ||
| github.com/emicklei/go-restful/v3 v3.9.0 // indirect | ||
| github.com/evanphx/json-patch v4.12.0+incompatible // indirect | ||
| github.com/go-logr/logr v1.2.3 // indirect | ||
| github.com/go-openapi/jsonpointer v0.19.5 // indirect | ||
| github.com/go-openapi/jsonreference v0.19.5 // indirect | ||
| github.com/go-openapi/swag v0.19.14 // indirect | ||
| github.com/felixge/httpsnoop v1.0.4 // indirect | ||
| github.com/fsnotify/fsnotify v1.6.0 // indirect | ||
| github.com/go-logr/logr v1.4.1 // 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.1 // indirect | ||
| github.com/go-openapi/swag v0.22.3 // 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.3 // indirect | ||
| github.com/google/cel-go v0.12.7 // indirect | ||
| github.com/google/gnostic v0.5.7-v3refs // indirect | ||
| github.com/google/go-cmp v0.5.9 // indirect | ||
| github.com/google/go-cmp v0.6.0 // indirect | ||
| github.com/google/gofuzz v1.2.0 // indirect | ||
| github.com/google/uuid v1.4.0 // indirect | ||
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect | ||
| github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect | ||
| github.com/imdario/mergo v0.3.12 // 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 | ||
| github.com/klauspost/compress v1.16.5 // indirect | ||
| github.com/mailru/easyjson v0.7.6 // indirect | ||
| github.com/mailru/easyjson v0.7.7 // indirect | ||
| github.com/mattn/go-isatty v0.0.16 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect | ||
| github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect | ||
| github.com/mitchellh/go-homedir v1.1.0 // indirect | ||
| github.com/mitchellh/mapstructure v1.4.1 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.2 // indirect | ||
| github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect | ||
| github.com/opencontainers/go-digest v1.0.0 // indirect | ||
| github.com/opencontainers/image-spec v1.1.0-rc3 // indirect | ||
| github.com/pierrec/lz4 v2.6.1+incompatible // indirect | ||
| github.com/pkg/errors v0.9.1 // indirect | ||
| github.com/prometheus/client_golang v1.12.1 // indirect | ||
| github.com/prometheus/client_model v0.2.0 // indirect | ||
| github.com/prometheus/common v0.32.1 // indirect | ||
| github.com/prometheus/procfs v0.7.3 // indirect | ||
| github.com/prometheus/client_golang v1.14.0 // indirect | ||
| github.com/prometheus/client_model v0.3.0 // indirect | ||
| github.com/prometheus/common v0.37.0 // indirect | ||
| github.com/prometheus/procfs v0.8.0 // indirect | ||
| github.com/russross/blackfriday/v2 v2.1.0 // indirect | ||
| github.com/spf13/cobra v1.7.0 // indirect | ||
| github.com/spf13/pflag v1.0.5 // indirect | ||
| github.com/stoewer/go-strcase v1.2.0 // indirect | ||
| github.com/urfave/cli v1.22.12 // indirect | ||
| github.com/vbatts/tar-split v0.11.3 // indirect | ||
| github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect | ||
| go.etcd.io/etcd/api/v3 v3.5.7 // indirect | ||
| go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect | ||
| go.etcd.io/etcd/client/v3 v3.5.7 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect | ||
| go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect | ||
| go.opentelemetry.io/otel v1.23.1 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.23.1 // indirect | ||
| go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect | ||
| go.opentelemetry.io/otel/metric v1.23.1 // indirect | ||
| go.opentelemetry.io/otel/sdk v1.23.1 // indirect | ||
| go.opentelemetry.io/otel/trace v1.23.1 // indirect | ||
| go.opentelemetry.io/proto/otlp v1.1.0 // indirect | ||
| go.uber.org/atomic v1.7.0 // indirect | ||
| go.uber.org/multierr v1.6.0 // indirect | ||
| golang.org/x/net v0.10.0 // indirect | ||
| golang.org/x/oauth2 v0.8.0 // indirect | ||
| golang.org/x/sys v0.8.0 // indirect | ||
| golang.org/x/term v0.8.0 // indirect | ||
| golang.org/x/text v0.9.0 // indirect | ||
| golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/protobuf v1.30.0 // indirect | ||
| go.uber.org/zap v1.19.0 // indirect | ||
| golang.org/x/crypto v0.16.0 // indirect | ||
| golang.org/x/net v0.19.0 // indirect | ||
| golang.org/x/oauth2 v0.15.0 // indirect | ||
| golang.org/x/sys v0.16.0 // indirect | ||
| golang.org/x/term v0.15.0 // indirect | ||
| golang.org/x/text v0.14.0 // indirect | ||
| golang.org/x/time v0.3.0 // indirect | ||
| google.golang.org/appengine v1.6.8 // indirect | ||
| google.golang.org/genproto v0.0.0-20231212172506-995d672761c0 // indirect | ||
| google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect | ||
| google.golang.org/grpc v1.61.0 // indirect | ||
| google.golang.org/protobuf v1.32.0 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| k8s.io/apiserver v0.24.0 // indirect | ||
| k8s.io/component-base v0.24.2 // indirect | ||
| k8s.io/klog/v2 v2.80.1 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect | ||
| k8s.io/apiserver v0.27.10 // indirect | ||
| k8s.io/cloud-provider v0.0.0 // indirect | ||
| k8s.io/component-base v0.27.10 // indirect | ||
| k8s.io/controller-manager v0.27.10 // indirect | ||
| k8s.io/klog/v2 v2.90.1 // indirect | ||
| k8s.io/kms v0.27.10 // indirect | ||
| k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect | ||
| k8s.io/kubelet v0.24.2 // indirect | ||
| k8s.io/utils v0.0.0-20221011040102-427025108f67 // indirect | ||
| sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect | ||
| k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect | ||
| sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect | ||
| sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect | ||
| sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect | ||
| ) |
Oops, something went wrong.