Skip to content

Commit 065d6ef

Browse files
matheuscscpmatheuscscp
authored
Merge pull request #2116 from alvaroaleman/dep
Remove controller-runtime dependency from api
2 parents e182c47 + 438fa65 commit 065d6ef

20 files changed

Lines changed: 64 additions & 88 deletions

‎api/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/fluxcd/pkg/apis/acl v0.10.0
77
github.com/fluxcd/pkg/apis/meta v1.30.0
88
k8s.io/apimachinery v0.36.1
9-
sigs.k8s.io/controller-runtime v0.24.1
109
)
1110

1211
require (
@@ -15,12 +14,12 @@ require (
1514
github.com/json-iterator/go v1.1.12 // indirect
1615
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1716
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
17+
github.com/onsi/gomega v1.39.0 // indirect
1818
github.com/x448/float16 v0.8.4 // indirect
1919
go.yaml.in/yaml/v2 v2.4.4 // indirect
2020
golang.org/x/net v0.55.0 // indirect
2121
golang.org/x/text v0.37.0 // indirect
2222
gopkg.in/inf.v0 v0.9.1 // indirect
23-
k8s.io/api v0.36.1 // indirect
2423
k8s.io/klog/v2 v2.140.0 // indirect
2524
k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25 // indirect
2625
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 // indirect

‎api/go.sum‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
2-
github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
31
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
42
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
53
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -12,13 +10,9 @@ github.com/fxamacker/cbor/v2 v2.9.2 h1:X4Ksno9+x3cz0TZv69ec1hxP/+tymuR8PXQJyDwfh
1210
github.com/fxamacker/cbor/v2 v2.9.2/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
1311
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
1412
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
15-
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
16-
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
1713
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1814
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1915
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
20-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 h1:BHT72Gu3keYf3ZEu2J0b1vyeLSOYI8bm5wbJM/8yDe8=
21-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
2216
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
2317
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
2418
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -27,8 +21,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
2721
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
2822
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFdJifH4BDsTlE89Zl93FEloxaWZfGcifgq8=
2923
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
30-
github.com/onsi/ginkgo/v2 v2.27.4 h1:fcEcQW/A++6aZAZQNUmNjvA9PSOzefMJBerHJ4t8v8Y=
31-
github.com/onsi/ginkgo/v2 v2.27.4/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
3224
github.com/onsi/gomega v1.39.0 h1:y2ROC3hKFmQZJNFeGAMeHZKkjBL65mIZcvrLQBF9k6Q=
3325
github.com/onsi/gomega v1.39.0/go.mod h1:ZCU1pkQcXDO5Sl9/VVEGlDyp+zm0m1cmeG5TOzLgdh4=
3426
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -46,24 +38,14 @@ go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
4638
go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
4739
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
4840
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
49-
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
50-
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
5141
golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
5242
golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
53-
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
54-
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
55-
golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
56-
golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
5743
golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
5844
golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
59-
golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
60-
golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
6145
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
6246
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
6347
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
6448
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
65-
k8s.io/api v0.36.1 h1:XbL/EMj8K2aJpJtePmqUyQMsM0D4QI2pvl7YKJ20FTY=
66-
k8s.io/api v0.36.1/go.mod h1:KOWo4ey3TINlXjeHVuwB3i+tXXnu+UcwFBHlI/9dvEo=
6749
k8s.io/apimachinery v0.36.1 h1:G63Gjx2W+q0YD+72Vo8oY0nDnePVwnuzTmmy5ENrVSA=
6850
k8s.io/apimachinery v0.36.1/go.mod h1:ibYOR00vW/I1kzvi5SF0dRuJ52BvKtfvRdOn35GPQ+8=
6951
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
@@ -72,8 +54,6 @@ k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25 h1:mPMaPMpBij2V1Wv/fR+HW1
7254
k8s.io/kube-openapi v0.0.0-20260603220949-865597e52e25/go.mod h1:V/QaCUYDa+0QpcHhVVc5l99Uz56wEMEXBSj9oCDkNDY=
7355
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2 h1:wU4tMEhLGgIbLvXQb1cfN+EcM0wf7zC6CPF+C79jroc=
7456
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
75-
sigs.k8s.io/controller-runtime v0.24.1 h1:miPEwrmirImAvgME1L9qebGHrOnGJoVmVdtOU9fRfo4=
76-
sigs.k8s.io/controller-runtime v0.24.1/go.mod h1:vFkfY5fGt5xAC/sKb8IBFKgWPNKG9OUG29dR8Y2wImw=
7757
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
7858
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
7959
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

‎api/v1/bucket_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,3 @@ type BucketList struct {
277277
metav1.ListMeta `json:"metadata,omitempty"`
278278
Items []Bucket `json:"items"`
279279
}
280-
281-
func init() {
282-
SchemeBuilder.Register(&Bucket{}, &BucketList{})
283-
}

‎api/v1/externalartifact_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,3 @@ type ExternalArtifactList struct {
9393
metav1.ListMeta `json:"metadata,omitempty"`
9494
Items []ExternalArtifact `json:"items"`
9595
}
96-
97-
func init() {
98-
SchemeBuilder.Register(&ExternalArtifact{}, &ExternalArtifactList{})
99-
}

‎api/v1/gitrepository_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,3 @@ type GitRepositoryList struct {
384384
metav1.ListMeta `json:"metadata,omitempty"`
385385
Items []GitRepository `json:"items"`
386386
}
387-
388-
func init() {
389-
SchemeBuilder.Register(&GitRepository{}, &GitRepositoryList{})
390-
}

‎api/v1/groupversion_info.go‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,38 @@ limitations under the License.
1717
package v1
1818

1919
import (
20+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21+
"k8s.io/apimachinery/pkg/runtime"
2022
"k8s.io/apimachinery/pkg/runtime/schema"
21-
"sigs.k8s.io/controller-runtime/pkg/scheme"
2223
)
2324

2425
var (
2526
// GroupVersion is group version used to register these objects.
2627
GroupVersion = schema.GroupVersion{Group: "source.toolkit.fluxcd.io", Version: "v1"}
2728

2829
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
29-
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
30+
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3031

3132
// AddToScheme adds the types in this group-version to the given scheme.
3233
AddToScheme = SchemeBuilder.AddToScheme
3334
)
35+
36+
func addKnownTypes(scheme *runtime.Scheme) error {
37+
scheme.AddKnownTypes(GroupVersion,
38+
&Bucket{},
39+
&BucketList{},
40+
&ExternalArtifact{},
41+
&ExternalArtifactList{},
42+
&GitRepository{},
43+
&GitRepositoryList{},
44+
&HelmChart{},
45+
&HelmChartList{},
46+
&HelmRepository{},
47+
&HelmRepositoryList{},
48+
&OCIRepository{},
49+
&OCIRepositoryList{},
50+
)
51+
52+
metav1.AddToGroupVersion(scheme, GroupVersion)
53+
return nil
54+
}

‎api/v1/helmchart_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,3 @@ type HelmChartList struct {
223223
metav1.ListMeta `json:"metadata,omitempty"`
224224
Items []HelmChart `json:"items"`
225225
}
226-
227-
func init() {
228-
SchemeBuilder.Register(&HelmChart{}, &HelmChartList{})
229-
}

‎api/v1/helmrepository_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,3 @@ type HelmRepositoryList struct {
220220
metav1.ListMeta `json:"metadata,omitempty"`
221221
Items []HelmRepository `json:"items"`
222222
}
223-
224-
func init() {
225-
SchemeBuilder.Register(&HelmRepository{}, &HelmRepositoryList{})
226-
}

‎api/v1/ocirepository_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,3 @@ type OCIRepositoryList struct {
291291
metav1.ListMeta `json:"metadata,omitempty"`
292292
Items []OCIRepository `json:"items"`
293293
}
294-
295-
func init() {
296-
SchemeBuilder.Register(&OCIRepository{}, &OCIRepositoryList{})
297-
}

‎api/v1beta1/bucket_types.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,3 @@ type BucketList struct {
214214
metav1.ListMeta `json:"metadata,omitempty"`
215215
Items []Bucket `json:"items"`
216216
}
217-
218-
func init() {
219-
SchemeBuilder.Register(&Bucket{}, &BucketList{})
220-
}

0 commit comments

Comments
 (0)