Update deps dropping gcs-fetcher (#458)

cmd/webhook/main.go

@@ -79,8 +79,6 @@ var (
 	shellImage  = flag.String("shell-image", "busybox", "The container image containing a shell")
 	gsutilImage = flag.String("gsutil-image", "google/cloud-sdk",
 		"The container image containing gsutil")
-	buildGCSFetcherImage = flag.String("build-gcs-fetcher-image", "gcr.io/cloud-builders/gcs-fetcher:latest",
-		"The container image containing our GCS fetcher binary.")
 	prImage = flag.String("pr-image", "override-with-pr:latest",
 		"The container image containing our PR binary.")
 	imageDigestExporterImage = flag.String("imagedigest-exporter-image", "override-with-imagedigest-exporter-image:latest",
@@ -103,7 +101,6 @@ func main() {
 		KubeconfigWriterImage:    *kubeconfigWriterImage,
 		ShellImage:               *shellImage,
 		GsutilImage:              *gsutilImage,
-		BuildGCSFetcherImage:     *buildGCSFetcherImage,
 		PRImage:                  *prImage,
 		ImageDigestExporterImage: *imageDigestExporterImage,
 	}

config/core/deployments/controlplane.yaml

@@ -62,7 +62,6 @@ spec:
           "-nop-image", "ko://github.com/tektoncd/pipeline/cmd/nop",
           "-imagedigest-exporter-image", "ko://github.com/tektoncd/pipeline/cmd/imagedigestexporter",
           "-pr-image", "ko://github.com/tektoncd/pipeline/cmd/pullrequest-init",
-          "-build-gcs-fetcher-image", "ko://github.com/GoogleCloudPlatform/cloud-builders/gcs-fetcher/cmd/gcs-fetcher",
           "-shell-image", "ghcr.io/mattmoor/distroless/base:debug",
 
           # Not multi-arch.

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.7.0
 	github.com/tektoncd/cli v0.3.1-0.20210216180746-b93f7e1de644
-	github.com/tektoncd/pipeline v0.21.1-0.20210220130642-91c5c8eeaec2
+	github.com/tektoncd/pipeline v0.21.1-0.20210222215542-7a204f0e4637
 	golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
 	gopkg.in/ini.v1 v1.56.0 // indirect
 	gopkg.in/src-d/go-billy.v4 v4.3.2
@@ -38,7 +38,7 @@ require (
 	knative.dev/net-kourier v0.20.1-0.20210219212403-4a442c4c217e
 	knative.dev/networking v0.0.0-20210216014426-94bfc013982b
 	knative.dev/pkg v0.0.0-20210216013737-584933f8280b
-	knative.dev/serving v0.20.1-0.20210220011503-8ed54bc7e2cc
+	knative.dev/serving v0.20.1-0.20210223124746-b9576f56c67d
 )
 
 replace (

go.sum

@@ -1022,8 +1022,8 @@ github.com/tektoncd/hub/api v0.0.0-20210208113044-f2a63f81502c/go.mod h1:R0o3ZRO
 github.com/tektoncd/pipeline v0.20.1-0.20210203144343-1b7a37f0d21d/go.mod h1:GwdfGGt/5VhZL8JvJu8kFz8friKufcJ/TJkJmK6uc0U=
 github.com/tektoncd/pipeline v0.20.1-0.20210204110343-8c5a751b53ea/go.mod h1:GwdfGGt/5VhZL8JvJu8kFz8friKufcJ/TJkJmK6uc0U=
 github.com/tektoncd/pipeline v0.20.1-0.20210205200043-7827cd8bd343/go.mod h1:GwdfGGt/5VhZL8JvJu8kFz8friKufcJ/TJkJmK6uc0U=
-github.com/tektoncd/pipeline v0.21.1-0.20210220130642-91c5c8eeaec2 h1:UDkbcoj0/GTFglxK2h78JFtMXCa25EH2rISJtCVpdUo=
-github.com/tektoncd/pipeline v0.21.1-0.20210220130642-91c5c8eeaec2/go.mod h1:GwdfGGt/5VhZL8JvJu8kFz8friKufcJ/TJkJmK6uc0U=
+github.com/tektoncd/pipeline v0.21.1-0.20210222215542-7a204f0e4637 h1:Oh2mQXDkNuDlMoXcQR5bnlfyTYcSvepxFPXpCgyktTM=
+github.com/tektoncd/pipeline v0.21.1-0.20210222215542-7a204f0e4637/go.mod h1:QcD1kMaXVIHA/V7RCi4NQUCR6z3plBVjmglRbpS71FQ=
 github.com/tektoncd/plumbing v0.0.0-20201021153918-6b7e894737b5/go.mod h1:WTWwsg91xgm+jPOKoyKVK/yRYxnVDlUYeDlypB1lDdQ=
 github.com/tektoncd/plumbing v0.0.0-20210202164343-2c1808d75b38/go.mod h1:WTWwsg91xgm+jPOKoyKVK/yRYxnVDlUYeDlypB1lDdQ=
 github.com/tektoncd/triggers v0.11.1-0.20210203192543-6654c3d410fe h1:jwNR6IQMWfkcgEykhDGd6xh/K4zpX7nY/4qLBnTSOmo=
@@ -1717,8 +1717,8 @@ knative.dev/pkg v0.0.0-20210215165523-84c98f3c3e7a/go.mod h1:TJSdebQOWX5N2bszohO
 knative.dev/pkg v0.0.0-20210216013737-584933f8280b h1:2v+GBBenjPXhtk3KX/YqxCQVBU6o/AaRkkqE58lgFRQ=
 knative.dev/pkg v0.0.0-20210216013737-584933f8280b/go.mod h1:TJSdebQOWX5N2bszohOYVi0H1QtXbtlYLuMghAFBMhY=
 knative.dev/reconciler-test v0.0.0-20210216030508-77f50054d024/go.mod h1:RP/K5xJylB72Go6eAsXYEsQHp4zCCNMNjmsqhvq7wko=
-knative.dev/serving v0.20.1-0.20210220011503-8ed54bc7e2cc h1:B313Mr4d7Uujv//Zz2yQal/MlVcW2ECQBps5GSYXo50=
-knative.dev/serving v0.20.1-0.20210220011503-8ed54bc7e2cc/go.mod h1:PU9k1Y6YMG27XQldEu5agNkcebvSafUXKXPircQYCsE=
+knative.dev/serving v0.20.1-0.20210223124746-b9576f56c67d h1:4caphwsDTGK/l5NsL3ayH2ufNlqYimB7SqCOqSXgjXI=
+knative.dev/serving v0.20.1-0.20210223124746-b9576f56c67d/go.mod h1:PU9k1Y6YMG27XQldEu5agNkcebvSafUXKXPircQYCsE=
 maze.io/x/duration v0.0.0-20160924141736-faac084b6075/go.mod h1:1kfR2ph3CIvtfIQ8D8JhmAgePmnAUnR+AWYWUBo+l08=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=

vendor/knative.dev/serving/cmd/activator/request_log.go

@@ -22,7 +22,7 @@ import (
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	"knative.dev/pkg/metrics"
-	"knative.dev/serving/pkg/activator"
+	"knative.dev/serving/pkg/activator/handler"
 	"knative.dev/serving/pkg/apis/serving"
 	servinglisters "knative.dev/serving/pkg/client/listers/serving/v1"
 	pkghttp "knative.dev/serving/pkg/http"
@@ -50,8 +50,10 @@ func updateRequestLogFromConfigMap(logger *zap.SugaredLogger, h *pkghttp.Request
 
 func requestLogTemplateInputGetter(revisionLister servinglisters.RevisionLister) pkghttp.RequestLogTemplateInputGetter {
 	return func(req *http.Request, resp *pkghttp.RequestLogResponse) *pkghttp.RequestLogTemplateInput {
-		namespace := req.Header.Get(activator.RevisionHeaderNamespace)
-		name := req.Header.Get(activator.RevisionHeaderName)
+		revisionKey := handler.RevIDFrom(req.Context())
+		name := revisionKey.Name
+		namespace := revisionKey.Namespace
+
 		revInfo := &pkghttp.RequestLogRevision{
 			Namespace: namespace,
 			Name:      name,

vendor/knative.dev/serving/pkg/activator/handler/concurrency_reporter.go

@@ -242,7 +242,7 @@ func (cr *ConcurrencyReporter) run(stopCh <-chan struct{}, reportCh <-chan time.
 // machinery.
 func (cr *ConcurrencyReporter) Handler(next http.Handler) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		revisionKey := revIDFrom(r.Context())
+		revisionKey := RevIDFrom(r.Context())
 
 		stat := cr.handleRequestIn(network.ReqEvent{Key: revisionKey, Type: network.ReqIn, Time: time.Now()})
 		defer func() {

vendor/knative.dev/serving/pkg/activator/handler/context.go

@@ -43,12 +43,12 @@ func revisionFrom(ctx context.Context) *v1.Revision {
 	return ctx.Value(revisionKey{}).(*v1.Revision)
 }
 
-// withRevID attaches the the revisionID to the context.
-func withRevID(ctx context.Context, revID types.NamespacedName) context.Context {
+// WithRevID attaches the the revisionID to the context.
+func WithRevID(ctx context.Context, revID types.NamespacedName) context.Context {
 	return context.WithValue(ctx, revIDKey{}, revID)
 }
 
-// revIDFrom retrieves the the revisionID from the context.
-func revIDFrom(ctx context.Context) types.NamespacedName {
+// RevIDFrom retrieves the the revisionID from the context.
+func RevIDFrom(ctx context.Context) types.NamespacedName {
 	return ctx.Value(revIDKey{}).(types.NamespacedName)
 }

vendor/knative.dev/serving/pkg/activator/handler/context_handler.go

@@ -77,7 +77,7 @@ func (h *contextHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	ctx = logging.WithLogger(ctx, logger)
 	ctx = withRevision(ctx, revision)
-	ctx = withRevID(ctx, revID)
+	ctx = WithRevID(ctx, revID)
 
 	h.nextHandler.ServeHTTP(w, r.WithContext(ctx))
 }

vendor/knative.dev/serving/pkg/activator/handler/handler.go

@@ -74,7 +74,7 @@ func (a *activationHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		tryContext, trySpan = trace.StartSpan(r.Context(), "throttler_try")
 	}
 
-	if err := a.throttler.Try(tryContext, revIDFrom(r.Context()), func(dest string) error {
+	if err := a.throttler.Try(tryContext, RevIDFrom(r.Context()), func(dest string) error {
 		trySpan.End()
 
 		proxyCtx, proxySpan := r.Context(), (*trace.Span)(nil)