Skip to content

Commit 2e007cb

Browse files
committed
ssa: Update Kubernetes to v1.28.4
Switch from `sigs.k8s.io/cli-utils` to `github.com/fluxcd/cli-utils` to unblock Kubernetes and Kustomize updates. Signed-off-by: Stefan Prodan <[email protected]>
1 parent e7686cf commit 2e007cb

File tree

9 files changed

+158
-163
lines changed

9 files changed

+158
-163
lines changed

ssa/changeset.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"fmt"
2222
"strings"
2323

24-
"sigs.k8s.io/cli-utils/pkg/object"
24+
"github.com/fluxcd/cli-utils/pkg/object"
2525
)
2626

2727
// Action represents the action type performed by the reconciliation process.

ssa/go.mod

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,82 +6,83 @@ go 1.20
66
replace gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
77

88
require (
9-
github.com/evanphx/json-patch/v5 v5.6.0
10-
github.com/google/go-cmp v0.5.9
11-
github.com/onsi/gomega v1.27.10
9+
github.com/evanphx/json-patch/v5 v5.7.0
10+
// TODO: switch back to sigs.k8s.io/cli-utils once they update to Kubernetes 1.28
11+
github.com/fluxcd/cli-utils v0.36.0-flux.1
12+
github.com/google/go-cmp v0.6.0
13+
github.com/onsi/gomega v1.30.0
1214
// TODO: unpin when https://github.com/wI2L/jsondiff/pull/14 has ended up in a release.
1315
github.com/wI2L/jsondiff v0.4.1-0.20230626084051-c85fb8ce3cac
14-
golang.org/x/sync v0.3.0
15-
k8s.io/api v0.27.7
16-
k8s.io/apimachinery v0.27.7
17-
k8s.io/client-go v0.27.7
18-
k8s.io/utils v0.0.0-20230209194617-a36077c30491
19-
sigs.k8s.io/cli-utils v0.35.0
20-
sigs.k8s.io/controller-runtime v0.15.3
21-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0
22-
sigs.k8s.io/yaml v1.3.0
16+
golang.org/x/sync v0.5.0
17+
k8s.io/api v0.28.4
18+
k8s.io/apimachinery v0.28.4
19+
k8s.io/client-go v0.28.4
20+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
21+
sigs.k8s.io/controller-runtime v0.16.3
22+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
23+
sigs.k8s.io/yaml v1.4.0
2324
)
2425

2526
require (
2627
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2728
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2829
github.com/chai2010/gettext-go v1.0.2 // indirect
2930
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
31-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
31+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
32+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3233
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
3334
github.com/go-errors/errors v1.4.2 // indirect
34-
github.com/go-logr/logr v1.2.4 // indirect
35+
github.com/go-logr/logr v1.3.0 // indirect
3536
github.com/go-openapi/jsonpointer v0.19.6 // indirect
36-
github.com/go-openapi/jsonreference v0.20.1 // indirect
37+
github.com/go-openapi/jsonreference v0.20.2 // indirect
3738
github.com/go-openapi/swag v0.22.3 // indirect
3839
github.com/gogo/protobuf v1.3.2 // indirect
3940
github.com/golang/protobuf v1.5.3 // indirect
4041
github.com/google/btree v1.0.1 // indirect
41-
github.com/google/gnostic v0.5.7-v3refs // indirect
42+
github.com/google/gnostic-models v0.6.8 // indirect
4243
github.com/google/gofuzz v1.2.0 // indirect
4344
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
44-
github.com/google/uuid v1.3.0 // indirect
45+
github.com/google/uuid v1.4.0 // indirect
4546
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
46-
github.com/imdario/mergo v0.3.12 // indirect
47-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
47+
github.com/imdario/mergo v0.3.13 // indirect
48+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4849
github.com/josharian/intern v1.0.0 // indirect
4950
github.com/json-iterator/go v1.1.12 // indirect
50-
github.com/kr/pretty v0.3.1 // indirect
5151
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
5252
github.com/mailru/easyjson v0.7.7 // indirect
53-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
53+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5454
github.com/moby/spdystream v0.2.0 // indirect
55-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
55+
github.com/moby/term v0.5.0 // indirect
5656
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5757
github.com/modern-go/reflect2 v1.0.2 // indirect
5858
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5959
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6060
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
6161
github.com/pkg/errors v0.9.1 // indirect
6262
github.com/russross/blackfriday/v2 v2.1.0 // indirect
63-
github.com/spf13/cobra v1.6.1 // indirect
63+
github.com/spf13/cobra v1.8.0 // indirect
6464
github.com/spf13/pflag v1.0.5 // indirect
65-
github.com/xlab/treeprint v1.1.0 // indirect
66-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
67-
golang.org/x/net v0.17.0 // indirect
68-
golang.org/x/oauth2 v0.5.0 // indirect
69-
golang.org/x/sys v0.13.0 // indirect
70-
golang.org/x/term v0.13.0 // indirect
71-
golang.org/x/text v0.13.0 // indirect
72-
golang.org/x/time v0.3.0 // indirect
65+
github.com/xlab/treeprint v1.2.0 // indirect
66+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
67+
golang.org/x/net v0.18.0 // indirect
68+
golang.org/x/oauth2 v0.14.0 // indirect
69+
golang.org/x/sys v0.14.0 // indirect
70+
golang.org/x/term v0.14.0 // indirect
71+
golang.org/x/text v0.14.0 // indirect
72+
golang.org/x/time v0.4.0 // indirect
7373
google.golang.org/appengine v1.6.7 // indirect
74-
google.golang.org/protobuf v1.30.0 // indirect
74+
google.golang.org/protobuf v1.31.0 // indirect
75+
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
7576
gopkg.in/inf.v0 v0.9.1 // indirect
7677
gopkg.in/yaml.v2 v2.4.0 // indirect
7778
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.27.7 // indirect
79-
k8s.io/cli-runtime v0.26.0 // indirect
80-
k8s.io/component-base v0.27.7 // indirect
81-
k8s.io/klog/v2 v2.90.1 // indirect
82-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
83-
k8s.io/kubectl v0.26.0 // indirect
79+
k8s.io/apiextensions-apiserver v0.28.4 // indirect
80+
k8s.io/cli-runtime v0.28.4 // indirect
81+
k8s.io/component-base v0.28.4 // indirect
82+
k8s.io/klog/v2 v2.100.1 // indirect
83+
k8s.io/kube-openapi v0.0.0-20231113174909-778a5567bc1e // indirect
84+
k8s.io/kubectl v0.28.4 // indirect
8485
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
85-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
86-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
86+
sigs.k8s.io/kustomize/api v0.15.0 // indirect
87+
sigs.k8s.io/kustomize/kyaml v0.15.0 // indirect
8788
)

0 commit comments

Comments
 (0)