Skip to content

Commit a64b336

Browse files
hj-johannes-leehj-johannes-lee
authored
Merge pull request #1783 from mythi/PR-2024-016
go.mod k8s.io updates and buildah fix
2 parents 9764665 + 34b3570 commit a64b336

File tree

4 files changed

+217
-209
lines changed

4 files changed

+217
-209
lines changed

‎demo/build-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TAG=${TAG:-devel}
2020
if [ -z "$BUILDER" -o "$BUILDER" = 'docker' -o "$BUILDER" = 'podman' ] ; then
2121
${BUILDER} build --pull -t ${IMG}:${TAG} "$CWD/$DIR/"
2222
elif [ "$BUILDER" = 'buildah' ] ; then
23-
buildah bud --pull-always -t ${IMG}:${TAG} "$CWD/$DIR/"
23+
BUILDAH_RUNTIME=runc buildah bud --pull-always -t ${IMG}:${TAG} "$CWD/$DIR/"
2424
else
2525
(>&2 echo "Unknown builder $BUILDER")
2626
exit 1

‎go.mod

Lines changed: 82 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -12,148 +12,154 @@ require (
1212
github.com/onsi/gomega v1.33.1
1313
github.com/pkg/errors v0.9.1
1414
github.com/prometheus/client_model v0.6.1
15-
github.com/prometheus/common v0.47.0
15+
github.com/prometheus/common v0.55.0
1616
golang.org/x/sys v0.22.0
1717
golang.org/x/text v0.16.0
1818
google.golang.org/grpc v1.65.0
1919
gopkg.in/yaml.v2 v2.4.0
20-
k8s.io/api v0.30.1
21-
k8s.io/apimachinery v0.30.1
22-
k8s.io/client-go v0.30.1
23-
k8s.io/component-base v0.30.1
24-
k8s.io/klog/v2 v2.120.1
25-
k8s.io/kubelet v0.30.0
26-
k8s.io/kubernetes v1.30.0
20+
k8s.io/api v0.31.0-beta.0
21+
k8s.io/apimachinery v0.31.0-beta.0
22+
k8s.io/client-go v0.31.0-beta.0
23+
k8s.io/component-base v0.31.0-beta.0
24+
k8s.io/klog/v2 v2.130.1
25+
k8s.io/kubelet v0.31.0-beta.0
26+
k8s.io/kubernetes v1.31.0-beta.0
2727
k8s.io/pod-security-admission v0.0.0
28-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
29-
sigs.k8s.io/controller-runtime v0.18.4
28+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
29+
sigs.k8s.io/controller-runtime v0.18.1-0.20240717190548-1ed345090869
3030
sigs.k8s.io/yaml v1.4.0
3131
tags.cncf.io/container-device-interface/specs-go v0.7.0
3232
)
3333

