Skip to content
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

Jump to bottom

knative/vhive reference branch v1.9 #10

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

knative/vhive reference branch v1.9 #10

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: 23 additions & 1 deletion pkg/queue/sharedmain/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ import (
"go.uber.org/automaxprocs/maxprocs"
"go.uber.org/zap"

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"

"knative.dev/control-protocol/pkg/certificates"
netheader "knative.dev/networking/pkg/http/header"
Expand Down Expand Up @@ -114,6 +116,10 @@ type config struct {
ConcurrencyStateEndpoint string `split_words:"true"` // optional
ConcurrencyStateTokenPath string `split_words:"true"` // optional

// vHive configuration
GuestAddr string `split_words:"true" required:"true"`
GuestPort string `split_words:"true" required:"true"`

Env
}

Expand Down Expand Up @@ -233,6 +239,22 @@ func Main(opts ...Option) error {
// Setup probe to run for checking user-application healthiness.
// Do not set up probe if concurrency state endpoint is set, as
// paused containers don't play well with k8s readiness probes.
servingProbe := &corev1.Probe{
SuccessThreshold: 1,
ProbeHandler: corev1.ProbeHandler{
TCPSocket: &corev1.TCPSocketAction{
Host: env.GuestAddr,
Port: intstr.FromString(env.GuestPort),
},
},
}

var err error
env.ServingReadinessProbe, err = readiness.EncodeProbe(servingProbe)
if err != nil {
logger.Fatalw("Failed to create stats reporter", zap.Error(err))
}

probe := func() bool { return true }
if env.ServingReadinessProbe != "" && env.ConcurrencyStateEndpoint == "" {
probe = buildProbe(logger, env.ServingReadinessProbe, env.EnableHTTP2AutoDetection).ProbeContainer
Expand Down Expand Up @@ -343,7 +365,7 @@ func buildServer(ctx context.Context, env config, transport http.RoundTripper, p
ce *queue.ConcurrencyEndpoint, enableTLS bool) (*http.Server, *pkghandler.Drainer) {
// TODO: If TLS is enabled, execute probes twice and tracking two different sets of container health.

target := net.JoinHostPort("127.0.0.1", env.UserPort)
target := net.JoinHostPort(env.GuestAddr, env.GuestPort)

httpProxy := pkghttp.NewHeaderPruningReverseProxy(target, pkghttp.NoHostOverride, activator.RevisionHeaders, false /* use HTTP */)
httpProxy.Transport = transport
Expand Down