Revert "replace repos with jackgopack4 and johnpeterson785 for workfl…

…ow testing" This reverts commit 3288ffe.
open-telemetry · Nov 19, 2024 · 7621c77 · 7621c77
1 parent c0e531d
commit 7621c77
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 227 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,7 @@ goreleaser:
 		fi \
 	}
 
-REMOTE?[email protected]:jackgopack4/opentelemetry-collector-releases.git
+REMOTE?[email protected]:open-telemetry/opentelemetry-collector-releases.git
 .PHONY: push-tags
 push-tags:
 	@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
@@ -74,7 +74,7 @@ push-tags:
 	@git push ${REMOTE} ${TAG}
 
 # Used for debug only
-REMOTE?[email protected]:jackgopack4/opentelemetry-collector-releases.git
+REMOTE?[email protected]:open-telemetry/opentelemetry-collector-releases.git
 .PHONY: delete-tags
 delete-tags:
 	@[ "${TAG}" ] || ( echo ">> env var TAG is not set"; exit 1 )
@@ -90,6 +90,6 @@ delete-tags:
 	@git push ${REMOTE} :refs/tags/cmd/builder/${TAG}
 
 # Used for debug only
-REMOTE?[email protected]:jackgopack4/opentelemetry-collector-releases.git
+REMOTE?[email protected]:open-telemetry/opentelemetry-collector-releases.git
 .PHONY: repeat-tags
 repeat-tags: delete-tags push-tags
diff --git a/cmd/builder/.goreleaser.yml b/cmd/builder/.goreleaser.yml
@@ -30,10 +30,10 @@ dockers:
     goarch: amd64
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-builder:{{ .Version }}-amd64
-      - johnpeterson785/opentelemetry-collector-builder:latest-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
+      - otel/opentelemetry-collector-builder:{{ .Version }}-amd64
+      - otel/opentelemetry-collector-builder:latest-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
     build_flag_templates:
       - --pull
       - --platform=linux/amd64
@@ -47,10 +47,10 @@ dockers:
     goarch: arm64
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-builder:{{ .Version }}-arm64
-      - johnpeterson785/opentelemetry-collector-builder:latest-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
+      - otel/opentelemetry-collector-builder:{{ .Version }}-arm64
+      - otel/opentelemetry-collector-builder:latest-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
     build_flag_templates:
       - --pull
       - --platform=linux/arm64
@@ -64,10 +64,10 @@ dockers:
     goarch: ppc64le
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-builder:{{ .Version }}-ppc64le
-      - johnpeterson785/opentelemetry-collector-builder:latest-ppc64le
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
+      - otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
+      - otel/opentelemetry-collector-builder:latest-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
     build_flag_templates:
       - --pull
       - --platform=linux/ppc64le
@@ -79,32 +79,32 @@ dockers:
       - --label=org.opencontainers.image.licenses=Apache-2.0
     use: buildx
 docker_manifests:
-  - name_template: johnpeterson785/opentelemetry-collector-builder:{{ .Version }}
+  - name_template: otel/opentelemetry-collector-builder:{{ .Version }}
     image_templates:
-      - johnpeterson785/opentelemetry-collector-builder:{{ .Version }}-amd64
-      - johnpeterson785/opentelemetry-collector-builder:{{ .Version }}-arm64
-      - johnpeterson785/opentelemetry-collector-builder:{{ .Version }}-ppc64le
-  - name_template: johnpeterson785/opentelemetry-collector-builder:latest
+      - otel/opentelemetry-collector-builder:{{ .Version }}-amd64
+      - otel/opentelemetry-collector-builder:{{ .Version }}-arm64
+      - otel/opentelemetry-collector-builder:{{ .Version }}-ppc64le
+  - name_template: otel/opentelemetry-collector-builder:latest
     image_templates:
-      - johnpeterson785/opentelemetry-collector-builder:latest-amd64
-      - johnpeterson785/opentelemetry-collector-builder:latest-arm64
-      - johnpeterson785/opentelemetry-collector-builder:latest-ppc64le
-  - name_template: ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
+      - otel/opentelemetry-collector-builder:latest-amd64
+      - otel/opentelemetry-collector-builder:latest-arm64
+      - otel/opentelemetry-collector-builder:latest-ppc64le
+  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}
     image_templates:
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
-  - name_template: ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:{{ .Version }}-ppc64le
+  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest
     image_templates:
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-builder:latest-ppc64le
 release:
   github:
