Skip to content

Commit 8c6d8e2

Browse files
aledbfaledbf
authored
Update dependencies (#18362)
* Update k8s dependencies to v1.27.3 * Update opencontainers/runtime-spec to v1.1.0 * Update controller runtime to v0.15.0 * Update go modules * Fix build * Cleanup * Fix ws-manager e2e tests
1 parent 62ec096 commit 8c6d8e2

File tree

84 files changed

+2553
-2523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+2553
-2523
lines changed

‎components/blobserve/go.mod

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ require (
110110
google.golang.org/protobuf v1.30.0 // indirect
111111
gopkg.in/inf.v0 v0.9.1 // indirect
112112
gopkg.in/yaml.v2 v2.4.0 // indirect
113-
k8s.io/api v0.26.2 // indirect
114-
k8s.io/apimachinery v0.26.2 // indirect
115-
k8s.io/klog/v2 v2.80.1 // indirect
116-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
113+
k8s.io/api v0.27.3 // indirect
114+
k8s.io/apimachinery v0.27.3 // indirect
115+
k8s.io/klog/v2 v2.90.1 // indirect
116+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
117117
lukechampine.com/blake3 v1.2.1 // indirect
118-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
118+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
119119
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
120120
)
121121

@@ -127,52 +127,52 @@ replace github.com/gitpod-io/gitpod/registry-facade => ../registry-facade // lee
127127

128128
replace github.com/gitpod-io/gitpod/registry-facade/api => ../registry-facade-api/go // leeway
129129

130-
replace k8s.io/api => k8s.io/api v0.26.2 // leeway indirect from components/common-go:lib
130+
replace k8s.io/api => k8s.io/api v0.27.3 // leeway indirect from components/common-go:lib
131131

132-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.2 // leeway indirect from components/common-go:lib
132+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.3 // leeway indirect from components/common-go:lib
133133

134-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.2 // leeway indirect from components/common-go:lib
134+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.3 // leeway indirect from components/common-go:lib
135135

136-
replace k8s.io/apiserver => k8s.io/apiserver v0.26.2 // leeway indirect from components/common-go:lib
136+
replace k8s.io/apiserver => k8s.io/apiserver v0.27.3 // leeway indirect from components/common-go:lib
137137

138-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.2 // leeway indirect from components/common-go:lib
138+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.3 // leeway indirect from components/common-go:lib
139139

140-
replace k8s.io/client-go => k8s.io/client-go v0.26.2 // leeway indirect from components/common-go:lib
140+
replace k8s.io/client-go => k8s.io/client-go v0.27.3 // leeway indirect from components/common-go:lib
141141

142-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.2 // leeway indirect from components/common-go:lib
142+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.3 // leeway indirect from components/common-go:lib
143143

144-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.2 // leeway indirect from components/common-go:lib
144+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.3 // leeway indirect from components/common-go:lib
145145

146-
replace k8s.io/code-generator => k8s.io/code-generator v0.26.2 // leeway indirect from components/common-go:lib
146+
replace k8s.io/code-generator => k8s.io/code-generator v0.27.3 // leeway indirect from components/common-go:lib
147147

148-
replace k8s.io/component-base => k8s.io/component-base v0.26.2 // leeway indirect from components/common-go:lib
148+
replace k8s.io/component-base => k8s.io/component-base v0.27.3 // leeway indirect from components/common-go:lib
149149

150-
replace k8s.io/cri-api => k8s.io/cri-api v0.26.2 // leeway indirect from components/common-go:lib
150+
replace k8s.io/cri-api => k8s.io/cri-api v0.27.3 // leeway indirect from components/common-go:lib
151151

152-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.2 // leeway indirect from components/common-go:lib
152+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.3 // leeway indirect from components/common-go:lib
153153

154-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.2 // leeway indirect from components/common-go:lib
154+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.3 // leeway indirect from components/common-go:lib
155155

156-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.2 // leeway indirect from components/common-go:lib
156+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.3 // leeway indirect from components/common-go:lib
157157

158-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.2 // leeway indirect from components/common-go:lib
158+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.3 // leeway indirect from components/common-go:lib
159159

160-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.2 // leeway indirect from components/common-go:lib
160+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.3 // leeway indirect from components/common-go:lib
161161

162-
replace k8s.io/kubelet => k8s.io/kubelet v0.26.2 // leeway indirect from components/common-go:lib
162+
replace k8s.io/kubelet => k8s.io/kubelet v0.27.3 // leeway indirect from components/common-go:lib
163163

164-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.2 // leeway indirect from components/common-go:lib
164+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.3 // leeway indirect from components/common-go:lib
165165

166-
replace k8s.io/metrics => k8s.io/metrics v0.26.2 // leeway indirect from components/common-go:lib
166+
replace k8s.io/metrics => k8s.io/metrics v0.27.3 // leeway indirect from components/common-go:lib
167167

168-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.2 // leeway indirect from components/common-go:lib
168+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.3 // leeway indirect from components/common-go:lib
169169

170-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.2 // leeway indirect from components/common-go:lib
170+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.3 // leeway indirect from components/common-go:lib
171171

172-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.2 // leeway indirect from components/common-go:lib
172+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.3 // leeway indirect from components/common-go:lib
173173

174-
replace k8s.io/kubectl => k8s.io/kubectl v0.26.2 // leeway indirect from components/common-go:lib
174+
replace k8s.io/kubectl => k8s.io/kubectl v0.27.3 // leeway indirect from components/common-go:lib
175175

176-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.2 // leeway indirect from components/common-go:lib
176+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.3 // leeway indirect from components/common-go:lib
177177

178-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.2 // leeway indirect from components/common-go:lib
178+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.3 // leeway indirect from components/common-go:lib

‎components/blobserve/go.sum

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/common-go/go.mod

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ require (
2424
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
2525
github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
2626
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
27-
golang.org/x/sys v0.5.0
27+
golang.org/x/sys v0.6.0
2828
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
2929
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
3030
google.golang.org/grpc v1.52.3
3131
google.golang.org/protobuf v1.28.1
3232
gopkg.in/segmentio/analytics-go.v3 v3.1.0
33-
k8s.io/api v0.26.2
34-
k8s.io/apimachinery v0.26.2
33+
k8s.io/api v0.27.3
34+
k8s.io/apimachinery v0.27.3
3535
)
3636

3737
require (
@@ -46,7 +46,7 @@ require (
4646
github.com/go-logr/logr v1.2.3 // indirect
4747
github.com/godbus/dbus/v5 v5.0.4 // indirect
4848
github.com/gogo/protobuf v1.3.2 // indirect
49-
github.com/golang/protobuf v1.5.2 // indirect
49+
github.com/golang/protobuf v1.5.3 // indirect
5050
github.com/google/gofuzz v1.1.0 // indirect
5151
github.com/json-iterator/go v1.1.12 // indirect
5252
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -59,69 +59,69 @@ require (
5959
github.com/prometheus/common v0.42.0 // indirect
6060
github.com/prometheus/procfs v0.8.0 // indirect
6161
go.uber.org/atomic v1.4.0 // indirect
62-
golang.org/x/net v0.7.0 // indirect
63-
golang.org/x/text v0.7.0 // indirect
62+
golang.org/x/net v0.8.0 // indirect
63+
golang.org/x/text v0.8.0 // indirect
6464
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
6565
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
6666
gopkg.in/inf.v0 v0.9.1 // indirect
6767
gopkg.in/yaml.v2 v2.4.0 // indirect
6868
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/klog/v2 v2.80.1 // indirect
70-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
71-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
69+
k8s.io/klog/v2 v2.90.1 // indirect
70+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
71+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7272
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7373
)
7474

7575
require github.com/mitchellh/reflectwalk v1.0.2 // indirect
7676

77-
replace k8s.io/api => k8s.io/api v0.26.2
77+
replace k8s.io/api => k8s.io/api v0.27.3
7878

79-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.2
79+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.27.3
8080

81-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.26.2
81+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.27.3
8282

83-
replace k8s.io/apiserver => k8s.io/apiserver v0.26.2
83+
replace k8s.io/apiserver => k8s.io/apiserver v0.27.3
8484

85-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.2
85+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.27.3
8686

87-
replace k8s.io/client-go => k8s.io/client-go v0.26.2
87+
replace k8s.io/client-go => k8s.io/client-go v0.27.3
8888

89-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.2
89+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.27.3
9090

91-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.2
91+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.27.3
9292

93-
replace k8s.io/code-generator => k8s.io/code-generator v0.26.2
93+
replace k8s.io/code-generator => k8s.io/code-generator v0.27.3
9494

95-
replace k8s.io/component-base => k8s.io/component-base v0.26.2
95+
replace k8s.io/component-base => k8s.io/component-base v0.27.3
9696

97-
replace k8s.io/cri-api => k8s.io/cri-api v0.26.2
97+
replace k8s.io/cri-api => k8s.io/cri-api v0.27.3
9898

99-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.2
99+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.27.3
100100

101-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.2
101+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.27.3
102102

103-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.2
103+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.27.3
104104

105-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.2
105+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.27.3
106106

107-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.2
107+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.27.3
108108

109-
replace k8s.io/kubelet => k8s.io/kubelet v0.26.2
109+
replace k8s.io/kubelet => k8s.io/kubelet v0.27.3
110110

111-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.2
111+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.27.3
112112

113-
replace k8s.io/metrics => k8s.io/metrics v0.26.2
113+
replace k8s.io/metrics => k8s.io/metrics v0.27.3
114114

115-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.2
115+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.27.3
116116

117-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.26.2
117+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.27.3
118118

119-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.26.2
119+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.27.3
120120

121-
replace k8s.io/kubectl => k8s.io/kubectl v0.26.2
121+
replace k8s.io/kubectl => k8s.io/kubectl v0.27.3
122122

123-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.26.2
123+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.27.3
124124

125-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.2
125+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.27.3
126126

127127
replace github.com/gitpod-io/gitpod/components/scrubber => ../scrubber // leeway

0 commit comments

Comments
 (0)