diff --git a/go.mod b/go.mod index 3f360671b..07ee8b495 100644 --- a/go.mod +++ b/go.mod @@ -21,11 +21,11 @@ require ( k8s.io/cli-runtime v0.23.4 k8s.io/client-go v0.23.5 k8s.io/code-generator v0.23.5 - knative.dev/eventing v0.31.1-0.20220427174252-2219e1485934 + knative.dev/eventing v0.31.1-0.20220428204853-01f56122bf2a knative.dev/hack v0.0.0-20220427014036-5f473869d377 - knative.dev/networking v0.0.0-20220427030951-700c5762af5b - knative.dev/pkg v0.0.0-20220427171752-2d552be030f6 - knative.dev/serving v0.31.1-0.20220427153405-71842357ab0d + knative.dev/networking v0.0.0-20220429044653-591d2bb63aae + knative.dev/pkg v0.0.0-20220428192552-5c8cc3c9efd3 + knative.dev/serving v0.31.1-0.20220429200154-f6cb424aaae3 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index 0100903b3..baa3ab2ac 100644 --- a/go.sum +++ b/go.sum @@ -2268,24 +2268,22 @@ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -knative.dev/caching v0.0.0-20220427013924-6f81e2603c9f/go.mod h1:v7alC8ZeElvhSVxJe7xQf55vQhsozWq+0ikJS8LGmHs= -knative.dev/eventing v0.31.1-0.20220427174252-2219e1485934 h1:3k0ei/FgUBWUoa09izHmvmaqMNaOXyoLG6zWKR5l+jU= -knative.dev/eventing v0.31.1-0.20220427174252-2219e1485934/go.mod h1:XgJY27IxyBjmu/mz53cVlz+oMPPzzRaVXlPmWKCqEd8= +knative.dev/caching v0.0.0-20220428025253-fbd3e15507cf/go.mod h1:KrKJ/aoy/mwlQcSvHidBRPlJn1rRhZlPbqPHbxGtuz4= +knative.dev/eventing v0.31.1-0.20220428204853-01f56122bf2a h1:WLiDXHa9k97/lDmwBqgPuzI/6zQL4agrTH+jYjw1vFM= +knative.dev/eventing v0.31.1-0.20220428204853-01f56122bf2a/go.mod h1:jdXjZKlLMwEj2KFKatzbqKWyOJAjUtn3072V3SkKIGI= knative.dev/hack v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack v0.0.0-20220426205654-2a09b5c38889/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= knative.dev/hack v0.0.0-20220427014036-5f473869d377 h1:NMJG3LkOZ5Xut7TzbxtwaQAmT8ZBfDMxwCkoatZv8ms= knative.dev/hack v0.0.0-20220427014036-5f473869d377/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= -knative.dev/hack/schema v0.0.0-20220411131823-6ffd8417de7c/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= -knative.dev/networking v0.0.0-20220427030951-700c5762af5b h1:IaqpRMnd3RpAJA/+knnIhvHi4+4K3lUPPXayHcAjfIA= -knative.dev/networking v0.0.0-20220427030951-700c5762af5b/go.mod h1:/kpsXgqiyzP+W12153/reX5Um+tR8OBTJr4D078PHO4= -knative.dev/pkg v0.0.0-20220412134708-e325df66cb51/go.mod h1:j2MeD8s+JoCu1vegX80GbRXV/xd20Jm1NznxBYtVXiM= -knative.dev/pkg v0.0.0-20220425215754-45c37c266b74/go.mod h1:j2MeD8s+JoCu1vegX80GbRXV/xd20Jm1NznxBYtVXiM= +knative.dev/hack/schema v0.0.0-20220427014036-5f473869d377/go.mod h1:ffjwmdcrH5vN3mPhO8RrF2KfNnbHeCE2C60A+2cv3U0= +knative.dev/networking v0.0.0-20220429044653-591d2bb63aae h1:zdQdJdTDzqudH+FJVFfGt+3N3zqqljZpF0mCIV/CX2Y= +knative.dev/networking v0.0.0-20220429044653-591d2bb63aae/go.mod h1:SocyTv3I1HLDCOcLTKgdRrciOg3m0fNxd0BfqOEWv20= knative.dev/pkg v0.0.0-20220427013826-1f681e126af6/go.mod h1:j2MeD8s+JoCu1vegX80GbRXV/xd20Jm1NznxBYtVXiM= -knative.dev/pkg v0.0.0-20220427171752-2d552be030f6 h1:Qj5aQiYQFOFXAWp1+pw8k/o++PMuzEeLVpAYt70gxIU= knative.dev/pkg v0.0.0-20220427171752-2d552be030f6/go.mod h1:NXK3p/UMCbFybBM9xQGii3TuMN/WKHByXcYsTwZ6Y6U= -knative.dev/reconciler-test v0.0.0-20220412165608-994f0c3fab62/go.mod h1:BZai3XTZ7+A3HSwgm5cSgwS/Oc/9mOZJrAk+TtESABA= -knative.dev/serving v0.31.1-0.20220427153405-71842357ab0d h1:dQteYxBSgPe65Kk9wY9ZdEoAuIHqtIcPDNYi8LRPN3k= -knative.dev/serving v0.31.1-0.20220427153405-71842357ab0d/go.mod h1:WhcGWa8inHI9L8HIN4C57vQOoYJoodAy95AW97iEP2Y= +knative.dev/pkg v0.0.0-20220428192552-5c8cc3c9efd3 h1:wznCcHq6F1QNC8MGqekF+L4EpjMLwmFv+WQKds9qM1g= +knative.dev/pkg v0.0.0-20220428192552-5c8cc3c9efd3/go.mod h1:NXK3p/UMCbFybBM9xQGii3TuMN/WKHByXcYsTwZ6Y6U= +knative.dev/reconciler-test v0.0.0-20220427134652-f14902d1c7a5/go.mod h1:IZTJfC1sgr70/39NIne/MmaNbDWRHwT6cWvJB3AeHIU= +knative.dev/serving v0.31.1-0.20220429200154-f6cb424aaae3 h1:4zcGmn2hgyUn4GH69wPGXSADb6QFUfCi/7DofUnDWjY= +knative.dev/serving v0.31.1-0.20220429200154-f6cb424aaae3/go.mod h1:0QD86J9/jjo9p8EBGdegLYG3n5HP75RMBORtoXs7/Lo= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= diff --git a/vendor/knative.dev/serving/pkg/apis/config/features.go b/vendor/knative.dev/serving/pkg/apis/config/features.go index f1339bfa0..47be7b709 100644 --- a/vendor/knative.dev/serving/pkg/apis/config/features.go +++ b/vendor/knative.dev/serving/pkg/apis/config/features.go @@ -58,6 +58,8 @@ func defaultFeaturesConfig() *Features { PodSpecPersistentVolumeClaim: Disabled, PodSpecPersistentVolumeWrite: Disabled, PodSpecInitContainers: Disabled, + PodSpecDNSPolicy: Disabled, + PodSpecDNSConfig: Disabled, TagHeaderBasedRouting: Disabled, AutoDetectHTTP2: Disabled, } @@ -85,6 +87,8 @@ func NewFeaturesConfigFromMap(data map[string]string) (*Features, error) { asFlag("kubernetes.podspec-init-containers", &nc.PodSpecInitContainers), asFlag("kubernetes.podspec-persistent-volume-claim", &nc.PodSpecPersistentVolumeClaim), asFlag("kubernetes.podspec-persistent-volume-write", &nc.PodSpecPersistentVolumeWrite), + asFlag("kubernetes.podspec-dnspolicy", &nc.PodSpecDNSPolicy), + asFlag("kubernetes.podspec-dnsconfig", &nc.PodSpecDNSConfig), asFlag("tag-header-based-routing", &nc.TagHeaderBasedRouting), asFlag("autodetect-http2", &nc.AutoDetectHTTP2)); err != nil { return nil, err @@ -116,6 +120,8 @@ type Features struct { PodSpecInitContainers Flag PodSpecPersistentVolumeClaim Flag PodSpecPersistentVolumeWrite Flag + PodSpecDNSPolicy Flag + PodSpecDNSConfig Flag TagHeaderBasedRouting Flag AutoDetectHTTP2 Flag } diff --git a/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go b/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go index 5b43269b8..acd5462c1 100644 --- a/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go +++ b/vendor/knative.dev/serving/pkg/apis/serving/fieldmask.go @@ -227,13 +227,18 @@ func PodSpecMask(ctx context.Context, in *corev1.PodSpec) *corev1.PodSpec { if cfg.Features.PodSpecInitContainers != config.Disabled { out.InitContainers = in.InitContainers } + if cfg.Features.PodSpecDNSPolicy != config.Disabled { + out.DNSPolicy = in.DNSPolicy + } + if cfg.Features.PodSpecDNSConfig != config.Disabled { + out.DNSConfig = in.DNSConfig + } // Disallowed fields // This list is unnecessary, but added here for clarity out.RestartPolicy = "" out.TerminationGracePeriodSeconds = nil out.ActiveDeadlineSeconds = nil - out.DNSPolicy = "" out.NodeName = "" out.HostNetwork = false out.HostPID = false @@ -242,7 +247,6 @@ func PodSpecMask(ctx context.Context, in *corev1.PodSpec) *corev1.PodSpec { out.Hostname = "" out.Subdomain = "" out.Priority = nil - out.DNSConfig = nil out.ReadinessGates = nil return out diff --git a/vendor/modules.txt b/vendor/modules.txt index de3837ecc..84b58b21d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -894,7 +894,7 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/trace -# knative.dev/eventing v0.31.1-0.20220427174252-2219e1485934 +# knative.dev/eventing v0.31.1-0.20220428204853-01f56122bf2a ## explicit; go 1.16 knative.dev/eventing/pkg/apis/config knative.dev/eventing/pkg/apis/duck @@ -925,7 +925,7 @@ knative.dev/eventing/pkg/client/clientset/versioned/typed/sources/v1beta2/fake # knative.dev/hack v0.0.0-20220427014036-5f473869d377 ## explicit; go 1.14 knative.dev/hack -# knative.dev/networking v0.0.0-20220427030951-700c5762af5b +# knative.dev/networking v0.0.0-20220429044653-591d2bb63aae ## explicit; go 1.16 knative.dev/networking/pkg knative.dev/networking/pkg/apis/networking @@ -933,7 +933,7 @@ knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/client/clientset/versioned knative.dev/networking/pkg/client/clientset/versioned/scheme knative.dev/networking/pkg/client/clientset/versioned/typed/networking/v1alpha1 -# knative.dev/pkg v0.0.0-20220427171752-2d552be030f6 +# knative.dev/pkg v0.0.0-20220428192552-5c8cc3c9efd3 ## explicit; go 1.17 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -983,7 +983,7 @@ knative.dev/pkg/tracing/config knative.dev/pkg/tracing/propagation knative.dev/pkg/tracing/propagation/tracecontextb3 knative.dev/pkg/tracker -# knative.dev/serving v0.31.1-0.20220427153405-71842357ab0d +# knative.dev/serving v0.31.1-0.20220429200154-f6cb424aaae3 ## explicit; go 1.17 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1