Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions config/core/configmaps/features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
labels:
serving.knative.dev/release: devel
annotations:
knative.dev/example-checksum: "f31ab799"
knative.dev/example-checksum: "2d4c16b9"
data:
_example: |
################################
Expand Down Expand Up @@ -114,7 +114,7 @@ data:
# dereferenced by Routes. This allows us to reap revisions shortly after
# they are no longer active.
# See: https://knative.dev/docs/serving/feature-flags/#responsive-revision-garbage-collector
responsive-revision-gc: "allowed"
responsive-revision-gc: "enabled"

# Controls whether tag header based routing feature are enabled or not.
# 1. Enabled: enabling tag header based routing
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/config/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func defaultFeaturesConfig() *Features {
PodSpecRuntimeClassName: Disabled,
PodSpecSecurityContext: Disabled,
PodSpecTolerations: Disabled,
ResponsiveRevisionGC: Allowed,
ResponsiveRevisionGC: Enabled,
TagHeaderBasedRouting: Disabled,
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/service/resources/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (

// MakeConfiguration creates a Configuration from a Service object.
func MakeConfiguration(service *v1.Service) (*v1.Configuration, error) {
return MakeConfigurationFromExisting(service, &v1.Configuration{}, cfgmap.Allowed)
return MakeConfigurationFromExisting(service, &v1.Configuration{}, cfgmap.Enabled)
}

// MakeConfigurationFromExisting creates a Configuration from a Service object given an existing Configuration.
Expand Down
2 changes: 1 addition & 1 deletion pkg/reconciler/service/resources/configuration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestConfigurationSpec(t *testing.T) {
}
expectOwnerReferencesSetCorrectly(t, c.OwnerReferences)

if got, want := len(c.Labels), 2; got != want {
if got, want := len(c.Labels), 1; got != want {
t.Errorf("expected %d labels got %d", want, got)
}
if got, want := c.Labels[serving.ServiceLabelKey], testServiceName; got != want {
Expand Down
6 changes: 2 additions & 4 deletions pkg/reconciler/service/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -351,14 +351,12 @@ func TestReconcile(t *testing.T) {
// Mutate the Service to add some more labels
DefaultService("update-child-labels-ignore-route-label", "foo",
WithRunLatestRollout, WithInitSvcConditions, WithServiceLabel("new-label", "new-value")),
config("update-child-labels-ignore-route-label", "foo",
WithRunLatestRollout, WithConfigLabel("serving.knative.dev/route", "update-child-labels-ignore-route-label")),
config("update-child-labels-ignore-route-label", "foo", WithRunLatestRollout),
route("update-child-labels-ignore-route-label", "foo", WithRunLatestRollout),
},
Key: "foo/update-child-labels-ignore-route-label",
WantUpdates: []clientgotesting.UpdateActionImpl{{
Object: config("update-child-labels-ignore-route-label", "foo", WithRunLatestRollout, WithConfigLabel("new-label", "new-value"),
WithConfigLabel("serving.knative.dev/route", "update-child-labels-ignore-route-label")),
Object: config("update-child-labels-ignore-route-label", "foo", WithRunLatestRollout, WithConfigLabel("new-label", "new-value")),
}, {
Object: route("update-child-labels-ignore-route-label", "foo", WithRunLatestRollout, WithRouteLabel(map[string]string{"new-label": "new-value",
"serving.knative.dev/service": "update-child-labels-ignore-route-label"})),
Expand Down
3 changes: 0 additions & 3 deletions test/conformance/api/v1/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,6 @@ func validateLabelsPropagation(t pkgTest.T, objects v1test.ResourceObjects, name
if config.Labels["serving.knative.dev/service"] != names.Service {
return fmt.Errorf("expect Service name in Configuration label %q but got %q ", names.Service, config.Labels["serving.knative.dev/service"])
}
if config.Labels["serving.knative.dev/route"] != names.Route {
return fmt.Errorf("expect Route name in Configuration label %q but got %q ", names.Route, config.Labels["serving.knative.dev/route"])
}

t.Log("Validate Labels on Route Object")
route := objects.Route
Expand Down