Merge pull request #638 from danwinship/dns-hack-4.17

OCPBUGS-43764: Revendor to a patched k/k with our prefer-local-DNS hack

go.mod

@@ -19,16 +19,16 @@ require (
 	github.com/vishvananda/netlink v1.1.0
 	go.opentelemetry.io/otel/trace v1.19.0
 	golang.org/x/sys v0.18.0
-	k8s.io/api v0.30.3
-	k8s.io/apimachinery v0.30.3
-	k8s.io/apiserver v0.30.3
-	k8s.io/client-go v0.30.3
-	k8s.io/cloud-provider v0.30.3
-	k8s.io/component-base v0.30.3
-	k8s.io/component-helpers v0.30.3
-	k8s.io/cri-api v0.30.3
+	k8s.io/api v1.30.5
+	k8s.io/apimachinery v1.30.5
+	k8s.io/apiserver v1.30.5
+	k8s.io/client-go v1.30.5
+	k8s.io/cloud-provider v1.30.5
+	k8s.io/component-base v1.30.5
+	k8s.io/component-helpers v1.30.5
+	k8s.io/cri-api v1.30.5
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubernetes v1.30.3
+	k8s.io/kubernetes v1.30.5
 	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/knftables v0.0.16
 	sigs.k8s.io/yaml v1.3.0
@@ -133,14 +133,14 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.30.3 // indirect
-	k8s.io/controller-manager v0.30.3 // indirect
-	k8s.io/csi-translation-lib v0.30.3 // indirect
-	k8s.io/kms v0.30.3 // indirect
+	k8s.io/apiextensions-apiserver v1.30.5 // indirect
+	k8s.io/controller-manager v1.30.5 // indirect
+	k8s.io/csi-translation-lib v1.30.5 // indirect
+	k8s.io/kms v1.30.5 // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
-	k8s.io/kube-proxy v0.30.3 // indirect
-	k8s.io/kubelet v0.30.3 // indirect
-	k8s.io/mount-utils v0.30.3 // indirect
+	k8s.io/kube-proxy v1.30.5 // indirect
+	k8s.io/kubelet v1.30.5 // indirect
+	k8s.io/mount-utils v1.30.5 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
@@ -176,5 +176,34 @@ replace (
 	github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
 	github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0
 	github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
+	k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/kubernetes => github.com/openshift/kubernetes v1.30.1-0.20241023210935-d7454a2f918b
+	k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20241023210935-d7454a2f918b
+	k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20241023210935-d7454a2f918b
 	sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
 )

go.sum

@@ -272,6 +272,38 @@ github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
 github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1/go.mod h1:ihUJrhBcYAGYQrJu/gP2OMgfVds5f5z5kbeLNBqjHLo=
+github.com/openshift/kubernetes v1.30.1-0.20241023210935-d7454a2f918b h1:bmmaRAwVaTXR3JX1LJKFpREuwLhgXkmXHugP1JNhtpk=
+github.com/openshift/kubernetes v1.30.1-0.20241023210935-d7454a2f918b/go.mod h1:eWEwBuUIgunE32nhS0xM5hiN4BIp3ISrAIlGTyNN2JY=
+github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241023210935-d7454a2f918b h1:WLb56Kj3iikZw/bcrWKFO29Fj6/u4Nn4V4tgTB4uKNM=
+github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20241023210935-d7454a2f918b/go.mod h1:MT0Wu+tcrQr/oMnfrjzdSZ7mzCiwx4+KDhIqa/+Br/I=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241023210935-d7454a2f918b h1:0Z0ezDluYLcUPnycQxNESt42vafZwfMhUWWjmrPTlAU=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20241023210935-d7454a2f918b/go.mod h1:DPOzzIf6n1/l8+PABfoqj81RjqyBLI6+/Pjkys3zrQo=
+github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241023210935-d7454a2f918b h1:dxnfYWw0JWsq1pOZcfnrBom83yqntcMfnvia3WXTPDk=
+github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20241023210935-d7454a2f918b/go.mod h1:t8MQn0aJW4Wz3tmdr/QDNyBZquwqtqEUKqbKhQKjbp0=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241023210935-d7454a2f918b h1:S7m67ijNqMyu0whU1MKoWsdbSa/B2u3sUivb/6fejzs=
+github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241023210935-d7454a2f918b/go.mod h1:CUVmmmibyDvJRSdzgx+XZGcX4B6BBIyQWJ0XaZQDQ7U=
+github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241023210935-d7454a2f918b h1:Hv5Wdd8/c5Gaj2/ZzydEN8LZK5+vByu4rZ5WnoU9u1c=
+github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20241023210935-d7454a2f918b/go.mod h1:JD8I9iUwU+k8A7QHfmBGYfu5UrkbQW3nDnG28rLlkFE=
+github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241023210935-d7454a2f918b h1:svYBB72C7P68cT8+9RWlAQ6VpyTsGuc6k1P5RN15/WQ=
+github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20241023210935-d7454a2f918b/go.mod h1:xi+XvU2vbnQtFkiU1pqn+dxcXwQADYeC1is21ciK2ss=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241023210935-d7454a2f918b h1:X2O18ML5OD2Ts6lnUJaJnEE/zMbkpRyzuAdEUWz24Fk=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20241023210935-d7454a2f918b/go.mod h1:z0h1kSKwTKBb7mekPRApPIiQKjQ/97LEewIX0U2fTco=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241023210935-d7454a2f918b h1:MYR+/58Z0AkgKAupAUiQPAsD0vEkfsX1h+DGvhv5u/s=
+github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20241023210935-d7454a2f918b/go.mod h1:JnDaovXMrRoLaNWAFTTYwljG5uo1YoITYNw/8P0m/Zo=
+github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241023210935-d7454a2f918b h1:ch21HLpClcW51Bbo70MR/vYCO10dChj3ehEJEYsgwjg=
+github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20241023210935-d7454a2f918b/go.mod h1:tGylrLWeY7AO4OR0evvI0CxLsmJZy83yPrtysLsGDXg=
+github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241023210935-d7454a2f918b h1:h64D9KN0JHoAu6d3MGcciuktQxR4Zc8XCrCO8jzAdX4=
+github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20241023210935-d7454a2f918b/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc=
+github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241023210935-d7454a2f918b h1:iXpZkdnn1+w6YhGVtAyLe96MGhpj51QLZw5196T2Iv0=
+github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20241023210935-d7454a2f918b/go.mod h1:ef38HCcCShGOPx8s6rnAlzS1hYCCGmiLGw3A2GGZ1pg=
+github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241023210935-d7454a2f918b h1:yHEI4pwud+Ze1Jqf851HVhV7nLw/UZ7QpfSZnKSEzi4=
+github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20241023210935-d7454a2f918b/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241023210935-d7454a2f918b h1:6MKbugCseBRQxop5Q6l420cHofKhSQ+wNLVmZwkEv1Y=
+github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20241023210935-d7454a2f918b/go.mod h1:jlYTzNX+XdkW78Tbu7zNj9n/lnSEKQNl8McQPhMhmwM=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241023210935-d7454a2f918b h1:BuGTESDnVuvDFX8Ow2eWIalgnCgnSabsJ5W0oxJ7VOI=
+github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20241023210935-d7454a2f918b/go.mod h1:J3s04GUInRh4RD9N0tbJpkP1lciQ3WqFk69BvbNRtaQ=
+github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241023210935-d7454a2f918b h1:oz6HueHqvPMKKVBdXu6A6Hhl1VF/0oSKkGTIUAv3oK0=
+github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20241023210935-d7454a2f918b/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14=
 github.com/openshift/library-go v0.0.0-20231101160200-9e6e65ed2a52 h1:pccu5m2fHiQRVq07tfa7UQZvyxM791llfn/TxhU5ukU=
 github.com/openshift/library-go v0.0.0-20231101160200-9e6e65ed2a52/go.mod h1:8UzmrBMCn7+GzouL8DVYkL9COBQTB1Ggd13/mHJQCUg=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -556,42 +588,10 @@ gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ=
-k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04=
-k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U=
-k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4=
-k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc=
-k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
-k8s.io/apiserver v0.30.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g=
-k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg=
-k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k=
-k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U=
-k8s.io/cloud-provider v0.30.3 h1:SNWZmllTymOTzIPJuhtZH6il/qVi75dQARRQAm9k6VY=
-k8s.io/cloud-provider v0.30.3/go.mod h1:Ax0AVdHnM7tMYnJH1Ycy4SMBD98+4zA+tboUR9eYsY8=
-k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s=
-k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA=
-k8s.io/component-helpers v0.30.3 h1:KPc8l0eGx9Wg2OcKc58k9ozNcVcOInAi3NGiuS2xJ/c=
-k8s.io/component-helpers v0.30.3/go.mod h1:VOQ7g3q+YbKWwKeACG2BwPv4ftaN8jXYJ5U3xpzuYAE=
-k8s.io/controller-manager v0.30.3 h1:QRFGkWWD5gi/KCSU0qxyUoZRbt+BKgiCUXiTD1RO95w=
-k8s.io/controller-manager v0.30.3/go.mod h1:F95rjHCOH2WwV9XlVxRo71CtddKLhF3FzE+s1lc7E/0=
-k8s.io/cri-api v0.30.3 h1:o7AAGb3645Ik44WkHI0eqUc7JbQVmstlINLlLAtU/rI=
-k8s.io/cri-api v0.30.3/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg=
-k8s.io/csi-translation-lib v0.30.3 h1:wBaPWnOi14/vANRIrp8pmbdx/Pgz2QRcroH7wkodezc=
-k8s.io/csi-translation-lib v0.30.3/go.mod h1:3AizNZbDttVDH1RO0x1yGEQP74e9Xbfb60IBP1oWO1o=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
 k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kms v0.30.3 h1:NLg+oN45S2Y3U0WiLRzbS61AY/XrS5JBMZp531Z+Pho=
-k8s.io/kms v0.30.3/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/kube-proxy v0.30.3 h1:6N/KM4XtWs8+gTY8xr0lkjVhbCnMmmwKNvlSW2oTaZE=
-k8s.io/kube-proxy v0.30.3/go.mod h1:EYjQhktVcTx5RoAZ8yxtQInUvxg0aCpL6CC/efjsBTo=
-k8s.io/kubelet v0.30.3 h1:KvGWDdhzD0vEyDyGTCjsDc8D+0+lwRMw3fJbfQgF7ys=
-k8s.io/kubelet v0.30.3/go.mod h1:D9or45Vkzcqg55CEiqZ8dVbwP3Ksj7DruEVRS9oq3Ys=
-k8s.io/kubernetes v1.30.3 h1:A0qoXI1YQNzrQZiff33y5zWxYHFT/HeZRK98/sRDJI0=
-k8s.io/kubernetes v1.30.3/go.mod h1:yPbIk3MhmhGigX62FLJm+CphNtjxqCvAIFQXup6RKS0=
-k8s.io/mount-utils v0.30.3 h1:8Z3wSW5+GSvGNtlDhtoZrBCKLMIf5z/9tf8pie+G06s=
-k8s.io/mount-utils v0.30.3/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 h1:/U5vjBbQn3RChhv7P11uhYvCSm5G2GaIi5AIGBS6r4c=