@@ -41,17 +41,11 @@ const (
4141)
4242
4343var (
44- baseArchs = []string {"386" , "amd64" , "arm" , "arm64" , "ppc64le" , "s390x" }
45- winArchs = []string {"386" , "amd64" , "arm64" }
46- winContainerArchs = []string {"amd64" }
47- darwinArchs = []string {"amd64" , "arm64" }
48- k8sArchs = []string {"amd64" , "arm64" , "ppc64le" , "s390x" }
49- dockerHubFullDescriptions = map [string ]string {
50- coreDistro : "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector/refs/heads/main/README.md" ,
51- contribDistro : "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-contrib/refs/heads/main/README.md" ,
52- otlpDistro : "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/refs/heads/main/distributions/otelcol-otlp/README.md" ,
53- k8sDistro : "https://raw.githubusercontent.com/open-telemetry/opentelemetry-collector-releases/refs/heads/main/distributions/otelcol-k8s/README.md" ,
54- }
44+ baseArchs = []string {"386" , "amd64" , "arm" , "arm64" , "ppc64le" , "s390x" }
45+ winArchs = []string {"386" , "amd64" , "arm64" }
46+ winContainerArchs = []string {"amd64" }
47+ darwinArchs = []string {"amd64" , "arm64" }
48+ k8sArchs = []string {"amd64" , "arm64" , "ppc64le" , "s390x" }
5549
5650 imageRepos = []string {dockerHub , ghcr }
5751
@@ -147,7 +141,7 @@ var (
147141 d .containerImageManifests = slices .Concat (
148142 newContainerImageManifests (d .name , "linux" , k8sArchs , containerImageOptions {}),
149143 )
150- }).WithDefaultArchives ().WithDefaultChecksum ().WithDefaultSigns ().WithDefaultDockerSigns ().WithDefaultDockerHubs (). WithDefaultSBOMs ().Build ()
144+ }).WithDefaultArchives ().WithDefaultChecksum ().WithDefaultSigns ().WithDefaultDockerSigns ().WithDefaultSBOMs ().Build ()
151145)
152146
153147type buildConfig interface {
@@ -291,13 +285,6 @@ func (b *distributionBuilder) WithDefaultDockerSigns() *distributionBuilder {
291285 return b
292286}
293287
294- func (b * distributionBuilder ) WithDefaultDockerHubs () * distributionBuilder {
295- b .configFuncs = append (b .configFuncs , func (d * distribution ) {
296- d .dockerhubs = b .dockerHubs ()
297- })
298- return b
299- }
300-
301288func (b * distributionBuilder ) dockerSigns () []config.Sign {
302289 return []config.Sign {
303290 {
@@ -310,22 +297,6 @@ func (b *distributionBuilder) dockerSigns() []config.Sign {
310297 }
311298}
312299
313- func (b * distributionBuilder ) dockerHubs () []config.DockerHub {
314- return []config.DockerHub {
315- {
316- Images : []string {
317- fmt .Sprintf ("%s/%s" , dockerHub , imageName (b .dist .name )),
318- },
319- Description : fmt .Sprintf ("OpenTelemetry Collector - %s" , b .dist .name ),
320- FullDescription : config.IncludedMarkdown {
321- FromURL : config.IncludeFromURL {
322- URL : dockerHubFullDescriptions [b .dist .name ],
323- },
324- },
325- },
326- }
327- }
328-
329300func (b * distributionBuilder ) WithDefaultSBOMs () * distributionBuilder {
330301 b .configFuncs = append (b .configFuncs , func (d * distribution ) {
331302 d .sboms = b .sboms ()
@@ -361,7 +332,6 @@ func (b *distributionBuilder) WithPackagingDefaults() *distributionBuilder {
361332 WithDefaultNfpms ().
362333 WithDefaultMSIConfig ().
363334 WithDefaultSigns ().
364- WithDefaultDockerHubs ().
365335 WithDefaultDockerSigns ().
366336 WithDefaultSBOMs ()
367337}
@@ -413,7 +383,6 @@ type distribution struct {
413383 containerImageManifests []config.DockerManifest
414384 signs []config.Sign
415385 dockerSigns []config.Sign
416- dockerhubs []config.DockerHub
417386 sboms []config.SBOM
418387 checksum config.Checksum
419388}
@@ -444,7 +413,6 @@ func (d *distribution) BuildProject() config.Project {
444413 DockerManifests : d .containerImageManifests ,
445414 Signs : d .signs ,
446415 DockerSigns : d .dockerSigns ,
447- DockerHubs : d .dockerhubs ,
448416 SBOMs : d .sboms ,
449417 Version : 2 ,
450418 Monorepo : config.Monorepo {
0 commit comments