Skip to content

Commit 0c9c516

Browse files
TylerHelmuthTylerHelmuth
authored
Remove dockerhub destination (open-telemetry#902)
* Remove dockerhub destination * changelog
1 parent 11d45f2 commit 0c9c516

File tree

8 files changed

+27
-154
lines changed

8 files changed

+27
-154
lines changed

‎.chloggen/tyler.remove-dockerhub-destination.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: image repository
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Due to the new Dockerhub rate limits we are no longer publishing images to dockerhub.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [902]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext: If we can solve the rate limiting issue we'll undo this change
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []
26+

‎cmd/builder/.goreleaser.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ dockers:
3030
goarch: amd64
3131
dockerfile: Dockerfile
3232
image_templates:
33-
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
34-
- otel/opentelemetry-collector-builder:latest-amd64
3533
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
3634
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
3735
build_flag_templates:
@@ -47,8 +45,6 @@ dockers:
4745
goarch: arm64
4846
dockerfile: Dockerfile
4947
image_templates:
50-
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
51-
- otel/opentelemetry-collector-builder:latest-arm64
5248
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
5349
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
5450
build_flag_templates:
@@ -64,8 +60,6 @@ dockers:
6460
goarch: ppc64le
6561
dockerfile: Dockerfile
6662
image_templates:
67-
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
68-
- otel/opentelemetry-collector-builder:latest-ppc64le
6963
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
7064
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
7165
build_flag_templates:
@@ -79,16 +73,6 @@ dockers:
7973
- --label=org.opencontainers.image.licenses=Apache-2.0
8074
use: buildx
8175
docker_manifests:
82-
- name_template: otel/opentelemetry-collector-builder:{{ .Version }}
83-
image_templates:
84-
- otel/opentelemetry-collector-builder:{{ .Version }}-amd64
85-
- otel/opentelemetry-collector-builder:{{ .Version }}-arm64
86-
- otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
87-
- name_template: otel/opentelemetry-collector-builder:latest
88-
image_templates:
89-
- otel/opentelemetry-collector-builder:latest-amd64
90-
- otel/opentelemetry-collector-builder:latest-arm64
91-
- otel/opentelemetry-collector-builder:latest-ppc64le
9276
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
9377
image_templates:
9478
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64

‎cmd/goreleaser/internal/configure.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ const (
3434
contribDistro = "otelcol-contrib"
3535
k8sDistro = "otelcol-k8s"
3636
otlpDistro = "otelcol-otlp"
37-
dockerHub = "otel"
3837
ghcr = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
3938
binaryNamePrefix = "otelcol"
4039
imageNamePrefix = "opentelemetry-collector"
@@ -47,7 +46,7 @@ var (
4746
darwinArchs = []string{"amd64", "arm64"}
4847
k8sArchs = []string{"amd64", "arm64", "ppc64le", "s390x"}
4948

50-
imageRepos = []string{dockerHub, ghcr}
49+
imageRepos = []string{ghcr}
5150

5251
// otelcol (core) distro
5352
otelColDist = newDistributionBuilder(coreDistro).WithConfigFunc(func(d *distribution) {

‎cmd/opampsupervisor/.goreleaser.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ dockers:
3030
goarch: amd64
3131
dockerfile: Dockerfile
3232
image_templates:
33-
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
34-
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
3533
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
3634
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-amd64
3735
build_flag_templates:
@@ -47,8 +45,6 @@ dockers:
4745
goarch: arm64
4846
dockerfile: Dockerfile
4947
image_templates:
50-
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
51-
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
5248
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
5349
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-arm64
5450
build_flag_templates:
@@ -64,8 +60,6 @@ dockers:
6460
goarch: ppc64le
6561
dockerfile: Dockerfile
6662
image_templates:
67-
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
68-
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
6963
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
7064
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:latest-ppc64le
7165
build_flag_templates:
@@ -79,16 +73,6 @@ dockers:
7973
- --label=org.opencontainers.image.licenses=Apache-2.0
8074
use: buildx
8175
docker_manifests:
82-
- name_template: otel/opentelemetry-collector-opampsupervisor:{{ .Version }}
83-
image_templates:
84-
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64
85-
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-arm64
86-
- otel/opentelemetry-collector-opampsupervisor:{{ .Version }}-ppc64le
87-
- name_template: otel/opentelemetry-collector-opampsupervisor:latest
88-
image_templates:
89-
- otel/opentelemetry-collector-opampsupervisor:latest-amd64
90-
- otel/opentelemetry-collector-opampsupervisor:latest-arm64
91-
- otel/opentelemetry-collector-opampsupervisor:latest-ppc64le
9276
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}
9377
image_templates:
9478
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-opampsupervisor:{{ .Version }}-amd64

‎distributions/otelcol-contrib/.goreleaser.yaml‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,6 @@ dockers:
107107
goarch: "386"
108108
dockerfile: Dockerfile
109109
image_templates:
110-
- otel/opentelemetry-collector-contrib:{{ .Version }}-386
111-
- otel/opentelemetry-collector-contrib:latest-386
112110
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
113111
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
114112
extra_files:
@@ -127,8 +125,6 @@ dockers:
127125
goarch: amd64
128126
dockerfile: Dockerfile
129127
image_templates:
130-
- otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
131-
- otel/opentelemetry-collector-contrib:latest-amd64
132128
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
133129
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
134130
extra_files:
@@ -148,8 +144,6 @@ dockers:
148144
goarm: "7"
149145
dockerfile: Dockerfile
150146
image_templates:
151-
- otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
152-
- otel/opentelemetry-collector-contrib:latest-armv7
153147
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
154148
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
155149
extra_files:
@@ -168,8 +162,6 @@ dockers:
168162
goarch: arm64
169163
dockerfile: Dockerfile
170164
image_templates:
171-
- otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
172-
- otel/opentelemetry-collector-contrib:latest-arm64
173165
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
174166
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
175167
extra_files:
@@ -188,8 +180,6 @@ dockers:
188180
goarch: ppc64le
189181
dockerfile: Dockerfile
190182
image_templates:
191-
- otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
192-
- otel/opentelemetry-collector-contrib:latest-ppc64le
193183
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
194184
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
195185
extra_files:
@@ -208,8 +198,6 @@ dockers:
208198
goarch: s390x
209199
dockerfile: Dockerfile
210200
image_templates:
211-
- otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
212-
- otel/opentelemetry-collector-contrib:latest-s390x
213201
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
214202
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
215203
extra_files:
@@ -228,8 +216,6 @@ dockers:
228216
goarch: amd64
229217
dockerfile: Windows.dockerfile
230218
image_templates:
231-
- otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64
232-
- otel/opentelemetry-collector-contrib:latest-windows-2019-amd64
233219
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2019-amd64
234220
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-windows-2019-amd64
235221
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -251,8 +237,6 @@ dockers:
251237
goarch: amd64
252238
dockerfile: Windows.dockerfile
253239
image_templates:
254-
- otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64
255-
- otel/opentelemetry-collector-contrib:latest-windows-2022-amd64
256240
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2022-amd64
257241
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-windows-2022-amd64
258242
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -271,22 +255,6 @@ dockers:
271255
- --label=org.opencontainers.image.licenses=Apache-2.0
272256
use: docker
273257
docker_manifests:
274-
- name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
275-
image_templates:
276-
- otel/opentelemetry-collector-contrib:{{ .Version }}-386
277-
- otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
278-
- otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
279-
- otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
280-
- otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
281-
- otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
282-
- name_template: otel/opentelemetry-collector-contrib:latest
283-
image_templates:
284-
- otel/opentelemetry-collector-contrib:latest-386
285-
- otel/opentelemetry-collector-contrib:latest-amd64
286-
- otel/opentelemetry-collector-contrib:latest-armv7
287-
- otel/opentelemetry-collector-contrib:latest-arm64
288-
- otel/opentelemetry-collector-contrib:latest-ppc64le
289-
- otel/opentelemetry-collector-contrib:latest-s390x
290258
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
291259
image_templates:
292260
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386

‎distributions/otelcol-k8s/.goreleaser.yaml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ dockers:
4848
goarch: amd64
4949
dockerfile: Dockerfile
5050
image_templates:
51-
- otel/opentelemetry-collector-k8s:{{ .Version }}-amd64
52-
- otel/opentelemetry-collector-k8s:latest-amd64
5351
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64
5452
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-amd64
5553
build_flag_templates:
@@ -66,8 +64,6 @@ dockers:
6664
goarch: arm64
6765
dockerfile: Dockerfile
6866
image_templates:
69-
- otel/opentelemetry-collector-k8s:{{ .Version }}-arm64
70-
- otel/opentelemetry-collector-k8s:latest-arm64
7167
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64
7268
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-arm64
7369
build_flag_templates:
@@ -84,8 +80,6 @@ dockers:
8480
goarch: ppc64le
8581
dockerfile: Dockerfile
8682
image_templates:
87-
- otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
88-
- otel/opentelemetry-collector-k8s:latest-ppc64le
8983
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
9084
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-ppc64le
9185
build_flag_templates:
@@ -102,8 +96,6 @@ dockers:
10296
goarch: s390x
10397
dockerfile: Dockerfile
10498
image_templates:
105-
- otel/opentelemetry-collector-k8s:{{ .Version }}-s390x
106-
- otel/opentelemetry-collector-k8s:latest-s390x
10799
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x
108100
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-s390x
109101
build_flag_templates:
@@ -120,8 +112,6 @@ dockers:
120112
goarch: amd64
121113
dockerfile: Windows.dockerfile
122114
image_templates:
123-
- otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64
124-
- otel/opentelemetry-collector-k8s:latest-windows-2019-amd64
125115
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2019-amd64
126116
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-windows-2019-amd64
127117
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -141,8 +131,6 @@ dockers:
141131
goarch: amd64
142132
dockerfile: Windows.dockerfile
143133
image_templates:
144-
- otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64
145-
- otel/opentelemetry-collector-k8s:latest-windows-2022-amd64
146134
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2022-amd64
147135
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-windows-2022-amd64
148136
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
@@ -159,18 +147,6 @@ dockers:
159147
- --label=org.opencontainers.image.licenses=Apache-2.0
160148
use: docker
161149
docker_manifests:
162-
- name_template: otel/opentelemetry-collector-k8s:{{ .Version }}
163-
image_templates:
164-
- otel/opentelemetry-collector-k8s:{{ .Version }}-amd64
165-
- otel/opentelemetry-collector-k8s:{{ .Version }}-arm64
166-
- otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
167-
- otel/opentelemetry-collector-k8s:{{ .Version }}-s390x
168-
- name_template: otel/opentelemetry-collector-k8s:latest
169-
image_templates:
170-
- otel/opentelemetry-collector-k8s:latest-amd64
171-
- otel/opentelemetry-collector-k8s:latest-arm64
172-
- otel/opentelemetry-collector-k8s:latest-ppc64le
173-
- otel/opentelemetry-collector-k8s:latest-s390x
174150
- name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}
175151
image_templates:
176152
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64

0 commit comments

Comments
 (0)