Skip to content

Remove hacks/workarounds for bugs that are fixed in Istio 1.0. #1733

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
google-prow-robot merged 1 commit into from
Jul 27, 2018
Merged

Remove hacks/workarounds for bugs that are fixed in Istio 1.0. #1733

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions cmd/activator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,6 @@ func (a *activationHandler) handler(w http.ResponseWriter, r *http.Request) {
proxy.Transport = retryRoundTripper{
logger: a.logger,
}

// TODO: Clear the host to avoid 404's.
// https://github.com/knative/serving/issues/964
r.Host = ""

proxy.ServeHTTP(w, r)
}

Expand Down
22 changes: 4 additions & 18 deletions pkg/controller/route/resources/virtual_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,6 @@ const (
PortNumber = 80
PortName = "http"

// There is a bug in Istio 0.8 preventing the timeout to
// be set more than 15 seconds. The bug is now fixed at HEAD,
// but not yet released. 15 seconds is too short for our 0->1
// use case (see https://github.com/knative/serving/issues/1297).
//
// HACK: This applies the workaround suggested in
// https://github.com/istio/istio/issues/6230
// to allow setting a longer timeout than 15s.
//
// TODO: Remove hack when Istio 1.0 is out.
IstioTimeoutHackHeaderKey = "x-envoy-upstream-rq-timeout-ms"
IstioTimeoutHackHeaderValue = "0"

DefaultRouteTimeout = "60s"
)

Expand Down Expand Up @@ -143,9 +130,6 @@ func makeVirtualServiceRoute(domains []string, ns string, targets []traffic.Revi
Match: matches,
Route: weights,
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}
// Add traffic rules for activator.
return addActivatorRoutes(&route, ns, inactive)
Expand Down Expand Up @@ -193,8 +177,10 @@ func addActivatorRoutes(r *v1alpha3.HTTPRoute, ns string, inactive []traffic.Rev
},
Weight: totalInactivePercent,
})
r.AppendHeaders[controller.GetRevisionHeaderName()] = maxInactiveTarget.RevisionName
r.AppendHeaders[controller.GetRevisionHeaderNamespace()] = ns
r.AppendHeaders = map[string]string{
controller.GetRevisionHeaderName(): maxInactiveTarget.RevisionName,
controller.GetRevisionHeaderNamespace(): ns,
}
return r
}

