diff --git a/.github/workflows/lib-validate.yaml b/.github/workflows/lib-validate.yaml index 175b4af9..56adc380 100644 --- a/.github/workflows/lib-validate.yaml +++ b/.github/workflows/lib-validate.yaml @@ -67,9 +67,9 @@ jobs: strategy: matrix: version: - - 1.28.x - 1.29.x - 1.30.x + - 1.31.x steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5 diff --git a/go.mod b/go.mod index 9393f845..e1d68dcc 100644 --- a/go.mod +++ b/go.mod @@ -17,16 +17,16 @@ require ( golang.org/x/text v0.17.0 google.golang.org/grpc v1.65.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.31.0-beta.0 - k8s.io/apimachinery v0.31.0-beta.0 - k8s.io/client-go v0.31.0-beta.0 - k8s.io/component-base v0.31.0-beta.0 + k8s.io/api v0.31.0 + k8s.io/apimachinery v0.31.0 + k8s.io/client-go v0.31.0 + k8s.io/component-base v0.31.0 k8s.io/klog/v2 v2.130.1 - k8s.io/kubelet v0.31.0-beta.0 - k8s.io/kubernetes v1.31.0-beta.0 + k8s.io/kubelet v0.31.0 + k8s.io/kubernetes v1.31.0 k8s.io/pod-security-admission v0.0.0 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/controller-runtime v0.18.1-0.20240717190548-1ed345090869 + sigs.k8s.io/controller-runtime v0.19.0 sigs.k8s.io/yaml v1.4.0 tags.cncf.io/container-device-interface/specs-go v0.8.0 ) @@ -114,14 +114,14 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.31.0-beta.0 // indirect - k8s.io/apiserver v0.31.0-beta.0 // indirect + k8s.io/apiextensions-apiserver v0.31.0 // indirect + k8s.io/apiserver v0.31.0 // indirect k8s.io/cloud-provider v0.0.0 // indirect - k8s.io/component-helpers v0.31.0-beta.0 // indirect - k8s.io/controller-manager v0.31.0-beta.0 // indirect - k8s.io/cri-api v0.31.0-beta.0 // indirect + k8s.io/component-helpers v0.31.0 // indirect + k8s.io/controller-manager v0.31.0 // indirect + k8s.io/cri-api v0.31.0 // indirect k8s.io/cri-client v0.0.0 // indirect - k8s.io/kms v0.31.0-beta.0 // indirect + k8s.io/kms v0.31.0 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/kubectl v0.0.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect @@ -130,35 +130,34 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.31.0-beta.0 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0-beta.0 - k8s.io/apimachinery => k8s.io/apimachinery v0.31.0-beta.0 - k8s.io/apiserver => k8s.io/apiserver v0.31.0-beta.0 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0-beta.0 - k8s.io/client-go => k8s.io/client-go v0.31.0-beta.0 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0-beta.0 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0-beta.0 - k8s.io/code-generator => k8s.io/code-generator v0.31.0-beta.0 - k8s.io/component-base => k8s.io/component-base v0.31.0-beta.0 - k8s.io/component-helpers => k8s.io/component-helpers v0.31.0-beta.0 - k8s.io/controller-manager => k8s.io/controller-manager v0.31.0-beta.0 - k8s.io/cri-api => k8s.io/cri-api v0.31.0-beta.0 - k8s.io/cri-client => k8s.io/cri-client v0.31.0-beta.0 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0-beta.0 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0-beta.0 - k8s.io/endpointslice => k8s.io/endpointslice v0.31.0-beta.0 - k8s.io/kms => k8s.io/kms v0.31.0-beta.0 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0-beta.0 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0-beta.0 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0-beta.0 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0-beta.0 - k8s.io/kubectl => k8s.io/kubectl v0.31.0-beta.0 - k8s.io/kubelet => k8s.io/kubelet v0.31.0-beta.0 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.0 - k8s.io/metrics => k8s.io/metrics v0.31.0-beta.0 - k8s.io/mount-utils => k8s.io/mount-utils v0.31.0-beta.0 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0-beta.0 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0-beta.0 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0-beta.0 - k8s.io/sample-controller => k8s.io/sample-controller v0.31.0-beta.0 + k8s.io/api => k8s.io/api v0.31.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.31.0 + k8s.io/apiserver => k8s.io/apiserver v0.31.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0 + k8s.io/client-go => k8s.io/client-go v0.31.0 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0 + k8s.io/code-generator => k8s.io/code-generator v0.31.0 + k8s.io/component-base => k8s.io/component-base v0.31.0 + k8s.io/component-helpers => k8s.io/component-helpers v0.31.0 + k8s.io/controller-manager => k8s.io/controller-manager v0.31.0 + k8s.io/cri-api => k8s.io/cri-api v0.31.0 + k8s.io/cri-client => k8s.io/cri-client v0.31.0 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.0 + k8s.io/endpointslice => k8s.io/endpointslice v0.31.0 + k8s.io/kms => k8s.io/kms v0.31.0 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0 + k8s.io/kubectl => k8s.io/kubectl v0.31.0 + k8s.io/kubelet => k8s.io/kubelet v0.31.0 + k8s.io/metrics => k8s.io/metrics v0.31.0 + k8s.io/mount-utils => k8s.io/mount-utils v0.31.0 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0 + k8s.io/sample-controller => k8s.io/sample-controller v0.31.0 ) diff --git a/go.sum b/go.sum index ca09602a..83b17b40 100644 --- a/go.sum +++ b/go.sum @@ -298,48 +298,48 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.0-beta.0 h1:4qPGblT8h5w81f+dbj8gbYTnZATmHDRapPcmSfqKJec= -k8s.io/api v0.31.0-beta.0/go.mod h1:0Zff1rZco/hYJZmBdGxE+Q0KBGRxIwPAFK6fHYxjvk8= -k8s.io/apiextensions-apiserver v0.31.0-beta.0 h1:jiCx1fngp4kwV0Z5RNjxdA7uGboTnGPQ8E11wq3dG3U= -k8s.io/apiextensions-apiserver v0.31.0-beta.0/go.mod h1:RLgkSUSiaHGOL8+Oy8hSDrw+f+fhKwg8HCf2avGCzQc= -k8s.io/apimachinery v0.31.0-beta.0 h1:KoBE9f7sPz67HclZC/JgH1pIBvOlMZQAwoHQuriE/5E= -k8s.io/apimachinery v0.31.0-beta.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.31.0-beta.0 h1:sY6zGeFH5yHg2+immI5QGh8ibsyU6DsJzRJB+/pTz90= -k8s.io/apiserver v0.31.0-beta.0/go.mod h1:Oe7UO9yBGzFmc5YeJvtMVG89JzAbWv4PUrwuiuLfvYU= -k8s.io/client-go v0.31.0-beta.0 h1:op39m8L2YX8cUVTj8Fj+SD09axcxwPbFlipM3x+11fc= -k8s.io/client-go v0.31.0-beta.0/go.mod h1:ZTCtLpZyZDJBji9GGwrzKjR60/lVXvm8WLdgTEqPRw4= -k8s.io/cloud-provider v0.31.0-beta.0 h1:2i41JLidqlp1GfPf4ypyYX/XFyrqODBJ5hJN33AWpVQ= -k8s.io/cloud-provider v0.31.0-beta.0/go.mod h1:mPWqiSBQzkQSHlJX9U6J1revf6IzoazhzFR7LqN7Mlc= -k8s.io/component-base v0.31.0-beta.0 h1:Pw4OEeykCxfs8fTCslHEWggbNe/24W4TYVIn1VEdkjE= -k8s.io/component-base v0.31.0-beta.0/go.mod h1:mjY7SWAP/NhFiwUkdT+gzhGDI/cBqB/Pi5tF443aikE= -k8s.io/component-helpers v0.31.0-beta.0 h1:8AjrETYaFEYR+i7Io5oVtMOpkNUdyPLT5pu78082sC4= -k8s.io/component-helpers v0.31.0-beta.0/go.mod h1:MR/QVP3+R1Bv+lOncH0Eh0SSnAjDMGjK2QL+/8/tYDg= -k8s.io/controller-manager v0.31.0-beta.0 h1:UKTG4j2hTRCsq9fcHWHymhfUm+ji6LIq3nTc6cu/VDI= -k8s.io/controller-manager v0.31.0-beta.0/go.mod h1:qQ4M1GHAJl+xIdVfc767L39bwqwGNmqR5N6Im9IHGNk= -k8s.io/cri-api v0.31.0-beta.0 h1:U+E5RaGMtR1TLsJvaxb0RCVRU9ZcDPrC5EiCxb1uN1s= -k8s.io/cri-api v0.31.0-beta.0/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= -k8s.io/cri-client v0.31.0-beta.0 h1:VIq3WTdpshrNkbM/zXmOedEValrOsSseqrLRXeK/s/k= -k8s.io/cri-client v0.31.0-beta.0/go.mod h1:qtduCKkjfx6kUepnUL6vyROfA43bVpmnIpD4pSw4JZo= +k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= +k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= +k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= +k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= +k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= +k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= +k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk= +k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= +k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= +k8s.io/cloud-provider v0.31.0 h1:qNOs78I2/7zQmyStfDtY2M7EdilUl9fCSYMcqBju/tA= +k8s.io/cloud-provider v0.31.0/go.mod h1:QgUPqLoL6aXhLlrNg1U4IrJk/PvvxgeOnT2ixkgnqT0= +k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= +k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= +k8s.io/component-helpers v0.31.0 h1:jyRUKA+GX+q19o81k4x94imjNICn+e6Gzi6T89va1/A= +k8s.io/component-helpers v0.31.0/go.mod h1:MrNIvT4iB7wXIseYSWfHUJB/aNUiFvbilp4qDfBQi6s= +k8s.io/controller-manager v0.31.0 h1:OmM0JfkzMvNXGbKIInj8SOrqIHLW4ymDGaNaa4KqyGc= +k8s.io/controller-manager v0.31.0/go.mod h1:slaIzbI1ecqVphjSuHwlzJQ2pclSwtjUzTEQ6fYAB8A= +k8s.io/cri-api v0.31.0 h1:6o0XrhWlc1/zseGCh+aMScdXCg5nT6KCGdyx7HQkSKo= +k8s.io/cri-api v0.31.0/go.mod h1:Po3TMAYH/+KrZabi7QiwQI4a692oZcUOUThd/rqwxrI= +k8s.io/cri-client v0.31.0 h1:lu+Fq1h9GYIJO0PiWX1tH5KEhbD4H52grWss4CVMlqc= +k8s.io/cri-client v0.31.0/go.mod h1:rAZ0wx1Yqq4XwfL89Hvzl6rCbnkK0k/rm4DuW48O1+I= 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.31.0-beta.0 h1:yQ0MggWXDTTf7qTdoEGHp4zwifYzJ9o5RKAkaxewAZU= -k8s.io/kms v0.31.0-beta.0/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94= +k8s.io/kms v0.31.0 h1:KchILPfB1ZE+ka7223mpU5zeFNkmb45jl7RHnlImUaI= +k8s.io/kms v0.31.0/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94= 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/kubectl v0.31.0-beta.0 h1:fT0R/jDZnSfssg72kneEsdjtXFRskPPvRR0Q4W0AHas= -k8s.io/kubectl v0.31.0-beta.0/go.mod h1:Li8tESp4LOEMmJiV+IiMRkZxutvd3xk2q8pyQy2KG8g= -k8s.io/kubelet v0.31.0-beta.0 h1:BLCwYMwo2rH/Vry4RUQjLR99bF+eO7f0veShokp0NmQ= -k8s.io/kubelet v0.31.0-beta.0/go.mod h1:WA1/9dV0fsAAbAlTAx9sH5M08hM211WfntfMWJJAZTg= -k8s.io/kubernetes v1.31.0-beta.0 h1:GW3DswpiLxRoHh5I8aZvCa0s0cW+nwFd3I4znD/aung= -k8s.io/kubernetes v1.31.0-beta.0/go.mod h1:VK9p9uMJq6jwBCmCjtQTVUcl3Q7lFAPxmf71qjQeLSA= -k8s.io/pod-security-admission v0.31.0-beta.0 h1:M3CqH8dNe5fuutf8yNB9Cz2R5jh0J/DZD3NJ8+0GxrI= -k8s.io/pod-security-admission v0.31.0-beta.0/go.mod h1:URFwNBfV5gPO7qp0l27UNrbcFlsQclv93uW2mUIdYFQ= +k8s.io/kubectl v0.31.0 h1:kANwAAPVY02r4U4jARP/C+Q1sssCcN/1p9Nk+7BQKVg= +k8s.io/kubectl v0.31.0/go.mod h1:pB47hhFypGsaHAPjlwrNbvhXgmuAr01ZBvAIIUaI8d4= +k8s.io/kubelet v0.31.0 h1:IlfkBy7QTojGEm97GuVGhtli0HL/Pgu4AdayiF76yWo= +k8s.io/kubelet v0.31.0/go.mod h1:s+OnqnfdIh14PFpUb7NgzM53WSYXcczA3w/1qSzsRc8= +k8s.io/kubernetes v1.31.0 h1:sYAB12TTWexXKp4RxqJMm/7EC+P0mNOgn4Xdj5eu7HM= +k8s.io/kubernetes v1.31.0/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8= +k8s.io/pod-security-admission v0.31.0 h1:z8lTQ1+EZ8aX+xTrDTT2Udt1b9mzci2o2L2O4TUWSUU= +k8s.io/pod-security-admission v0.31.0/go.mod h1:672PutRBAIEOJJljOHDYhXiXrQDDFdB3z7hddN3Pv5c= 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.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/controller-runtime v0.18.1-0.20240717190548-1ed345090869 h1:9+0SFkDM+/1JJQQoG+Zk/lZXTT87mZwc6qmIezGhEq8= -sigs.k8s.io/controller-runtime v0.18.1-0.20240717190548-1ed345090869/go.mod h1:0N/oS51dz0ZJriISp1SloFWkR7uKCDC6LBt65tRt2J0= +sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= +sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/test/envtest/suite_test.go b/test/envtest/suite_test.go index e3407653..44e4e090 100644 --- a/test/envtest/suite_test.go +++ b/test/envtest/suite_test.go @@ -35,6 +35,7 @@ import ( "k8s.io/klog/v2/textlogger" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + config "sigs.k8s.io/controller-runtime/pkg/config" "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" @@ -108,7 +109,8 @@ var _ = AfterEach(func() { }) func up() { - k8sManager, managerErr := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme.Scheme, Metrics: metricsserver.Options{BindAddress: "0"}}) + yes := true + k8sManager, managerErr := ctrl.NewManager(cfg, ctrl.Options{Scheme: scheme.Scheme, Metrics: metricsserver.Options{BindAddress: "0"}, Controller: config.Controller{SkipNameValidation: &yes}}) Expect(managerErr).To(BeNil()) withWebhook := true