From 720d3d369525b4cac3c230ac8b2a138079bed176 Mon Sep 17 00:00:00 2001 From: Mangirdas Judeikis Date: Fri, 13 Sep 2024 14:31:50 +0300 Subject: [PATCH] rebase to release version & fix cert issue --- go.mod | 56 +++++++---------------- go.sum | 86 ++++++++++++++++------------------- server/cmd/options/options.go | 5 +- server/readiness/ready.go | 13 +++++- 4 files changed, 72 insertions(+), 88 deletions(-) diff --git a/go.mod b/go.mod index 30e90c0..cc43183 100644 --- a/go.mod +++ b/go.mod @@ -2,44 +2,25 @@ module github.com/kcp-dev/generic-controlplane go 1.22.2 -replace ( - k8s.io/api => github.com/sttts/kubernetes/staging/src/k8s.io/api v0.0.0-20240717102225-436d5eeedfea - k8s.io/apiextensions-apiserver => github.com/sttts/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240717102225-436d5eeedfea - k8s.io/apimachinery => github.com/sttts/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240717102225-436d5eeedfea - k8s.io/apiserver => github.com/sttts/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240717102225-436d5eeedfea - k8s.io/client-go => github.com/sttts/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240717102225-436d5eeedfea - k8s.io/cloud-provider => github.com/sttts/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240717102225-436d5eeedfea - k8s.io/cluster-bootstrap => github.com/sttts/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240717102225-436d5eeedfea - k8s.io/component-base => github.com/sttts/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240717102225-436d5eeedfea - k8s.io/component-helpers => github.com/sttts/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240717102225-436d5eeedfea - k8s.io/controller-manager => github.com/sttts/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240717102225-436d5eeedfea - k8s.io/cri-api => github.com/sttts/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240717102225-436d5eeedfea - k8s.io/cri-client => github.com/sttts/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20240717102225-436d5eeedfea - k8s.io/csi-translation-lib => github.com/sttts/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240717102225-436d5eeedfea - k8s.io/dynamic-resource-allocation => github.com/sttts/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240717102225-436d5eeedfea - k8s.io/kms => github.com/sttts/kubernetes/staging/src/k8s.io/kms v0.0.0-20240717102225-436d5eeedfea - k8s.io/kube-aggregator => github.com/sttts/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240717102225-436d5eeedfea - k8s.io/kubelet => github.com/sttts/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240717102225-436d5eeedfea - k8s.io/kubernetes => github.com/sttts/kubernetes v0.0.0-20240717102225-436d5eeedfea - k8s.io/kubernetes/pkg/kubeapiserver => github.com/sttts/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240717102225-436d5eeedfea - k8s.io/mount-utils => github.com/sttts/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240717102225-436d5eeedfea - k8s.io/pod-security-admission => github.com/sttts/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240717102225-436d5eeedfea -) - require ( github.com/google/uuid v1.6.0 github.com/kcp-dev/kcp v0.24.0 github.com/kcp-dev/kcp/cli v0.24.0 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace - k8s.io/apiextensions-apiserver v0.30.0 - k8s.io/apimachinery v0.30.0 - k8s.io/apiserver v0.30.0 - k8s.io/client-go v1.5.2 - k8s.io/component-base v0.30.0 + k8s.io/apiextensions-apiserver v0.31.0 + k8s.io/apimachinery v0.31.1 + k8s.io/apiserver v0.31.1 + k8s.io/client-go v0.31.1 + k8s.io/component-base v0.31.1 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-aggregator v0.30.0 - k8s.io/kubernetes v1.30.0 + k8s.io/kube-aggregator v0.31.0 + k8s.io/kubernetes v1.31.0 +) + +require ( + k8s.io/cri-client v0.31.0 // indirect + k8s.io/csi-translation-lib v0.31.0 // indirect ) require ( @@ -68,7 +49,6 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect - github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -99,8 +79,6 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/runc v1.1.13 // indirect - github.com/opencontainers/runtime-spec v1.2.0 // indirect github.com/opencontainers/selinux v1.11.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pquerna/cachecontrol v0.2.0 // indirect @@ -156,15 +134,15 @@ require ( gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.30.0 + k8s.io/api v0.31.1 k8s.io/cloud-provider v0.30.0 // indirect k8s.io/cluster-bootstrap v0.30.0 // indirect - k8s.io/component-helpers v0.30.0 // indirect + k8s.io/component-helpers v0.31.1 // indirect k8s.io/controller-manager v0.30.0 // indirect - k8s.io/dynamic-resource-allocation v0.30.0 // indirect - k8s.io/kms v0.30.0 // indirect + k8s.io/dynamic-resource-allocation v0.31.1 // indirect + k8s.io/kms v0.31.1 // indirect k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect - k8s.io/kubelet v0.30.0 // indirect + k8s.io/kubelet v0.31.1 // indirect k8s.io/mount-utils v0.30.0 // indirect k8s.io/pod-security-admission v0.30.0 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect diff --git a/go.sum b/go.sum index 8c83d07..f804834 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= -github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= @@ -172,10 +170,6 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= -github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= -github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk= -github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -232,46 +226,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/sttts/kubernetes v0.0.0-20240717102225-436d5eeedfea h1:2aPD+APoltuM/lYq9sdDBiakJiTpXrOFfr3XfjHDSyk= -github.com/sttts/kubernetes v0.0.0-20240717102225-436d5eeedfea/go.mod h1:VK9p9uMJq6jwBCmCjtQTVUcl3Q7lFAPxmf71qjQeLSA= -github.com/sttts/kubernetes/staging/src/k8s.io/api v0.0.0-20240717102225-436d5eeedfea h1:l6d/usDPFxtSnAw9S09m/o0cuwfTsXfzTnFmpqqX39o= -github.com/sttts/kubernetes/staging/src/k8s.io/api v0.0.0-20240717102225-436d5eeedfea/go.mod h1:KaRi43US9TCyITVXRX8uu9F8GDZSFJYuOtgC4rjoR7g= -github.com/sttts/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240717102225-436d5eeedfea h1:tA7gloJc9hvEUh/iwV7WDUAmwNCe5D9ol7OBdJ7DO5U= -github.com/sttts/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240717102225-436d5eeedfea/go.mod h1:osWXq4W0RDUySRl8q/XTNJ/cIIKLchYpvTVFYILFyzQ= -github.com/sttts/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240717102225-436d5eeedfea h1:D4TQPMYpUYmECh33XG9LgaWZSVjgRh8oGxJSBHQUCdk= -github.com/sttts/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240717102225-436d5eeedfea/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= -github.com/sttts/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240717102225-436d5eeedfea h1:fznfvZtxlAaIOmxopxC1g/Cg8kiZpVLqwcJ3jAYMCHA= -github.com/sttts/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240717102225-436d5eeedfea/go.mod h1:HJ1b6VgXrf+cWYPUzAO6sIKfdcHFZsASDzAp2Z99hQk= -github.com/sttts/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240717102225-436d5eeedfea h1:qCTK7Ftr2UVB0e3INB1tfcTRn1EcMHGWaR88C3SCcko= -github.com/sttts/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240717102225-436d5eeedfea/go.mod h1:rZaMESkS0V0z13gMBFpueoIisR0zjH7cZq5j9iZvi4I= -github.com/sttts/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240717102225-436d5eeedfea h1:/mnwjAWwzA8OYBW0P5n1sCjud76GmrX5C4DC/56HnoQ= -github.com/sttts/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240717102225-436d5eeedfea/go.mod h1:aq39X+7JBHuYgLje0hmtOFnNwDFGxC3kMnxy6TK0IfE= -github.com/sttts/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240717102225-436d5eeedfea h1:hofxERs7c+fUsrF73qzIjpba72VevGT/WrwMfg4k600= -github.com/sttts/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240717102225-436d5eeedfea/go.mod h1:sC54xeBDUh723Sh3/rBJpYmjuu2TFYRg8jbiGa+2gR4= -github.com/sttts/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240717102225-436d5eeedfea h1:i/isEwb5Ge75CEXwqL00EAPXnihjOFaKUVY51rVD53c= -github.com/sttts/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240717102225-436d5eeedfea/go.mod h1:30S1oB/QKla8lGwCK+QSrTb44Eg2auihJ9MMPlQcumw= -github.com/sttts/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240717102225-436d5eeedfea h1:77OT8sLt0FpdS1K12fckduRIcJoWlFJwlCRp9ei1eEA= -github.com/sttts/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240717102225-436d5eeedfea/go.mod h1:EXNqqwlzOUeFEPNyj8uP/a9eVNp/XBZQsaGMgIqKHPA= -github.com/sttts/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240717102225-436d5eeedfea h1:T7juKWWtWpoQtQNVbx78QMy3ng99iflf/QsntOOMDtk= -github.com/sttts/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240717102225-436d5eeedfea/go.mod h1:zXRPI4iMORj8r8MtMpObg4dfVgb8ENDSnWcw5r5obp0= -github.com/sttts/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240717102225-436d5eeedfea h1:40NP1StsPN9TH38d/0wyyHnk2XIpvEQ8X+pCJ9GpKHM= -github.com/sttts/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240717102225-436d5eeedfea/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= -github.com/sttts/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20240717102225-436d5eeedfea h1:zXC9nsesTBoTS0GgoW5HTOQY0CIOr2JZCJ6tfBzt/yQ= -github.com/sttts/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20240717102225-436d5eeedfea/go.mod h1:w9IwHtnTnKgfZqluyPtGWXvrHINPtDHmFD5/gUlo/5A= -github.com/sttts/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240717102225-436d5eeedfea h1:hN0c0tmBBZm6QQHal9/LdA5C7koTPZXRsPcBhcEeXYs= -github.com/sttts/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240717102225-436d5eeedfea/go.mod h1:Ygc1DPcdWYjsDbAxP+rIzSbU2D83HFsJ3Cp0bs3brio= -github.com/sttts/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240717102225-436d5eeedfea h1:0WtZHmn968FRhSjbxcaFX1igizmkAt8/3WL2li4tNpU= -github.com/sttts/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240717102225-436d5eeedfea/go.mod h1:YHc86QoOuFTnH0uwcYKmflYbh0OpXbzMoCvOzw0khxM= -github.com/sttts/kubernetes/staging/src/k8s.io/kms v0.0.0-20240717102225-436d5eeedfea h1:2vhHarSR3fL+uGjk6k7XiIHtb3M5SClxCahSp3ap2uE= -github.com/sttts/kubernetes/staging/src/k8s.io/kms v0.0.0-20240717102225-436d5eeedfea/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= -github.com/sttts/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240717102225-436d5eeedfea h1:8+O2/WOCCTqkde3xdMbEr2TGR5O49Muhs2BJAmwrCWY= -github.com/sttts/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240717102225-436d5eeedfea/go.mod h1:xc/cVRFh9PdcOsDAnHdB0fuQWih/w8hxbF8Ca4FXHSU= -github.com/sttts/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240717102225-436d5eeedfea h1:qCD6TpHKavEyYh+i/jUFNOlbxSskJd6aAGjwZUHaLI0= -github.com/sttts/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240717102225-436d5eeedfea/go.mod h1:PeBIZnl5Zg5qaT6JFfsDBaw0IlAL4F3mEVy9VovTW6k= -github.com/sttts/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240717102225-436d5eeedfea h1:sE5MAzvkgzU/yhYCv/Ce0JFRMxpF/eQxnd1/hBdgtEg= -github.com/sttts/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240717102225-436d5eeedfea/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= -github.com/sttts/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240717102225-436d5eeedfea h1:W7W0ZjzqcmGEBWiha1V3tTl+PCFfePLWG9geThz0OQI= -github.com/sttts/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240717102225-436d5eeedfea/go.mod h1:nOJes2FVv6qZXUU3CGubLnloPJVV4rZ+jm0bLRCKKOM= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= @@ -446,10 +400,50 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +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.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apiserver v0.31.1 h1:Sars5ejQDCRBY5f7R3QFHdqN3s61nhkpaX8/k1iEw1c= +k8s.io/apiserver v0.31.1/go.mod h1:lzDhpeToamVZJmmFlaLwdYZwd7zB+WYRYIboqA1kGxM= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +k8s.io/cloud-provider v0.30.0 h1:hz1MXkFjsyO167sRZVchXEi2YYMQ6kolBi79nuICjzw= +k8s.io/cloud-provider v0.30.0/go.mod h1:iyVcGvDfmZ7m5cliI9TTHj0VTjYDNpc/K71Gp6hukjU= +k8s.io/cluster-bootstrap v0.30.0 h1:vaIjA1eMFpcLYz+p6NMj75aqiauDahFx9EkuTxc0GMI= +k8s.io/cluster-bootstrap v0.30.0/go.mod h1:/ceTq+EC/aOrQk27mfmFW/iOeQDqzKg6vYWIBFNHSAE= +k8s.io/component-base v0.31.1 h1:UpOepcrX3rQ3ab5NB6g5iP0tvsgJWzxTyAo20sgYSy8= +k8s.io/component-base v0.31.1/go.mod h1:WGeaw7t/kTsqpVTaCoVEtillbqAhF2/JgvO0LDOMa0w= +k8s.io/component-helpers v0.31.1 h1:5hZUf3747atdgtR3gPntrG35rC2CkK7rYq2KUraz6Os= +k8s.io/component-helpers v0.31.1/go.mod h1:ye0Gi8KzFNTfpIuzvVDtxJQMP/0Owkukf1vGf22Hl6U= +k8s.io/controller-manager v0.30.0 h1:jqqT8cK0Awdy0IfT0yuqYIRmwskbdzH5AEZqkuhEVMs= +k8s.io/controller-manager v0.30.0/go.mod h1:suM1r/pxUuk2ij5Bbm7W9kBLrFujXuzIboNuWK5AfRA= +k8s.io/cri-api v0.31.1 h1:x0aI8yTI7Ho4c8tpuig8NwI/MRe+VhjiYyyebC2xphQ= +k8s.io/cri-api v0.31.1/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/csi-translation-lib v0.31.0 h1:5aCBPyFScdhfcWCUj0KDMAi/lDhxK99DF4XcfSnmH1A= +k8s.io/csi-translation-lib v0.31.0/go.mod h1:CM3U0vDm4jfuQpjKkqlJdRDqmAEcLQPm7aoJFjYf668= +k8s.io/dynamic-resource-allocation v0.31.1 h1:AiOVtBdeBmKMbwAVnHmL/v+m9gY2z734x0LKJb4WOMg= +k8s.io/dynamic-resource-allocation v0.31.1/go.mod h1:I1j9Vk9/rbzAckolbNZg8WasttD5yYnsZeDX2dpISKQ= 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.1 h1:cGLyV3cIwb0ovpP/jtyIe2mEuQ/MkbhmeBF2IYCA9Io= +k8s.io/kms v0.31.1/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94= +k8s.io/kube-aggregator v0.31.0 h1:3DqSpmqHF8rey7fY+qYXLJms0tYPhxrgWvjpnKVnS0Y= +k8s.io/kube-aggregator v0.31.0/go.mod h1:Fa+OVSpMQC7zbTTz7/QG7FXe9jZ8usuJQej5sMdCrkM= k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f h1:0LQagt0gDpKqvIkAMPaRGcXawNMouPECM1+F9BVxEaM= k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f/go.mod h1:S9tOR0FxgyusSNR+MboCuiDpVWkAifZvaYI1Q2ubgro= +k8s.io/kubelet v0.31.1 h1:aAxwVxGzbbMKKk/FnSjvkN52K3LdHhjhzmYcyGBuE0c= +k8s.io/kubelet v0.31.1/go.mod h1:8ZbexYHqUO946gXEfFmnMZiK2UKRGhk7LlGvJ71p2Ig= +k8s.io/kubernetes v1.31.0 h1:sYAB12TTWexXKp4RxqJMm/7EC+P0mNOgn4Xdj5eu7HM= +k8s.io/kubernetes v1.31.0/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8= +k8s.io/mount-utils v0.30.0 h1:EceYTNYVabfpdtIAHC4KgMzoZkm1B8ovZ1J666mYZQI= +k8s.io/mount-utils v0.30.0/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo= +k8s.io/pod-security-admission v0.30.0 h1:C8J/zbrA3hVR7jatN+mN/ymUWxwU6KceS5HsEEt6rTY= +k8s.io/pod-security-admission v0.30.0/go.mod h1:eyzZB+gtMwnNduqr9tVO2vjf2DdepZsUA11SzyfXhfM= 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= diff --git a/server/cmd/options/options.go b/server/cmd/options/options.go index 04ef2fe..7d46a7b 100644 --- a/server/cmd/options/options.go +++ b/server/cmd/options/options.go @@ -101,8 +101,9 @@ func NewOptions(rootDir string) *Options { WithRequestHeader(). WithServiceAccounts(). WithTokenFile(). - WithWebHook(). - WithTokenGetterFunction(factory) + WithWebHook() + + o.GenericControlPlane.Authentication.ServiceAccounts.OptionalTokenGetter = factory o.GenericControlPlane.Authentication.ServiceAccounts.Issuers = []string{"https://gcp.default.svc"} o.GenericControlPlane.Etcd.StorageConfig.Transport.ServerList = []string{"embedded"} diff --git a/server/readiness/ready.go b/server/readiness/ready.go index be74e76..d6507f4 100644 --- a/server/readiness/ready.go +++ b/server/readiness/ready.go @@ -45,10 +45,21 @@ func WaitForReady(ctx context.Context, kubeConfigPath string) error { if _, err := res.Raw(); err != nil { unreadyComponents := unreadyComponentsFromError(err) if !lastSeenUnready.Equal(unreadyComponents) { - logger.Info("control plane not ready", "unreadyComponents", sets.List[string](unreadyComponents)) + logger.Error(err, "control plane not ready", "unreadyComponents", sets.List[string](unreadyComponents), "error", err) lastSeenUnready = unreadyComponents } } + + // When there is an error for invalid certificate, we should exit immediately + // as there is no point in retrying. + if res.Error() != nil { + if strings.Contains(res.Error().Error(), "failed to verify certificate: x509") { + logger.Error(res.Error(), "control plane not ready") + logger.Info("This is likely due to certificates folder containing invalid certificates. Please fix them and restart the control plane.") + return res.Error() + } + } + var rc int res.StatusCode(&rc) if rc == http.StatusOK {