Skip to content

Commit 45d7d7d

Browse files
morlaymorlay
committed
chore: bump infra agent
1 parent 100cc06 commit 45d7d7d

File tree

5 files changed

+33
-27
lines changed

5 files changed

+33
-27
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ go 1.24.0
44

55
require (
66
github.com/go-courier/logr v0.3.1
7-
github.com/innoai-tech/infra v0.0.0-20250213031804-1df17550f6a3
7+
github.com/innoai-tech/infra v0.0.0-20250217020731-0860b45087be
88
github.com/innoai-tech/openapi-playground v0.0.0-20250211021902-60e42b12e553 // indirect
9-
github.com/octohelm/courier v0.0.0-20250213031428-2432e8681d86
9+
github.com/octohelm/courier v0.0.0-20250213104025-f21d0877d28c
1010
github.com/octohelm/enumeration v0.0.0-20250115091102-ddf41951d733
1111
github.com/octohelm/gengo v0.0.0-20250213040207-59af51fbf311
1212
github.com/octohelm/kubekit v0.0.0-20250213040807-96036c24f7d0
13-
github.com/octohelm/kubepkgspec v0.0.0-20250213032738-d6e2a13f0c65
13+
github.com/octohelm/kubepkgspec v0.0.0-20250213104933-27718ca60b83
1414
github.com/octohelm/unifs v0.0.0-20250213040300-eb95543cf94b
15-
github.com/octohelm/x v0.0.0-20250212034859-0e2c4f726784
15+
github.com/octohelm/x v0.0.0-20250213100717-a5d72cc790e0
1616
)
1717

