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
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ require (
k8s.io/api v0.35.2
k8s.io/apimachinery v0.35.2
k8s.io/client-go v0.35.2
knative.dev/client/pkg v0.0.0-20260316143226-2e05393c4f67
knative.dev/client/pkg v0.0.0-20260317023652-a71f4839798c
knative.dev/eventing-kafka-broker v0.48.1-0.20260316040123-da0a579e5ece
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335
knative.dev/pkg v0.0.0-20260317082650-91e176852006
)

require (
Expand Down Expand Up @@ -104,7 +104,7 @@ require (
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
knative.dev/eventing v0.48.1-0.20260316031422-ce3fe6b62f97 // indirect
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2 // indirect
knative.dev/serving v0.48.1-0.20260316123724-07c6cde81b9e // indirect
knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7 // indirect
sigs.k8s.io/gateway-api v1.1.0 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/kustomize/api v0.20.1 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,8 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/client/pkg v0.0.0-20260316143226-2e05393c4f67 h1:YVp4yI0NT+ih0eC4M4wHbVbCXGa0HMtCp1OtO1IKZi4=
knative.dev/client/pkg v0.0.0-20260316143226-2e05393c4f67/go.mod h1:M9ymKwtYceGGgcn0gbXsd6e17RnWATXngbU5pj8R+Cc=
knative.dev/client/pkg v0.0.0-20260317023652-a71f4839798c h1:LBOuz+YrAyUN6ikjmAOvxup6Pjj5GYocZfSDeYt+NFc=
knative.dev/client/pkg v0.0.0-20260317023652-a71f4839798c/go.mod h1:f/VPg+5QHyIv58dewU0AmfIf0z4E9IRcDm7EvCZ5B/Q=
knative.dev/eventing v0.48.1-0.20260316031422-ce3fe6b62f97 h1:igxNyYW2+LxPspTqGpMH7Z+Qp1TqbYDkyiWtyHJjWK8=
knative.dev/eventing v0.48.1-0.20260316031422-ce3fe6b62f97/go.mod h1:UR5qyT/4a68s4HJ+ZEourVWJ7pS7um8PCW4COjeOyxE=
knative.dev/eventing-kafka-broker v0.48.1-0.20260316040123-da0a579e5ece h1:G5t+uH2+G5lociIQ7zssalDVUbtHtnsmSaGyz8nZRFc=
Expand All @@ -305,10 +305,10 @@ knative.dev/hack v0.0.0-20260310014051-c448fdb867e2 h1:b35SGLEp03D8oGf8mE9HBt3yf
knative.dev/hack v0.0.0-20260310014051-c448fdb867e2/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2 h1:UNzCI424xvyYD0Ii2Qzq4fmeSPFyhd3N3pbB6pTbxec=
knative.dev/networking v0.0.0-20260316020026-a339c355a2b2/go.mod h1:sNxNqkf3iMyBy0WOlicarFowbxhg14/g+BCmnx9Z6RQ=
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335 h1:OpR5LNa0m34T8KOzGLwObjmMkxuuenSFU51oiNcfKRw=
knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335/go.mod h1:o/XS1E/hYh9IR8deEEiJG4kKtQfqnf9Gwt5bwp2x4AU=
knative.dev/serving v0.48.1-0.20260316123724-07c6cde81b9e h1:cvV6ah3JElEP37WewAERIhvCCDxaLfk7NFvu2Vz3Pk0=
knative.dev/serving v0.48.1-0.20260316123724-07c6cde81b9e/go.mod h1:BJPmLXiP75SFAMo+xzU8SHcxmTbqYEbZk5xlgopye5g=
knative.dev/pkg v0.0.0-20260317082650-91e176852006 h1:kigmOSaEWOddCfoyH1+Mx0w1kwnZrl3CbPAN+9/+Kx4=
knative.dev/pkg v0.0.0-20260317082650-91e176852006/go.mod h1:o/XS1E/hYh9IR8deEEiJG4kKtQfqnf9Gwt5bwp2x4AU=
knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7 h1:azehTw7pMvOK+Ijq7AwKRX5/0flM6O0khNTpFyUgLoY=
knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7/go.mod h1:BJPmLXiP75SFAMo+xzU8SHcxmTbqYEbZk5xlgopye5g=
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
Expand Down
20 changes: 14 additions & 6 deletions vendor/knative.dev/serving/pkg/reconciler/route/domains/domains.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ const HTTPScheme string = "http"

var ErrDomainName = errors.New("domain name error")

type Domains struct {
Primary string
Expanded sets.Set[string]
}

// GetAllDomainsAndTags returns all of the domains and tags(including subdomains) associated with a Route
func GetAllDomainsAndTags(ctx context.Context, r *v1.Route, names []string, visibility map[string]netv1alpha1.IngressVisibility) (map[string]string, error) {
domainTagMap := make(map[string]string)
Expand All @@ -69,10 +74,11 @@ func GetAllDomainsAndTags(ctx context.Context, r *v1.Route, names []string, visi
}

// GetDomainsForVisibility return all domains for the specified visibility.
func GetDomainsForVisibility(ctx context.Context, targetName string, r *v1.Route, visibility netv1alpha1.IngressVisibility) (sets.Set[string], error) {
func GetDomainsForVisibility(ctx context.Context, targetName string, r *v1.Route, visibility netv1alpha1.IngressVisibility) (Domains, error) {
domains := Domains{}
hostname, err := HostnameFromTemplate(ctx, r.Name, targetName)
if err != nil {
return nil, err
return domains, err
}

meta := r.ObjectMeta.DeepCopy()
Expand All @@ -81,13 +87,15 @@ func GetDomainsForVisibility(ctx context.Context, targetName string, r *v1.Route

domain, err := DomainNameFromTemplate(ctx, *meta, hostname)
if err != nil {
return nil, err
return domains, err
}
domains := []string{domain}

domains.Primary = domain
domains.Expanded = sets.New(domain)
if isClusterLocal {
domains = sets.List(ingress.ExpandedHosts(sets.New(domains...)))
domains.Expanded = ingress.ExpandedHosts(domains.Expanded)
}
return sets.New(domains...), err
return domains, err
}

// DomainNameFromTemplate generates domain name base on the template specified in the `config-network` ConfigMap.
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/trace
# knative.dev/client/pkg v0.0.0-20260316143226-2e05393c4f67
# knative.dev/client/pkg v0.0.0-20260317023652-a71f4839798c
## explicit; go 1.25.0
knative.dev/client/pkg/apis/client
knative.dev/client/pkg/apis/client/v1alpha1
Expand Down Expand Up @@ -934,7 +934,7 @@ knative.dev/networking/pkg/apis/networking/v1alpha1
knative.dev/networking/pkg/config
knative.dev/networking/pkg/http/header
knative.dev/networking/pkg/ingress
# knative.dev/pkg v0.0.0-20260316154451-5d1c12d99335
# knative.dev/pkg v0.0.0-20260317082650-91e176852006
## explicit; go 1.25.0
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down Expand Up @@ -981,7 +981,7 @@ knative.dev/pkg/test/logging
knative.dev/pkg/test/spoof
knative.dev/pkg/tracker
knative.dev/pkg/webhook/resourcesemantics
# knative.dev/serving v0.48.1-0.20260316123724-07c6cde81b9e
# knative.dev/serving v0.48.1-0.20260316224151-10d950c3a0d7
## explicit; go 1.25.0
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down
Loading