Skip to content

feat: use knative.dev/pkg/tls for activator TLS configuration #16424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 1 commit into from
Mar 8, 2026
Merged

feat: use knative.dev/pkg/tls for activator TLS configuration #16424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions cmd/activator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package main

import (
"context"
"crypto/tls"
"errors"
"fmt"
"log"
Expand Down Expand Up @@ -50,6 +49,7 @@ import (
k8sruntime "knative.dev/pkg/observability/runtime/k8s"
"knative.dev/pkg/signals"
"knative.dev/pkg/system"
knativetls "knative.dev/pkg/tls"
"knative.dev/pkg/version"
"knative.dev/pkg/websocket"
"knative.dev/serving/pkg/activator"
Expand Down Expand Up @@ -292,7 +292,7 @@ func main() {
"profile": pprof.Server,
}

errCh := make(chan error, len(servers))
errCh := make(chan error, len(servers)+1)
for name, server := range servers {
go func(name string, s *http.Server) {
// Don't forward ErrServerClosed as that indicates we're already shutting down.
Expand All @@ -306,17 +306,21 @@ func main() {
// At this moment activator with TLS does not disable HTTP.
// See also https://github.com/knative/serving/issues/12808.
if tlsEnabled {
name, server := "https", pkgnet.NewServer(":"+strconv.Itoa(networking.BackendHTTPSPort), ah)
go func(name string, s *http.Server) {
s.TLSConfig = &tls.Config{
MinVersion: tls.VersionTLS13,
GetCertificate: certCache.GetCertificate,
}
tlsCfg, err := knativetls.DefaultConfigFromEnv("ACTIVATOR_")
if err != nil {
logger.Fatalw("Failed to read TLS configuration from environment", zap.Error(err))
}

server := pkgnet.NewServer(":"+strconv.Itoa(networking.BackendHTTPSPort), ah)
servers["https"] = server
go func(s *http.Server) {
s.TLSConfig = tlsCfg
s.TLSConfig.GetCertificate = certCache.GetCertificate
// Don't forward ErrServerClosed as that indicates we're already shutting down.
if err := s.ListenAndServeTLS("", ""); err != nil && !errors.Is(err, http.ErrServerClosed) {
errCh <- fmt.Errorf("%s server failed: %w", name, err)
errCh <- fmt.Errorf("https server failed: %w", err)
}
}(name, server)
}(server)
}

// Wait for the signal to drain.
Expand Down
Loading