Skip to content

Commit 951acca

Browse files
stefanprodanstefanprodan
committed
Update API to Kubernetes v1.28.6
Signed-off-by: Stefan Prodan <[email protected]>
1 parent 9aa21f6 commit 951acca

File tree

5 files changed

+31
-26
lines changed

5 files changed

+31
-26
lines changed

‎api/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/fluxcd/helm-controller/api
33
go 1.20
44

55
require (
6-
github.com/fluxcd/pkg/apis/kustomize v1.2.0
7-
github.com/fluxcd/pkg/apis/meta v1.2.0
8-
k8s.io/apiextensions-apiserver v0.28.4
9-
k8s.io/apimachinery v0.28.4
6+
github.com/fluxcd/pkg/apis/kustomize v1.3.0
7+
github.com/fluxcd/pkg/apis/meta v1.3.0
8+
k8s.io/apiextensions-apiserver v0.28.6
9+
k8s.io/apimachinery v0.28.6
1010
sigs.k8s.io/controller-runtime v0.16.3
1111
sigs.k8s.io/yaml v1.4.0
1212
)
@@ -18,7 +18,7 @@ require (
1818
github.com/json-iterator/go v1.1.12 // indirect
1919
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2020
github.com/modern-go/reflect2 v1.0.2 // indirect
21-
golang.org/x/net v0.19.0 // indirect
21+
golang.org/x/net v0.20.0 // indirect
2222
golang.org/x/text v0.14.0 // indirect
2323
gopkg.in/inf.v0 v0.9.1 // indirect
2424
gopkg.in/yaml.v2 v2.4.0 // indirect

‎api/go.sum

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/fluxcd/pkg/apis/kustomize v1.2.0 h1:vkVs+OumxaWso0jNCqdgFFfMHdh+qtZhykTkjl7OgmA=
5-
github.com/fluxcd/pkg/apis/kustomize v1.2.0/go.mod h1:VF7tR/WuVFeum+HaMTHwp+eCtsHiiQlY6ihgqtAnW/M=
6-
github.com/fluxcd/pkg/apis/meta v1.2.0 h1:O766PzGAdMdQKybSflGL8oV0+GgCNIkdsxfalRyzeO8=
7-
github.com/fluxcd/pkg/apis/meta v1.2.0/go.mod h1:fU/Az9AoVyIxC0oI4ihG0NVMNnvrcCzdEym3wxjIQsc=
4+
github.com/fluxcd/pkg/apis/kustomize v1.3.0 h1:qvB46CfaOWcL1SyR2RiVWN/j7/035D0OtB1ltLN7rgI=
5+
github.com/fluxcd/pkg/apis/kustomize v1.3.0/go.mod h1:PCXf5kktTzNav0aH2Ns3jsowqwmA9xTcsrEOoPzx/K8=
6+
github.com/fluxcd/pkg/apis/meta v1.3.0 h1:KxeEc6olmSZvQ5pBONPE4IKxyoWQbqTJF1X6K5nIXpU=
7+
github.com/fluxcd/pkg/apis/meta v1.3.0/go.mod h1:3Ui8xFkoU4sYehqmscjpq7NjqH2YN1A2iX2okbO3/yA=
88
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
99
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
1010
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
@@ -47,15 +47,15 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
4747
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4848
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
4949
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
50-
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
51-
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
50+
golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
51+
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
5252
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5353
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5454
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5555
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5656
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5757
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
58-
golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
58+
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
5959
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6060
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
6161
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -64,7 +64,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
6464
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
6565
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
6666
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
67-
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
67+
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
6868
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
6969
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7070
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -77,11 +77,11 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
7777
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
7878
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
7979
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
80-
k8s.io/api v0.28.4 h1:8ZBrLjwosLl/NYgv1P7EQLqoO8MGQApnbgH8tu3BMzY=
81-
k8s.io/apiextensions-apiserver v0.28.4 h1:AZpKY/7wQ8n+ZYDtNHbAJBb+N4AXXJvyZx6ww6yAJvU=
82-
k8s.io/apiextensions-apiserver v0.28.4/go.mod h1:pgQIZ1U8eJSMQcENew/0ShUTlePcSGFq6dxSxf2mwPM=
83-
k8s.io/apimachinery v0.28.4 h1:zOSJe1mc+GxuMnFzD4Z/U1wst50X28ZNsn5bhgIIao8=
84-
k8s.io/apimachinery v0.28.4/go.mod h1:wI37ncBvfAoswfq626yPTe6Bz1c22L7uaJ8dho83mgg=
80+
k8s.io/api v0.28.6 h1:yy6u9CuIhmg55YvF/BavPBBXB+5QicB64njJXxVnzLo=
81+
k8s.io/apiextensions-apiserver v0.28.6 h1:myB3iG/3v3jqCg28JDbOefu4sH2/erNEXgytRzJKBOo=
82+
k8s.io/apiextensions-apiserver v0.28.6/go.mod h1:qlp6xRKBgyRhe5AYc81TQpLx4kLNK8/sGQUOwMkVjRk=
83+
k8s.io/apimachinery v0.28.6 h1:RsTeR4z6S07srPg6XYrwXpTJVMXsjPXn0ODakMytSW0=
84+
k8s.io/apimachinery v0.28.6/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
8585
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
8686
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
8787
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=

‎internal/action/diff.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ import (
3636
"github.com/fluxcd/cli-utils/pkg/object"
3737
"github.com/fluxcd/pkg/ssa"
3838
"github.com/fluxcd/pkg/ssa/jsondiff"
39+
ssanormalize "github.com/fluxcd/pkg/ssa/normalize"
40+
ssautil "github.com/fluxcd/pkg/ssa/utils"
3941

4042
v2 "github.com/fluxcd/helm-controller/api/v2beta2"
4143
"github.com/fluxcd/helm-controller/internal/diff"
@@ -55,11 +57,11 @@ func Diff(ctx context.Context, config *helmaction.Configuration, rls *helmreleas
5557
}
5658

5759
// Read the release manifest and normalize the objects.
58-
objects, err := ssa.ReadObjects(strings.NewReader(rls.Manifest))
60+
objects, err := ssautil.ReadObjects(strings.NewReader(rls.Manifest))
5961
if err != nil {
6062
return nil, fmt.Errorf("failed to read objects from release manifest: %w", err)
6163
}
62-
if err = ssa.NormalizeUnstructuredListWithScheme(objects, c.Scheme()); err != nil {
64+
if err = ssanormalize.UnstructuredListWithScheme(objects, c.Scheme()); err != nil {
6365
return nil, fmt.Errorf("failed to normalize release objects: %w", err)
6466
}
6567

‎internal/action/diff_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ import (
4343
"github.com/fluxcd/pkg/apis/kustomize"
4444
"github.com/fluxcd/pkg/ssa"
4545
"github.com/fluxcd/pkg/ssa/jsondiff"
46+
ssanormalize "github.com/fluxcd/pkg/ssa/normalize"
47+
ssautil "github.com/fluxcd/pkg/ssa/utils"
4648

4749
v2 "github.com/fluxcd/helm-controller/api/v2beta2"
4850
"github.com/fluxcd/helm-controller/internal/kube"
@@ -406,7 +408,7 @@ data:
406408

407409
rls := &helmrelease.Release{Name: tt.name, Namespace: ns.Name, Manifest: tt.manifest}
408410

409-
objs, err := ssa.ReadObjects(strings.NewReader(tt.manifest))
411+
objs, err := ssautil.ReadObjects(strings.NewReader(tt.manifest))
410412
if err != nil {
411413
t.Fatalf("Failed to read release objects: %v", err)
412414
}
@@ -430,7 +432,7 @@ data:
430432
})
431433

432434
for _, obj := range clusterObjs {
433-
if err = ssa.NormalizeUnstructured(obj); err != nil {
435+
if err = ssanormalize.Unstructured(obj); err != nil {
434436
t.Fatalf("Failed to normalize cluster manifest: %v", err)
435437
}
436438
if err := c.Create(ctx, obj, client.FieldOwner(testOwner)); err != nil {
@@ -827,6 +829,6 @@ func generateName(name string) string {
827829
func namespacedUnstructured(obj *unstructured.Unstructured, namespace string) *unstructured.Unstructured {
828830
obj = obj.DeepCopy()
829831
obj.SetNamespace(namespace)
830-
_ = ssa.NormalizeUnstructured(obj)
832+
_ = ssanormalize.Unstructured(obj)
831833
return obj
832834
}

‎internal/reconcile/state_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ import (
2929
helmdriver "helm.sh/helm/v3/pkg/storage/driver"
3030
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3131

32-
"github.com/fluxcd/pkg/ssa"
3332
"github.com/fluxcd/pkg/ssa/jsondiff"
33+
ssanormalize "github.com/fluxcd/pkg/ssa/normalize"
34+
ssautil "github.com/fluxcd/pkg/ssa/utils"
3435

3536
v2 "github.com/fluxcd/helm-controller/api/v2beta2"
3637
"github.com/fluxcd/helm-controller/internal/action"
@@ -619,11 +620,11 @@ func TestDetermineReleaseState_DriftDetection(t *testing.T) {
619620
})
620621

621622
if tt.applyManifest {
622-
objs, err := ssa.ReadObjects(strings.NewReader(rls.Manifest))
623+
objs, err := ssautil.ReadObjects(strings.NewReader(rls.Manifest))
623624
g.Expect(err).ToNot(HaveOccurred())
624625

625626
for _, obj := range objs {
626-
g.Expect(ssa.NormalizeUnstructured(obj)).To(Succeed())
627+
g.Expect(ssanormalize.Unstructured(obj)).To(Succeed())
627628
obj.SetNamespace(releaseNamespace)
628629
obj.SetLabels(map[string]string{
629630
"app.kubernetes.io/managed-by": "Helm",

0 commit comments

Comments
 (0)