Skip to content

Commit 072e27b

Browse files
committed
feat: Upgrade to Kubernetes 1.21
Kubernetes dependencies are upgraded to the latest 1.21 release. A module replacement for github.com/golang/protobuf to facilitate skycfg functionality has been commented out as well, in the hopes that things are working almost two years on. Unfortunately, the root skycfg issue remains open. In the meantime, Segment has ceased experimenting with it.
1 parent 07cef87 commit 072e27b

File tree

3 files changed

+159
-70
lines changed

3 files changed

+159
-70
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,7 @@ Kubernetes structs (from [Protocol Buffers](https://developers.google.com/protoc
206206
so it can provide more structure and less repetition than YAML-based sources. See
207207
[this file](/examples/kubeapply-test-cluster/profile/apps/redis/deployment.star) for an example.
208208

209-
The skycfg support in `kubeapply` should be considered experimental. We're using it for
210-
a few test services in Segment, but it has not been widely exercised internally.
209+
The skycfg support in `kubeapply` is experimental and unsupported.
211210

212211
### Expanded configs
213212

go.mod

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ require (
3131
go.starlark.net v0.0.0-20201204201740-42d4f566359b
3232
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
3333
gopkg.in/src-d/go-git.v4 v4.13.1
34-
gopkg.in/yaml.v2 v2.3.0
34+
gopkg.in/yaml.v2 v2.4.0
3535
gopkg.in/zorkian/go-datadog-api.v2 v2.28.0
36-
k8s.io/api v0.20.2
37-
k8s.io/apimachinery v0.20.2
38-
k8s.io/client-go v0.20.2
39-
k8s.io/klog/v2 v2.4.0
40-
k8s.io/kubectl v0.20.2
36+
k8s.io/api v0.21.14
37+
k8s.io/apimachinery v0.21.14
38+
k8s.io/client-go v0.21.14
39+
k8s.io/klog/v2 v2.9.0
40+
k8s.io/kubectl v0.21.14
4141
)
4242

4343
require (
@@ -47,8 +47,9 @@ require (
4747
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
4848
github.com/davecgh/go-spew v1.1.1 // indirect
4949
github.com/emirpasic/gods v1.12.0 // indirect
50-
github.com/go-logr/logr v0.2.0 // indirect
51-
github.com/golang/protobuf v1.4.3 // indirect
50+
github.com/go-logr/logr v0.4.0 // indirect
51+
github.com/golang/protobuf v1.5.0 // indirect
52+
github.com/google/go-cmp v0.5.5 // indirect
5253
github.com/google/go-querystring v1.0.0 // indirect
5354
github.com/google/gofuzz v1.1.0 // indirect
5455
github.com/google/uuid v1.1.2 // indirect
@@ -61,7 +62,6 @@ require (
6162
github.com/json-iterator/go v1.1.10 // indirect
6263
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
6364
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
64-
github.com/kr/text v0.2.0 // indirect
6565
github.com/mattn/go-colorable v0.1.4 // indirect
6666
github.com/mattn/go-isatty v0.0.11 // indirect
6767
github.com/mattn/go-runewidth v0.0.9 // indirect
@@ -71,13 +71,12 @@ require (
7171
github.com/mitchellh/reflectwalk v1.0.0 // indirect
7272
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7373
github.com/modern-go/reflect2 v1.0.1 // indirect
74-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
7574
github.com/pkg/errors v0.9.1 // indirect
7675
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
7776
github.com/segmentio/asm v1.1.3 // indirect
7877
github.com/segmentio/go-snakecase v1.1.0 // indirect
7978
github.com/segmentio/objconv v1.0.1 // indirect
80-
github.com/sergi/go-diff v1.0.0 // indirect
79+
github.com/sergi/go-diff v1.1.0 // indirect
8180
github.com/shopspring/decimal v1.2.0 // indirect
8281
github.com/spf13/cast v1.3.1 // indirect
8382
github.com/spf13/pflag v1.0.5 // indirect
@@ -88,24 +87,26 @@ require (
8887
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
8988
github.com/yashtewari/glob-intersection v0.0.0-20180916065949-5c77d914dd0b // indirect
9089
github.com/zorkian/go-datadog-api v2.28.0+incompatible // indirect
91-
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect
92-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
90+
golang.org/x/crypto v0.0.0-20211202192323-5770296d904e // indirect
91+
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
9392
golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 // indirect
94-
golang.org/x/text v0.3.4 // indirect
95-
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
93+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
94+
golang.org/x/text v0.3.6 // indirect
95+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
9696
google.golang.org/appengine v1.6.5 // indirect
97-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
97+
google.golang.org/protobuf v1.26.0 // indirect
9898
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
9999
gopkg.in/go-playground/mold.v2 v2.2.0 // indirect
100100
gopkg.in/inf.v0 v0.9.1 // indirect
101101
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
102102
gopkg.in/validator.v2 v2.0.0-20180514200540-135c24b11c19 // indirect
103103
gopkg.in/warnings.v0 v0.1.2 // indirect
104104
gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 // indirect
105-
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
106-
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
105+
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
106+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
107107
sigs.k8s.io/yaml v1.2.0 // indirect
108108
)
109109

110-
// Need to pin to older version to get around https://github.com/stripe/skycfg/issues/86.
111-
replace github.com/golang/protobuf v1.4.3 => github.com/golang/protobuf v1.3.2
110+
// For problems with skycfg, try rebuilding with this replacement.
111+
// Reference: https://github.com/stripe/skycfg/issues/86
112+
// replace github.com/golang/protobuf v1.5.0 => github.com/golang/protobuf v1.3.2

0 commit comments

Comments
 (0)