upgrade to latest dependencies (#451)

bumping knative.dev/pkg 01dccc5...3a2ae6d:
  > 3a2ae6d resolve cluster domain using env CLUSTER_DOMAIN as a fallback (# 2092)
  > 4302f33 Update knative/community files (# 2091)
  > 728bc4a Update OWNERS_ALIASES to match autogen in community (# 2078)

Signed-off-by: Knative Automation <automation@knative.team>
This commit is contained in:
knative-automation 2021-04-11 23:48:41 -07:00 committed by GitHub
parent 1f173ac4e6
commit 08a0136e43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions

2
go.mod
View File

@ -18,5 +18,5 @@ require (
k8s.io/code-generator v0.19.7
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
knative.dev/hack v0.0.0-20210325223819-b6ab329907d3
knative.dev/pkg v0.0.0-20210408073950-01dccc570bb3
knative.dev/pkg v0.0.0-20210409203851-3a2ae6db7097
)

4
go.sum
View File

@ -1205,8 +1205,8 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
knative.dev/hack v0.0.0-20210325223819-b6ab329907d3 h1:km0Rrh0T9/wA2pivQm1hqSPVwgNgGCHC2WNn3GakZmE=
knative.dev/hack v0.0.0-20210325223819-b6ab329907d3/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
knative.dev/pkg v0.0.0-20210408073950-01dccc570bb3 h1:Nx9uFzlq9Mo2F3GLYQ3NuHeG11wN67Zwfq1HcoDvqkM=
knative.dev/pkg v0.0.0-20210408073950-01dccc570bb3/go.mod h1:V/yjYpwRpIoUCavOoF8plCw72kF7rMjWPms5v2QqxA4=
knative.dev/pkg v0.0.0-20210409203851-3a2ae6db7097 h1:QgAu9HFo/luVDNQPu5nhNsC0nj9/OsughUe2XYE9NoU=
knative.dev/pkg v0.0.0-20210409203851-3a2ae6db7097/go.mod h1:V/yjYpwRpIoUCavOoF8plCw72kF7rMjWPms5v2QqxA4=
pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

View File

@ -26,8 +26,9 @@ import (
)
const (
resolverFileName = "/etc/resolv.conf"
defaultDomainName = "cluster.local"
resolverFileName = "/etc/resolv.conf"
clusterDomainEnvKey = "CLUSTER_DOMAIN"
defaultDomainName = "cluster.local"
)
var (
@ -55,6 +56,7 @@ func GetClusterDomainName() string {
}
func getClusterDomainName(r io.Reader) string {
// First look in the conf file.
for scanner := bufio.NewScanner(r); scanner.Scan(); {
elements := strings.Split(scanner.Text(), " ")
if elements[0] != "search" {
@ -66,6 +68,12 @@ func getClusterDomainName(r io.Reader) string {
}
}
}
// Then look in the ENV.
if domain := os.Getenv(clusterDomainEnvKey); len(domain) > 0 {
return domain
}
// For all abnormal cases return default domain name.
return defaultDomainName
}

2
vendor/modules.txt vendored
View File

@ -659,7 +659,7 @@ k8s.io/utils/trace
# knative.dev/hack v0.0.0-20210325223819-b6ab329907d3
## explicit
knative.dev/hack
# knative.dev/pkg v0.0.0-20210408073950-01dccc570bb3
# knative.dev/pkg v0.0.0-20210409203851-3a2ae6db7097
## explicit
knative.dev/pkg/apis
knative.dev/pkg/apis/duck