3434
require (
3535
github.com/Microsoft/go-winio v0.6.0 // indirect
3636
github.com/NYTimes/gziphandler v1.1.1 // indirect
37-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
37+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3838
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3939
github.com/beorn7/perks v1.0.1 // indirect
4040
github.com/blang/semver/v4 v4.0.0 // indirect
41-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
41+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4242
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4343
github.com/coreos/go-semver v0.3.1 // indirect
4444
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
45-
github.com/davecgh/go-spew v1.1.1 // indirect
45+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4646
github.com/distribution/reference v0.5.0 // indirect
4747
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4848
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4949
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
50-
github.com/felixge/httpsnoop v1.0.3 // indirect
50+
github.com/felixge/httpsnoop v1.0.4 // indirect
51+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5152
github.com/go-logr/stdr v1.2.2 // indirect
5253
github.com/go-openapi/jsonpointer v0.19.6 // indirect
5354
github.com/go-openapi/jsonreference v0.20.2 // indirect
54-
github.com/go-openapi/swag v0.22.3 // indirect
55+
github.com/go-openapi/swag v0.22.4 // indirect
5556
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5657
github.com/gogo/protobuf v1.3.2 // indirect
5758
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5859
github.com/golang/protobuf v1.5.4 // indirect
59-
github.com/google/cel-go v0.17.8 // indirect
60+
github.com/google/cel-go v0.20.1 // indirect
6061
github.com/google/gnostic-models v0.6.8 // indirect
6162
github.com/google/gofuzz v1.2.0 // indirect
62-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
63+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
6364
github.com/google/uuid v1.6.0 // indirect
6465
github.com/gorilla/websocket v1.5.0 // indirect
6566
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
66-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
67+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
6768
github.com/imdario/mergo v0.3.12 // indirect
6869
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6970
github.com/josharian/intern v1.0.0 // indirect
7071
github.com/json-iterator/go v1.1.12 // indirect
7172
github.com/mailru/easyjson v0.7.7 // indirect
72-
github.com/moby/spdystream v0.2.0 // indirect
73+
github.com/moby/spdystream v0.4.0 // indirect
7374
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7475
github.com/modern-go/reflect2 v1.0.2 // indirect
7576
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7677
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7778
github.com/opencontainers/go-digest v1.0.0 // indirect
7879
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect
79-
github.com/prometheus/client_golang v1.18.0 // indirect
80-
github.com/prometheus/procfs v0.12.0 // indirect
81-
github.com/spf13/cobra v1.7.0 // indirect
80+
github.com/prometheus/client_golang v1.19.1 // indirect
81+
github.com/prometheus/procfs v0.15.1 // indirect
82+
github.com/spf13/cobra v1.8.1 // indirect
8283
github.com/spf13/pflag v1.0.5 // indirect
8384
github.com/stoewer/go-strcase v1.2.0 // indirect
84-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
85-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
86-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
87-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
88-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
89-
go.opentelemetry.io/otel v1.20.0 // indirect
90-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
91-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
92-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
93-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
94-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
95-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
85+
github.com/x448/float16 v0.8.4 // indirect
86+
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
87+
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
88+
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
89+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
90+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
91+
go.opentelemetry.io/otel v1.28.0 // indirect
92+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
93+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
94+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
95+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
96+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
97+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
9698
go.uber.org/multierr v1.11.0 // indirect
9799
go.uber.org/zap v1.27.0 // indirect
98-
golang.org/x/crypto v0.23.0 // indirect
99-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
100+
golang.org/x/crypto v0.24.0 // indirect
101+
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
100102
golang.org/x/mod v0.17.0 // indirect
101-
golang.org/x/net v0.25.0 // indirect
102-
golang.org/x/oauth2 v0.20.0 // indirect
103+
golang.org/x/net v0.26.0 // indirect
104+
golang.org/x/oauth2 v0.21.0 // indirect
103105
golang.org/x/sync v0.7.0 // indirect
104-
golang.org/x/term v0.20.0 // indirect
106+
golang.org/x/term v0.21.0 // indirect
105107
golang.org/x/time v0.3.0 // indirect
106108
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
107109
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
108110
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
109111
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
110-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
111-
google.golang.org/protobuf v1.34.1 // indirect
112+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
113+
google.golang.org/protobuf v1.34.2 // indirect
114+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
112115
gopkg.in/inf.v0 v0.9.1 // indirect
113116
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
114117
gopkg.in/yaml.v3 v3.0.1 // indirect
115-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
116-
k8s.io/apiserver v0.30.1 // indirect
118+
k8s.io/apiextensions-apiserver v0.31.0-beta.0 // indirect
119+
k8s.io/apiserver v0.31.0-beta.0 // indirect
117120
k8s.io/cloud-provider v0.0.0 // indirect
118-
k8s.io/component-helpers v0.30.0 // indirect
119-
k8s.io/controller-manager v0.30.0 // indirect
120-
k8s.io/kms v0.30.0 // indirect
121+
k8s.io/component-helpers v0.31.0-beta.0 // indirect
122+
k8s.io/controller-manager v0.31.0-beta.0 // indirect
123+
k8s.io/cri-api v0.31.0-beta.0 // indirect
124+
k8s.io/cri-client v0.0.0 // indirect
125+
k8s.io/kms v0.31.0-beta.0 // indirect
121126
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
122127
k8s.io/kubectl v0.0.0 // indirect
123-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
128+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
124129
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
125130
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
126131
)
127132