-    owner: jackgopack4
+    owner: open-telemetry
     name: opentelemetry-collector-releases
   header: |
-    ### Images and binaries for collector distributions here: https://github.com/jackgopack4/opentelemetry-collector-releases/releases/tag/{{ .Tag }}
+    ### Images and binaries for collector distributions here: https://github.com/open-telemetry/opentelemetry-collector-releases/releases/tag/{{ .Tag }}
 archives:
   - format: binary
 checksum:

diff --git a/cmd/goreleaser/internal/configure.go b/cmd/goreleaser/internal/configure.go
@@ -33,8 +33,8 @@ const (
 	ContribDistro    = "otelcol-contrib"
 	K8sDistro        = "otelcol-k8s"
 	OTLPDistro       = "otelcol-otlp"
-	DockerHub        = "johnpeterson785"
-	GHCR             = "ghcr.io/jackgopack4/opentelemetry-collector-releases"
+	DockerHub        = "otel"
+	GHCR             = "ghcr.io/open-telemetry/opentelemetry-collector-releases"
 	BinaryNamePrefix = "otelcol"
 	ImageNamePrefix  = "opentelemetry-collector"
 )

diff --git a/distributions/otelcol-contrib/.goreleaser.yaml b/distributions/otelcol-contrib/.goreleaser.yaml
@@ -180,10 +180,10 @@ dockers:
     goarch: "386"
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-386
-      - johnpeterson785/opentelemetry-collector-contrib:latest-386
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-386
+      - otel/opentelemetry-collector-contrib:latest-386
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -200,10 +200,10 @@ dockers:
     goarch: amd64
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - johnpeterson785/opentelemetry-collector-contrib:latest-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
+      - otel/opentelemetry-collector-contrib:latest-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -221,10 +221,10 @@ dockers:
     goarm: "7"
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - johnpeterson785/opentelemetry-collector-contrib:latest-armv7
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
+      - otel/opentelemetry-collector-contrib:latest-armv7
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -241,10 +241,10 @@ dockers:
     goarch: arm64
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - johnpeterson785/opentelemetry-collector-contrib:latest-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
+      - otel/opentelemetry-collector-contrib:latest-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -261,10 +261,10 @@ dockers:
     goarch: ppc64le
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - johnpeterson785/opentelemetry-collector-contrib:latest-ppc64le
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+      - otel/opentelemetry-collector-contrib:latest-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -281,10 +281,10 @@ dockers:
     goarch: s390x
     dockerfile: Dockerfile
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-s390x
-      - johnpeterson785/opentelemetry-collector-contrib:latest-s390x
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
+      - otel/opentelemetry-collector-contrib:latest-s390x
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
     extra_files:
       - config.yaml
     build_flag_templates:
@@ -298,38 +298,38 @@ dockers:
       - --label=org.opencontainers.image.licenses=Apache-2.0
     use: buildx
 docker_manifests:
-  - name_template: johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}
+  - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-386
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - johnpeterson785/opentelemetry-collector-contrib:{{ .Version }}-s390x
-  - name_template: johnpeterson785/opentelemetry-collector-contrib:latest
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-386
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-armv7
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+      - otel/opentelemetry-collector-contrib:{{ .Version }}-s390x
+  - name_template: otel/opentelemetry-collector-contrib:latest
     image_templates:
-      - johnpeterson785/opentelemetry-collector-contrib:latest-386
-      - johnpeterson785/opentelemetry-collector-contrib:latest-amd64
-      - johnpeterson785/opentelemetry-collector-contrib:latest-armv7
-      - johnpeterson785/opentelemetry-collector-contrib:latest-arm64
-      - johnpeterson785/opentelemetry-collector-contrib:latest-ppc64le
-      - johnpeterson785/opentelemetry-collector-contrib:latest-s390x
-  - name_template: ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
+      - otel/opentelemetry-collector-contrib:latest-386
+      - otel/opentelemetry-collector-contrib:latest-amd64
+      - otel/opentelemetry-collector-contrib:latest-armv7
+      - otel/opentelemetry-collector-contrib:latest-arm64
+      - otel/opentelemetry-collector-contrib:latest-ppc64le
+      - otel/opentelemetry-collector-contrib:latest-s390x
+  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}
     image_templates:
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
-  - name_template: ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-386
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-armv7
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-s390x
+  - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
     image_templates:
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
-      - ghcr.io/jackgopack4/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-386
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-amd64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-armv7
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-arm64
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-ppc64le
+      - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest-s390x
 signs:
   - cmd: cosign
     args: