Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[v0.9] Update Kubernetes libraries to v1.28.12 v0.29.7 #3107

Merged
merged 2 commits into from
Dec 2, 2024
+62 −62
Merged

[v0.9] Update Kubernetes libraries to v1.28.12 v0.29.7 #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bf7abc
Update Kubernetes dependencies to v0.28.12 and v0.29.7
thardeck Dec 2, 2024
a4efc7a
Fix typo recommendation (requeuing)
thardeck Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,33 +6,33 @@ replace (
github.com/rancher/fleet/pkg/apis => ./pkg/apis

helm.sh/helm/v3 => github.com/rancher/helm/v3 v3.12.3-fleet1
k8s.io/api => k8s.io/api v0.28.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.8
k8s.io/apimachinery => k8s.io/apimachinery v0.28.8 // indirect
k8s.io/apiserver => k8s.io/apiserver v0.28.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.8
k8s.io/client-go => k8s.io/client-go v0.28.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.8
k8s.io/code-generator => k8s.io/code-generator v0.28.8
k8s.io/component-base => k8s.io/component-base v0.28.8
k8s.io/component-helpers => k8s.io/component-helpers v0.28.8
k8s.io/controller-manager => k8s.io/controller-manager v0.28.8
k8s.io/cri-api => k8s.io/cri-api v0.28.8
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.8
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.8
k8s.io/endpointslice => k8s.io/endpointslice v0.28.8
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.8
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.8
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.8
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.8
k8s.io/kubectl => k8s.io/kubectl v0.28.8
k8s.io/kubelet => k8s.io/kubelet v0.28.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.8
k8s.io/metrics => k8s.io/metrics v0.28.8
k8s.io/mount-utils => k8s.io/mount-utils v0.28.8
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.8
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.8
k8s.io/api => k8s.io/api v0.28.12
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.12
k8s.io/apimachinery => k8s.io/apimachinery v0.28.12 // indirect
k8s.io/apiserver => k8s.io/apiserver v0.28.12
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.12
k8s.io/client-go => k8s.io/client-go v0.28.12
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.12
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.12
k8s.io/code-generator => k8s.io/code-generator v0.28.12
k8s.io/component-base => k8s.io/component-base v0.28.12
k8s.io/component-helpers => k8s.io/component-helpers v0.28.12
k8s.io/controller-manager => k8s.io/controller-manager v0.28.12
k8s.io/cri-api => k8s.io/cri-api v0.28.12
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.12
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.12
k8s.io/endpointslice => k8s.io/endpointslice v0.28.12
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.12
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.12
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.12
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.12
k8s.io/kubectl => k8s.io/kubectl v0.28.12
k8s.io/kubelet => k8s.io/kubelet v0.28.12
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.12
k8s.io/metrics => k8s.io/metrics v0.28.12
k8s.io/mount-utils => k8s.io/mount-utils v0.28.12
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.12
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.12
)