Expand Down
20 changes: 0 additions & 20 deletions pkg/controller/route/resources/virtual_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,6 @@ func TestMakeVirtualServiceSpec_CorrectRoutes(t *testing.T) {
Weight: 100,
}},
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}, {
Match: []v1alpha3.HTTPMatchRequest{{
Authority: &v1alpha3.StringMatch{Exact: "v1.domain.com"},
Expand All @@ -138,9 +135,6 @@ func TestMakeVirtualServiceSpec_CorrectRoutes(t *testing.T) {
Weight: 100,
}},
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}}
routes := MakeVirtualService(r, &traffic.TrafficConfig{Targets: targets}).Spec.Http
if diff := cmp.Diff(expected, routes); diff != "" {
Expand Down Expand Up @@ -214,9 +208,6 @@ func TestMakeVirtualServiceRoute_Vanilla(t *testing.T) {
Weight: 100,
}},
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}
if diff := cmp.Diff(&expected, route); diff != "" {
t.Errorf("Unexpected route (-want +got): %v", diff)
Expand Down Expand Up @@ -254,9 +245,6 @@ func TestMakeVirtualServiceRoute_ZeroPercentTarget(t *testing.T) {
Weight: 100,
}},
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}
if diff := cmp.Diff(&expected, route); diff != "" {
t.Errorf("Unexpected route (-want +got): %v", diff)
Expand Down Expand Up @@ -301,9 +289,6 @@ func TestMakeVirtualServiceRoute_TwoTargets(t *testing.T) {
Weight: 10,
}},
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}
if diff := cmp.Diff(&expected, route); diff != "" {
t.Errorf("Unexpected route (-want +got): %v", diff)
Expand Down Expand Up @@ -339,7 +324,6 @@ func TestMakeVirtualServiceRoute_VanillaScaledToZero(t *testing.T) {
AppendHeaders: map[string]string{
"knative-serving-revision": "revision",
"knative-serving-namespace": "test-ns",
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
Timeout: DefaultRouteTimeout,
}
Expand Down Expand Up @@ -382,7 +366,6 @@ func TestMakeVirtualServiceRoute_TwoInactiveTargets(t *testing.T) {
AppendHeaders: map[string]string{
"knative-serving-revision": "revision",
"knative-serving-namespace": "test-ns",
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
Timeout: DefaultRouteTimeout,
}
Expand Down Expand Up @@ -423,9 +406,6 @@ func TestMakeVirtualServiceRoute_ZeroPercentNamedTargetScaledToZero(t *testing.T
Weight: 100,
}},
Timeout: DefaultRouteTimeout,
AppendHeaders: map[string]string{
IstioTimeoutHackHeaderKey: IstioTimeoutHackHeaderValue,
},
}
if diff := cmp.Diff(&expected, route); diff != "" {
t.Errorf("Unexpected route (-want +got): %v", diff)
Expand Down
31 changes: 4 additions & 27 deletions pkg/controller/route/route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,9 +315,8 @@ func TestCreateRouteForOneReserveRevision(t *testing.T) {
}},
Route: []v1alpha3.DestinationWeight{getActivatorDestinationWeight(100)},
AppendHeaders: map[string]string{
ctrl.GetRevisionHeaderName(): "test-rev",
ctrl.GetRevisionHeaderNamespace(): testNamespace,
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
ctrl.GetRevisionHeaderName(): "test-rev",
ctrl.GetRevisionHeaderNamespace(): testNamespace,
},
Timeout: resources.DefaultRouteTimeout,
}},
Expand Down Expand Up @@ -407,9 +406,6 @@ func TestCreateRouteWithMultipleTargets(t *testing.T) {
Weight: 10,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}},
}
if diff := cmp.Diff(expectedSpec, vs.Spec); diff != "" {
Expand Down Expand Up @@ -493,9 +489,8 @@ func TestCreateRouteWithOneTargetReserve(t *testing.T) {
Weight: 90,
}, getActivatorDestinationWeight(10)},
AppendHeaders: map[string]string{
ctrl.GetRevisionHeaderName(): "test-rev",
ctrl.GetRevisionHeaderNamespace(): testNamespace,
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
ctrl.GetRevisionHeaderName(): "test-rev",
ctrl.GetRevisionHeaderNamespace(): testNamespace,
},
Timeout: resources.DefaultRouteTimeout,
}},
Expand Down Expand Up @@ -600,9 +595,6 @@ func TestCreateRouteWithDuplicateTargets(t *testing.T) {
Weight: 50,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}, {
Match: []v1alpha3.HTTPMatchRequest{{Authority: &v1alpha3.StringMatch{Exact: "test-revision-1." + domain}}},
Route: []v1alpha3.DestinationWeight{{
Expand All @@ -613,9 +605,6 @@ func TestCreateRouteWithDuplicateTargets(t *testing.T) {
Weight: 100,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}, {
Match: []v1alpha3.HTTPMatchRequest{{Authority: &v1alpha3.StringMatch{Exact: "test-revision-2." + domain}}},
Route: []v1alpha3.DestinationWeight{{
Expand All @@ -626,9 +615,6 @@ func TestCreateRouteWithDuplicateTargets(t *testing.T) {
Weight: 100,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}},
}
if diff := cmp.Diff(expectedSpec, vs.Spec); diff != "" {
Expand Down Expand Up @@ -716,9 +702,6 @@ func TestCreateRouteWithNamedTargets(t *testing.T) {
Weight: 50,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}, {
Match: []v1alpha3.HTTPMatchRequest{{Authority: &v1alpha3.StringMatch{Exact: "bar." + domain}}},
Route: []v1alpha3.DestinationWeight{{
Expand All @@ -729,9 +712,6 @@ func TestCreateRouteWithNamedTargets(t *testing.T) {
Weight: 100,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}, {
Match: []v1alpha3.HTTPMatchRequest{{Authority: &v1alpha3.StringMatch{Exact: "foo." + domain}}},
Route: []v1alpha3.DestinationWeight{{
Expand All @@ -742,9 +722,6 @@ func TestCreateRouteWithNamedTargets(t *testing.T) {
Weight: 100,
}},
Timeout: resources.DefaultRouteTimeout,
AppendHeaders: map[string]string{
resources.IstioTimeoutHackHeaderKey: resources.IstioTimeoutHackHeaderValue,
},
}},
}
if diff := cmp.Diff(expectedSpec, vs.Spec); diff != "" {
Expand Down