128133
replace (
129-
k8s.io/api => k8s.io/api v0.30.0
130-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.0
131-
k8s.io/apimachinery => k8s.io/apimachinery v0.30.0
132-
k8s.io/apiserver => k8s.io/apiserver v0.30.0
133-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.0
134-
k8s.io/client-go => k8s.io/client-go v0.30.0
135-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.0
136-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.0
137-
k8s.io/code-generator => k8s.io/code-generator v0.30.0
138-
k8s.io/component-base => k8s.io/component-base v0.30.0
139-
k8s.io/component-helpers => k8s.io/component-helpers v0.30.0
140-
k8s.io/controller-manager => k8s.io/controller-manager v0.30.0
141-
k8s.io/cri-api => k8s.io/cri-api v0.30.0
142-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.0
143-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.0
144-
k8s.io/endpointslice => k8s.io/endpointslice v0.30.0
145-
k8s.io/kms => k8s.io/kms v0.30.0
146-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.0
147-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.0
148-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.0
149-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.0
150-
k8s.io/kubectl => k8s.io/kubectl v0.30.0
151-
k8s.io/kubelet => k8s.io/kubelet v0.30.0
134+
k8s.io/api => k8s.io/api v0.31.0-beta.0
135+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0-beta.0
136+
k8s.io/apimachinery => k8s.io/apimachinery v0.31.0-beta.0
137+
k8s.io/apiserver => k8s.io/apiserver v0.31.0-beta.0
138+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0-beta.0
139+
k8s.io/client-go => k8s.io/client-go v0.31.0-beta.0
140+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0-beta.0
141+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0-beta.0
142+
k8s.io/code-generator => k8s.io/code-generator v0.31.0-beta.0
143+
k8s.io/component-base => k8s.io/component-base v0.31.0-beta.0
144+
k8s.io/component-helpers => k8s.io/component-helpers v0.31.0-beta.0
145+
k8s.io/controller-manager => k8s.io/controller-manager v0.31.0-beta.0
146+
k8s.io/cri-api => k8s.io/cri-api v0.31.0-beta.0
147+
k8s.io/cri-client => k8s.io/cri-client v0.31.0-beta.0
148+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0-beta.0
149+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0-beta.0
150+
k8s.io/endpointslice => k8s.io/endpointslice v0.31.0-beta.0
151+
k8s.io/kms => k8s.io/kms v0.31.0-beta.0
152+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0-beta.0
153+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0-beta.0
154+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0-beta.0
155+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0-beta.0
156+
k8s.io/kubectl => k8s.io/kubectl v0.31.0-beta.0
157+
k8s.io/kubelet => k8s.io/kubelet v0.31.0-beta.0
152158
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0
153-
k8s.io/metrics => k8s.io/metrics v0.30.0
154-
k8s.io/mount-utils => k8s.io/mount-utils v0.30.0
155-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.0
156-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.0
157-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.0
158-
k8s.io/sample-controller => k8s.io/sample-controller v0.30.0
159+
k8s.io/metrics => k8s.io/metrics v0.31.0-beta.0
160+
k8s.io/mount-utils => k8s.io/mount-utils v0.31.0-beta.0
161+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0-beta.0
162+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0-beta.0
163+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0-beta.0
164+
k8s.io/sample-controller => k8s.io/sample-controller v0.31.0-beta.0
159165
)

0 commit comments

Comments
 (0)