require (
Expand Down Expand Up @@ -65,14 +65,14 @@ require (
golang.org/x/sync v0.7.0
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.12.3
k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/cli-runtime v0.28.8
k8s.io/api v0.29.7
k8s.io/apiextensions-apiserver v0.29.7
k8s.io/apimachinery v0.29.7
k8s.io/cli-runtime v0.28.12
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.110.1
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
k8s.io/kubernetes v1.28.8
k8s.io/kubernetes v1.28.12
sigs.k8s.io/cli-utils v0.34.0
sigs.k8s.io/controller-runtime v0.13.0
sigs.k8s.io/controller-tools v0.14.0
Expand Down Expand Up @@ -235,9 +235,9 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.28.8 // indirect
k8s.io/code-generator v0.28.8 // indirect
k8s.io/component-base v0.28.8 // indirect
k8s.io/apiserver v0.28.12 // indirect
k8s.io/code-generator v0.28.12 // indirect
k8s.io/component-base v0.28.12 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kubectl v0.27.3 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
Expand Down
40 changes: 20 additions & 20 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,33 +1582,33 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.28.8 h1:G0/G7yX1puRAcon/+XPLsKXZ9A5L7Ds6oKbDIe027xw=
k8s.io/api v0.28.8/go.mod h1:rU8f1t9CNUAXlk/1j/wMJ7XnaxkR1g1AlZGQAOOL+sw=
k8s.io/apiextensions-apiserver v0.28.8 h1:JucS9tcaMMlfFrJ09cgh1Maeb8X2wlnxcfNpplyGHXs=
k8s.io/apiextensions-apiserver v0.28.8/go.mod h1:IKpLiKmvEYq/ti8sNtB1sM3A3vVV7fILIsvdmZswhoQ=
k8s.io/apimachinery v0.28.8 h1:hi/nrxHwk4QLV+W/SHve1bypTE59HCDorLY1stBIxKQ=
k8s.io/apimachinery v0.28.8/go.mod h1:cBnwIM3fXoRo28SqbV/Ihxf/iviw85KyXOrzxvZQ83U=
k8s.io/apiserver v0.28.8 h1:lvgyawcJFRW12oqXLydxY83nAJ5pvJJM9JX35JnKEvg=
k8s.io/apiserver v0.28.8/go.mod h1:ruOdEqhd7TzAwXMlIXdig3tQJrsv9g1F+kIF8OJRGHM=
k8s.io/cli-runtime v0.28.8 h1:d/3YA6lN8Dk9HtWxWdJRTQmSi2ZlhG4zJLmL+ER5Agg=
k8s.io/cli-runtime v0.28.8/go.mod h1:gZXhlusMmCEol4/Tp6Fxux+OPJpC/O7MyiFCDsnYq/4=
k8s.io/client-go v0.28.8 h1:TE59Tjd87WKvS2FPBTfIKLFX0nQJ4SSHsnDo5IHjgOw=
k8s.io/client-go v0.28.8/go.mod h1:uDVQ/rPzWpWIy40c6lZ4mUwaEvRWGnpoqSO4FM65P3o=
k8s.io/code-generator v0.28.8 h1:hpm1UTuu+aKdmzrRaSoR/3jkbTxyWO+Cehrc1fusjAA=
k8s.io/code-generator v0.28.8/go.mod h1:3UVI3rmoCGzESkcYbqyhXBES9wQLycOK4VtiwgsPGG4=
k8s.io/component-base v0.28.8 h1:N/c5L6Ty5rcrFyhsMYsqRFUOVGrqGQsLfjB0yj6npqM=
k8s.io/component-base v0.28.8/go.mod h1:9PjQ4nM1Hth6WGe/O+wgLF32eSwf4oPOoN5elmFznJM=
k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ=
k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ=
k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc=
k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE=
k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0=
k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
k8s.io/apiserver v0.28.12 h1:fvZItMw20ySP/QAU5//Ov1pJFyvrr8abeUsh3ZyF8FI=
k8s.io/apiserver v0.28.12/go.mod h1:46S3UWu620UhP5skPJ+WQWC3iWCrl1AiYJPyHxVueE4=
k8s.io/cli-runtime v0.28.12 h1:Skn6b49B+khoscC85o+aVIT9u8uDW2/3KNP4ZLCg7jA=
k8s.io/cli-runtime v0.28.12/go.mod h1:BUnm03LagRdLl+YeOa9BEspaqNq0oy5aWlku8yLY5/s=
k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec=
k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE=
k8s.io/code-generator v0.28.12 h1:DgFfCtvjfbSHSga//Gq695/YllrxrQl/vJiF1UnJvhU=
k8s.io/code-generator v0.28.12/go.mod h1:WiJgVNDFAlT90nq6IOxhZ1gxL2JexbcfAx9ZBsyQ3Do=
k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc=
k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
k8s.io/kubectl v0.28.8 h1:bukHhQp4f7QYBFjS3iZTHKecrRpfZsR5lCCKFpbiUQw=
k8s.io/kubectl v0.28.8/go.mod h1:X3u3VYbeWR1JirXkvtvq6b0kJ002M2ZQSk42M0ayKT8=
k8s.io/kubernetes v1.28.8 h1:SeZt2CFxbstbAiP6XgRvWG+Dv0sJaafel1Ih4gtbKL0=
k8s.io/kubernetes v1.28.8/go.mod h1:wCrpSADfrhs/gz2vBbN0O2DG2FLS5VyFK7lzwxJg26o=
k8s.io/kubectl v0.28.12 h1:CyGVOUO83jYxwLI5XtBFNoerAQj47fnEDrCPKWxlAi8=
k8s.io/kubectl v0.28.12/go.mod h1:KzG7ROxXnUqfS6S+xJIIbd6WMpFYNByyxqNkIhxS6Qs=
k8s.io/kubernetes v1.28.12 h1:DtWB8ZjoYiN/PXD4qDXFppf9IouVUavn6r3S+3NMUkU=
k8s.io/kubernetes v1.28.12/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/controller/controllers/cluster/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ func (i *importHandler) importCluster(cluster *fleet.Cluster, status fleet.Clust
TTL: &metav1.Duration{Duration: durations.ClusterImportTokenTTL},
},
})
logrus.Debugf("Failed to create ClusterRegistrationToken for cluster %s/%s: %v (requeueing)", cluster.Namespace, cluster.Name, err)
logrus.Debugf("Failed to create ClusterRegistrationToken for cluster %s/%s: %v (requeuing)", cluster.Namespace, cluster.Name, err)
i.clusters.EnqueueAfter(cluster.Namespace, cluster.Name, durations.TokenClusterEnqueueDelay)
return status, nil
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.19

require (
github.com/rancher/wrangler/v2 v2.1.3
k8s.io/api v0.28.8
k8s.io/apimachinery v0.28.8
k8s.io/api v0.28.12
k8s.io/apimachinery v0.28.12
)

require (
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
k8s.io/api v0.28.8 h1:G0/G7yX1puRAcon/+XPLsKXZ9A5L7Ds6oKbDIe027xw=
k8s.io/api v0.28.8/go.mod h1:rU8f1t9CNUAXlk/1j/wMJ7XnaxkR1g1AlZGQAOOL+sw=
k8s.io/apimachinery v0.28.8 h1:hi/nrxHwk4QLV+W/SHve1bypTE59HCDorLY1stBIxKQ=
k8s.io/apimachinery v0.28.8/go.mod h1:cBnwIM3fXoRo28SqbV/Ihxf/iviw85KyXOrzxvZQ83U=
k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ=
k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ=
k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0=
k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
Expand Down
Loading