Merge branch 'main' into removed-cache-code

hauler-dev · Nov 6, 2024 · acc6d3b · acc6d3b
2 parents 737bf30 + dd50ed9
commit acc6d3b
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 210 deletions.
diff --git a/cmd/hauler/cli/store/sync.go b/cmd/hauler/cli/store/sync.go
@@ -16,7 +16,6 @@ import (
 	"hauler.dev/go/hauler/pkg/apis/hauler.cattle.io/v1alpha1"
 	tchart "hauler.dev/go/hauler/pkg/collection/chart"
 	"hauler.dev/go/hauler/pkg/collection/imagetxt"
-	"hauler.dev/go/hauler/pkg/collection/k3s"
 	"hauler.dev/go/hauler/pkg/consts"
 	"hauler.dev/go/hauler/pkg/content"
 	"hauler.dev/go/hauler/pkg/cosign"
@@ -211,21 +210,6 @@ func processContent(ctx context.Context, fi *os.File, o *flags.SyncOpts, s *stor
 				}
 			}
 
-		case v1alpha1.K3sCollectionKind:
-			var cfg v1alpha1.K3s
-			if err := yaml.Unmarshal(doc, &cfg); err != nil {
-				return err
-			}
-
-			k, err := k3s.NewK3s(cfg.Spec.Version)
-			if err != nil {
-				return err
-			}
-
-			if _, err := s.AddOCICollection(ctx, k); err != nil {
-				return err
-			}
-
 		case v1alpha1.ChartsCollectionKind:
 			var cfg v1alpha1.ThickCharts
 			if err := yaml.Unmarshal(doc, &cfg); err != nil {

diff --git a/pkg/apis/hauler.cattle.io/v1alpha1/k3s.go b/pkg/apis/hauler.cattle.io/v1alpha1/k3s.go
diff --git a/pkg/collection/k3s/k3s.go b/pkg/collection/k3s/k3s.go