Update goharbor/distribution GIT_TAG to latest commit on branch (#5162)

* Update goharbor/distribution GIT_TAG to latest commit on branch release/2.8

* change README version

Author: peirulu

UPSTREAM_PROJECTS.yaml

@@ -127,7 +127,7 @@ projects:
     repos:
       - name: distribution
         versions:
-          - tag: v2.8.3
+          - commit: 086d3c33b3981cf598d0d82336a907fcf5c4c848
             go_version: "1.24"
       - name: harbor
         versions:

projects/goharbor/distribution/ATTRIBUTION.txt

@@ -1,2 +1,2 @@
-0d588d02354de2474f4da0b2641a476331495f661e66d21f5d98992986f92055  _output/bin/distribution/linux-amd64/registry
-3f0d18e854209f29338fa37d4d571f28be5c2313e421edc82ed428a17ca756a8  _output/bin/distribution/linux-arm64/registry
+af386e2a1a438b12ca749dfd8bfd90b6db7d23cbedeaad6f8ac386c6a021f25f  _output/bin/distribution/linux-amd64/registry
+3828c0911198a6e98febfba320f54c72aaa15e4f37fd079a4b3b72309736bba8  _output/bin/distribution/linux-arm64/registry

projects/goharbor/distribution/CHECKSUMS

@@ -1 +1 @@
-v2.8.3
+086d3c33b3981cf598d0d82336a907fcf5c4c848

projects/goharbor/distribution/GIT_TAG

@@ -1,5 +1,5 @@
 ## **distribution**
-![Version](https://img.shields.io/badge/version-v2.8.3-blue)
+![Version](https://img.shields.io/badge/version-086d3c33b3981cf598d0d82336a907fcf5c4c848-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoieGduSTVGQXp1STQ1b2VjY0tiZnJOVStJa1pja2pjbDJYQTdMS2V5R0lyWFJ0R1lya1lYREhuYy9xRE5sMlc2SmZVWXlNRGRJdGhwZXl5V0cwMXB2ck5nPSIsIml2UGFyYW1ldGVyU3BlYyI6IlQwNHZleTBzMzZQMjZ1VCsiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 This [distribution project](https://github.com/goharbor/distribution)'s main product is the Open Source Registry implementation for storing and distributing container images using the [OCI Distribution Specification](https://github.com/opencontainers/distribution-spec). The goal of this project is to provide a simple, secure, and scalable base for building a large scale registry solution or running a simple private registry. It is a core library for many registry operators including Docker Hub, GitHub Container Registry, GitLab Container Registry and DigitalOcean Container Registry, as well as the CNCF Harbor Project, and VMware Harbor Registry.

projects/goharbor/distribution/README.md

@@ -0,0 +1,74 @@
+From 8318e082623a26c094057aaa3b9947901ec615d9 Mon Sep 17 00:00:00 2001
+From: Jhaanvi Golani <jhaanvi4.golani@gmail.com>
+Date: Wed, 19 Jun 2024 10:13:46 -0700
+Subject: [PATCH] migrate to go module
+
+---
+ registry/handlers/app.go |  3 ++-
+ registry/registry.go     | 20 ++++++++------------
+ 2 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/registry/handlers/app.go b/registry/handlers/app.go
+index 72fd62e2..14aef24e 100644
+--- a/registry/handlers/app.go
++++ b/registry/handlers/app.go
+@@ -42,6 +42,7 @@ import (
+ 	"github.com/docker/go-metrics"
+ 	"github.com/docker/libtrust"
+ 	"github.com/gomodule/redigo/redis"
++	gomoduleredis "github.com/gomodule/redigo/redis"
+ 	"github.com/gorilla/mux"
+ 	"github.com/sirupsen/logrus"
+ )
+@@ -522,7 +523,7 @@ func (app *App) configureRedis(configuration *configuration.Configuration) {
+ 		sntnl := &sentinel.Sentinel{
+ 			Addrs:      strings.Split(configuration.Redis.Addr, ","),
+ 			MasterName: configuration.Redis.SentinelMasterSet,
+-			Dial: func(addr string) (redis.Conn, error) {
++			Dial: func(addr string) (gomoduleredis.Conn, error) {
+ 				c, err := redis.Dial("tcp", addr,
+ 					redisOptions...)
+ 				if err != nil {
+diff --git a/registry/registry.go b/registry/registry.go
+index 9486d8bb..4b81e4d9 100644
+--- a/registry/registry.go
++++ b/registry/registry.go
+@@ -13,7 +13,8 @@ import (
+ 	"syscall"
+ 	"time"
+ 
+-	"rsc.io/letsencrypt"
++	"golang.org/x/crypto/acme"
++	"golang.org/x/crypto/acme/autocert"
+ 
+ 	logrus_bugsnag "github.com/Shopify/logrus-bugsnag"
+ 
+@@ -246,19 +247,14 @@ func (registry *Registry) ListenAndServe() error {
+ 			if config.HTTP.TLS.Certificate != "" {
+ 				return fmt.Errorf("cannot specify both certificate and Let's Encrypt")
+ 			}
+-			var m letsencrypt.Manager
+-			if err := m.CacheFile(config.HTTP.TLS.LetsEncrypt.CacheFile); err != nil {
+-				return err
+-			}
+-			if !m.Registered() {
+-				if err := m.Register(config.HTTP.TLS.LetsEncrypt.Email, nil); err != nil {
+-					return err
+-				}
+-			}
+-			if len(config.HTTP.TLS.LetsEncrypt.Hosts) > 0 {
+-				m.SetHosts(config.HTTP.TLS.LetsEncrypt.Hosts)
++			m := &autocert.Manager{
++				HostPolicy: autocert.HostWhitelist(config.HTTP.TLS.LetsEncrypt.Hosts...),
++				Cache:      autocert.DirCache(config.HTTP.TLS.LetsEncrypt.CacheFile),
++				Email:      config.HTTP.TLS.LetsEncrypt.Email,
++				Prompt:     autocert.AcceptTOS,
+ 			}
+ 			tlsConf.GetCertificate = m.GetCertificate
++			tlsConf.NextProtos = append(tlsConf.NextProtos, acme.ALPNProto)
+ 		} else {
+ 			tlsConf.Certificates = make([]tls.Certificate, 1)
+ 			tlsConf.Certificates[0], err = tls.LoadX509KeyPair(config.HTTP.TLS.Certificate, config.HTTP.TLS.Key)
+-- 
+2.34.1
+

projects/goharbor/distribution/patches/0001-harbor-patch.patch

@@ -0,0 +1,29 @@
+From 49491bf5da7327925bbdafd94a2b04ddd99797f2 Mon Sep 17 00:00:00 2001
+From: Amelia Lu <peirulu@amazonaws.com>
+Date: Wed, 4 Feb 2026 22:29:58 +0000
+Subject: [PATCH] replace logstash formatter to default
+
+The logrus-logstash-hook does not have LogstashFormatter in version v1.0.0,
+replace it with the default formatter.s
+---
+ registry/registry.go | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/registry/registry.go b/registry/registry.go
+index 4b81e4d9..a946ba17 100644
+--- a/registry/registry.go
++++ b/registry/registry.go
+@@ -359,9 +359,7 @@ func configureLogging(ctx context.Context, config *configuration.Configuration)
+ 			TimestampFormat: time.RFC3339Nano,
+ 		})
+ 	case "logstash":
+-		log.SetFormatter(&logstash.LogstashFormatter{
+-			TimestampFormat: time.RFC3339Nano,
+-		})
++		log.SetFormatter(logstash.DefaultFormatter(log.Fields{}))
+ 	default:
+ 		// just let the library use default on empty string.
+ 		if config.Log.Formatter != "" {
+-- 
+2.34.1
+