1818
require (
1919
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b
2020
github.com/containerd/containerd v1.7.25
2121
github.com/containerd/platforms v0.2.1
2222
github.com/distribution/reference v0.6.0
23-
github.com/go-json-experiment/json v0.0.0-20250212230008-60a0516c2895
23+
github.com/go-json-experiment/json v0.0.0-20250213060926-925ba3f173fa
2424
github.com/gobwas/glob v0.2.3
2525
github.com/google/go-containerregistry v0.20.3
2626
github.com/google/uuid v1.6.0

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ github.com/go-courier/logr v0.3.1 h1:RcHM7qpO8OpuV+zFvJMXtJEspTnnYmT6uGiAomwb8X8
6565
github.com/go-courier/logr v0.3.1/go.mod h1:NQWi+TSv0rS1RfyWHv7MNEI5cNy9NR6k1n8R24uHgdY=
6666
github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
6767
github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
68-
github.com/go-json-experiment/json v0.0.0-20250212230008-60a0516c2895 h1:z1TZK/pF4NJIQWu6Lobwq1WHplDPpg2iR4VM29yjo6U=
69-
github.com/go-json-experiment/json v0.0.0-20250212230008-60a0516c2895/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
68+
github.com/go-json-experiment/json v0.0.0-20250213060926-925ba3f173fa h1:Rpu6sKAzIeSWBkrFHD52g8yipagcPbY2Lmm70NL1Gzc=
69+
github.com/go-json-experiment/json v0.0.0-20250213060926-925ba3f173fa/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
7070
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
7171
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
7272
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -117,8 +117,8 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
117117
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
118118
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
119119
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
120-
github.com/innoai-tech/infra v0.0.0-20250213031804-1df17550f6a3 h1:4MVsnJddZ8zqQMHgsNTPzf8iu/U01YFbL3CDCgTgwQs=
121-
github.com/innoai-tech/infra v0.0.0-20250213031804-1df17550f6a3/go.mod h1:aoRlklOvF1f2eMFYzx6UQkPKKPjjz0zpCv1YVEfFlQQ=
120+
github.com/innoai-tech/infra v0.0.0-20250217020731-0860b45087be h1:LWEXhBrVxG12Q3kKTFMVsYOFEecr3gdM4rY+rRGTOD8=
121+
github.com/innoai-tech/infra v0.0.0-20250217020731-0860b45087be/go.mod h1:XTqOdi9t05yB3YCtiIaVBIDrp3IQN4ujP/y9Fidkuys=
122122
github.com/innoai-tech/openapi-playground v0.0.0-20250211021902-60e42b12e553 h1:uYM3vrqCD3amK4IjHih+wNDWuD9xpUeGzaG2NiQ2+j0=
123123
github.com/innoai-tech/openapi-playground v0.0.0-20250211021902-60e42b12e553/go.mod h1:XF6gAVE9R8xSKHWbG0TtH/7RbWrTh16PH23eGZk69po=
124124
github.com/jlaffaye/ftp v0.2.0 h1:lXNvW7cBu7R/68bknOX3MrRIIqZ61zELs1P2RAiA3lg=
@@ -175,20 +175,20 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
175175
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
176176
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
177177
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
178-
github.com/octohelm/courier v0.0.0-20250213031428-2432e8681d86 h1:flyRl/8kY8Iof7Cx+LjtTR6sgtBYwb//oCDHPBJk3qQ=
179-
github.com/octohelm/courier v0.0.0-20250213031428-2432e8681d86/go.mod h1:S1tEOyAzCh+00q4P/ewgxCBPNwXoKVhc9wdZOO3bW2w=
178+
github.com/octohelm/courier v0.0.0-20250213104025-f21d0877d28c h1:NbOhk0Q67fatnpTlp1TKzmxOJb7Cx9t1LiNVABk4HvQ=
179+
github.com/octohelm/courier v0.0.0-20250213104025-f21d0877d28c/go.mod h1:k3SW8TTXtWcA8hbxokOpLJk9hUX1e34MtNM5ZbAjOgM=
180180
github.com/octohelm/enumeration v0.0.0-20250115091102-ddf41951d733 h1:QFroPAzF1hZYuy90nuxz6XXrX12ZLQUTmsAOLUbBVAk=
181181
github.com/octohelm/enumeration v0.0.0-20250115091102-ddf41951d733/go.mod h1:s4JBUBvmokS4N0uxRnjds0tBRlBn355OFz2EDHLnEZk=
182182
github.com/octohelm/gengo v0.0.0-20250213040207-59af51fbf311 h1:rBYYUN5nSiMA0gvR5eEiUhcIX/zZAIuJOmw6jleZbvo=
183183
github.com/octohelm/gengo v0.0.0-20250213040207-59af51fbf311/go.mod h1:jCs5Sz1eqYYEnbbE4bN6ZsxQmz/2f2RBhTGPfXzIa1I=
184184
github.com/octohelm/kubekit v0.0.0-20250213040807-96036c24f7d0 h1:yl2ju1wSyR+vwodumUEM3L+gFNt70mOmJDw9qOZnA80=
185185
github.com/octohelm/kubekit v0.0.0-20250213040807-96036c24f7d0/go.mod h1:gMAudiIGADYBwMdYu6ZDtkAdL+g1sMUhdbchGZPW+QI=
186-
github.com/octohelm/kubepkgspec v0.0.0-20250213032738-d6e2a13f0c65 h1:k1oUzJMGz+KrdFBdpp6oNpBjITIPVzzS88fcnUvqLEk=
187-
github.com/octohelm/kubepkgspec v0.0.0-20250213032738-d6e2a13f0c65/go.mod h1:eLlqyW3PR+LdG79iYxyIFJpWR97hi9tTqJjjLBZUEaU=
186+
github.com/octohelm/kubepkgspec v0.0.0-20250213104933-27718ca60b83 h1:GUzNfx01cVjJX1aCzFyBVmBwjQKF+6OsswLMjGgxD7M=
187+
github.com/octohelm/kubepkgspec v0.0.0-20250213104933-27718ca60b83/go.mod h1:cKOF02D2ux5HpJvDlywv4saCLBL9AoOK5IgoSthZhU0=
188188
github.com/octohelm/unifs v0.0.0-20250213040300-eb95543cf94b h1:rSmBbMbnNW/XueyWle+kGx2cyp55CjSpd7iMeBk7cbo=
189189
github.com/octohelm/unifs v0.0.0-20250213040300-eb95543cf94b/go.mod h1:cBsNNKr7/j81bd8TPFTJNVeo0zDi7bWJGf/47Yk6QZE=
190-
github.com/octohelm/x v0.0.0-20250212034859-0e2c4f726784 h1:e79TLaFqGsK3bb3abyIUJcCt1C7/PPM77mKqrz6nzG4=
191-
github.com/octohelm/x v0.0.0-20250212034859-0e2c4f726784/go.mod h1:sSbbJyMzFI8Bbu8ZkQ9D/2f7av1KdrPEyyprYTqF758=
190+
github.com/octohelm/x v0.0.0-20250213100717-a5d72cc790e0 h1:qY5AHEFZJ6tmI6Ixmch3Iy1+99Zf1Cc7tAe5+dkN/7E=
191+
github.com/octohelm/x v0.0.0-20250213100717-a5d72cc790e0/go.mod h1:EaMGdCSJiZislRhgbbCol1GgPN05NhIIdgAWDPJMRf4=
192192
github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM=
193193
github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM=
194194
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=

‎pkg/uploadcache/mem_upload_cache.go‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,38 @@ import (
66
"sync"
77
"time"
88

9-
"github.com/go-courier/logr"
10-
9+
"github.com/innoai-tech/infra/pkg/agent"
10+
"github.com/innoai-tech/infra/pkg/configuration"
1111
"github.com/innoai-tech/infra/pkg/cron"
1212
manifestv1 "github.com/octohelm/crkit/pkg/apis/manifest/v1"
1313
"github.com/octohelm/crkit/pkg/content"
1414
)
1515

16+
// MemUploadCache
1617
// +gengo:injectable:provider UploadCache
1718
type MemUploadCache struct {
18-
cron.Job
19+
agent.Agent
20+
21+
PruneInterval cron.Spec `flag:",omitzero"`
1922

2023
m sync.Map
2124
}
2225

2326
func (c *MemUploadCache) SetDefaults() {
24-
if c.Job.Cron == "" {
25-
c.Job.Cron = "@every 3s"
27+
if c.PruneInterval == "" {
28+
c.PruneInterval = "@every 3s"
2629
}
2730
}
2831

2932
func (c *MemUploadCache) beforeInit(ctx context.Context) error {
30-
c.ApplyAction("upload pruning", func(ctx context.Context) {
31-
if err := c.cleanup(ctx); err != nil {
32-
logr.FromContext(ctx).Error(err)
33+
c.Host("upload pruning", func(ctx context.Context) error {
34+
for range c.PruneInterval.Times(ctx) {
35+
c.Go(configuration.Background(ctx), func(ctx context.Context) error {
36+
return c.cleanup(ctx)
37+
})
3338
}
39+
40+
return nil
3441
})
3542
return nil
3643
}

‎pkg/uploadcache/zz_generated.injectable.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func (v *MemUploadCache) Init(ctx context.Context) error {
1616
if err := v.beforeInit(ctx); err != nil {
1717
return err
1818
}
19-
if err := v.Job.Init(ctx); err != nil {
19+
if err := v.Agent.Init(ctx); err != nil {
2020
return err
2121
}
2222

‎pkg/uploadcache/zz_generated.runtimedoc.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ func runtimeDoc(v any, prefix string, names ...string) ([]string, bool) {
2727
func (v *MemUploadCache) RuntimeDoc(names ...string) ([]string, bool) {
2828
if len(names) > 0 {
2929
switch names[0] {
30-
}
31-
if doc, ok := runtimeDoc(&v.Job, "", names...); ok {
32-
return doc, ok
30+
case "PruneInterval":
31+
return []string{}, true
3332
}
3433

3534
return nil, false

0 commit comments

Comments
 (0)