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.

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

(chore) advance libsveltos #254

Merged
merged 1 commit into from
Nov 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions controllers/accessrequest_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (

"github.com/projectsveltos/access-manager/pkg/scope"
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
"github.com/projectsveltos/libsveltos/lib/k8s_utils"
logs "github.com/projectsveltos/libsveltos/lib/logsettings"
libsveltosutils "github.com/projectsveltos/libsveltos/lib/utils"
)

const (
Expand Down Expand Up @@ -282,7 +282,7 @@ func (r *AccessRequestReconciler) generateKubeconfig(ctx context.Context, access

var kubeconfig []byte
host := fmt.Sprintf("%s:%d", ar.Spec.ControlPlaneEndpoint.Host, ar.Spec.ControlPlaneEndpoint.Port)
kubeconfig, err = libsveltosutils.GetKubeconfigWithUserToken(ctx, []byte(tokenRequest.Status.Token), crt, ar.Spec.Name, host)
kubeconfig, err = k8s_utils.GetKubeconfigWithUserToken(ctx, []byte(tokenRequest.Status.Token), crt, ar.Spec.Name, host)
if err != nil {
accessRequestScope.Logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get kubeconfig: %v", err))
return nil, err
Expand Down
8 changes: 4 additions & 4 deletions controllers/controllers_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ import (
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
"github.com/projectsveltos/libsveltos/lib/crd"
"github.com/projectsveltos/libsveltos/lib/deployer"
"github.com/projectsveltos/libsveltos/lib/k8s_utils"
libsveltosset "github.com/projectsveltos/libsveltos/lib/set"
"github.com/projectsveltos/libsveltos/lib/utils"
)

var (
Expand Down Expand Up @@ -101,17 +101,17 @@ var _ = BeforeSuite(func() {
}
}()

accessRequestCRD, err := utils.GetUnstructured(crd.GetAccessRequestCRDYAML())
accessRequestCRD, err := k8s_utils.GetUnstructured(crd.GetAccessRequestCRDYAML())
Expect(err).To(BeNil())
Expect(testEnv.Create(ctx, accessRequestCRD)).To(Succeed())
waitForObject(context.TODO(), testEnv.Client, accessRequestCRD)

roleRequestCRD, err := utils.GetUnstructured(crd.GetRoleRequestCRDYAML())
roleRequestCRD, err := k8s_utils.GetUnstructured(crd.GetRoleRequestCRDYAML())
Expect(err).To(BeNil())
Expect(testEnv.Create(ctx, roleRequestCRD)).To(Succeed())
waitForObject(context.TODO(), testEnv.Client, roleRequestCRD)

sveltosClusterCRD, err := utils.GetUnstructured(crd.GetSveltosClusterCRDYAML())
sveltosClusterCRD, err := k8s_utils.GetUnstructured(crd.GetSveltosClusterCRDYAML())
Expect(err).To(BeNil())
Expect(testEnv.Create(ctx, sveltosClusterCRD)).To(Succeed())
waitForObject(context.TODO(), testEnv.Client, sveltosClusterCRD)
Expand Down
17 changes: 8 additions & 9 deletions controllers/deployer_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ import (

libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
"github.com/projectsveltos/libsveltos/lib/deployer"
"github.com/projectsveltos/libsveltos/lib/k8s_utils"
logs "github.com/projectsveltos/libsveltos/lib/logsettings"
"github.com/projectsveltos/libsveltos/lib/roles"
libsveltosroles "github.com/projectsveltos/libsveltos/lib/roles"
"github.com/projectsveltos/libsveltos/lib/utils"
libsveltosutils "github.com/projectsveltos/libsveltos/lib/utils"
)

const (
Expand Down Expand Up @@ -77,12 +76,12 @@ func createServiceAccountInManagedCluster(ctx context.Context, remoteClient clie
serviceAccount.Namespace = serviceAccountNamespace
serviceAccount.Name = saName
serviceAccount.Labels = map[string]string{libsveltosv1beta1.RoleRequestLabel: "ok"}
deployer.AddOwnerReference(serviceAccount, roleRequest)
k8s_utils.AddOwnerReference(serviceAccount, roleRequest)
return remoteClient.Create(ctx, serviceAccount)
}
return err
}
deployer.AddOwnerReference(serviceAccount, roleRequest)
k8s_utils.AddOwnerReference(serviceAccount, roleRequest)
return remoteClient.Update(ctx, serviceAccount)
}

Expand Down Expand Up @@ -138,7 +137,7 @@ func createServiceAccountSecretForCluster(ctx context.Context, config *rest.Conf
}

var u *unstructured.Unstructured
u, err = libsveltosutils.GetUnstructured(kubeconfigContent)
u, err = k8s_utils.GetUnstructured(kubeconfigContent)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to unstructured for kind Config. Err: %v", err))
return err
Expand All @@ -160,7 +159,7 @@ func createServiceAccountSecretForCluster(ctx context.Context, config *rest.Conf
server := configObject.Clusters[0].Cluster.Server

var kubeconfig []byte
kubeconfig, err = libsveltosutils.GetKubeconfigWithUserToken(ctx, []byte(tokenStatus.Token),
kubeconfig, err = k8s_utils.GetKubeconfigWithUserToken(ctx, []byte(tokenStatus.Token),
caCrt, serviceAccountName, server)
if err != nil {
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to get kubeconfig: %v", err))
Expand Down Expand Up @@ -466,7 +465,7 @@ func deployRole(ctx context.Context, remoteConfig *rest.Config, remoteClient cli
// If policy already exists, just get current version and update it by overridding
// all metadata and spec.
// If policy does not exist already, create it
dr, err := utils.GetDynamicResourceInterface(remoteConfig, policy.GroupVersionKind(), policy.GetNamespace())
dr, err := k8s_utils.GetDynamicResourceInterface(remoteConfig, policy.GroupVersionKind(), policy.GetNamespace())
if err != nil {
return nil, err
}
Expand All @@ -477,7 +476,7 @@ func deployRole(ctx context.Context, remoteConfig *rest.Config, remoteClient cli
return nil, err
}

deployer.AddOwnerReference(policy, roleRequest)
k8s_utils.AddOwnerReference(policy, roleRequest)

err = updateResource(ctx, dr, policy, logger)
if err != nil {
Expand Down Expand Up @@ -618,7 +617,7 @@ func collectContent(data map[string]string, logger logr.Logger) ([]*unstructured
continue
}

policy, err := utils.GetUnstructured([]byte(elements[i]))
policy, err := k8s_utils.GetUnstructured([]byte(elements[i]))
if err != nil {
logger.Error(err, fmt.Sprintf("failed to get policy from Data %.100s", elements[i]))
return nil, err
Expand Down
8 changes: 4 additions & 4 deletions controllers/deployer_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2/textlogger"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/projectsveltos/access-manager/controllers"
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
"github.com/projectsveltos/libsveltos/lib/deployer"
"github.com/projectsveltos/libsveltos/lib/k8s_utils"
"github.com/projectsveltos/libsveltos/lib/roles"

"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
)

var _ = Describe("Deployer utils", func() {
Expand Down Expand Up @@ -71,7 +71,7 @@ var _ = Describe("Deployer utils", func() {
types.NamespacedName{Namespace: controllers.ServiceAccountNamespace, Name: managedClusterSAName},
currentServiceAccount)).To(Succeed())

Expect(deployer.IsOwnerReference(currentServiceAccount, roleRequest)).To(BeTrue())
Expect(k8s_utils.IsOwnerReference(currentServiceAccount, roleRequest)).To(BeTrue())

// returns no error when serviceAccount already exists
Expect(controllers.CreateServiceAccountInManagedCluster(context.TODO(), c, roleRequest)).To(Succeed())
Expand Down
9 changes: 5 additions & 4 deletions controllers/rolerequest_deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
"github.com/projectsveltos/libsveltos/lib/clusterproxy"
"github.com/projectsveltos/libsveltos/lib/deployer"
"github.com/projectsveltos/libsveltos/lib/k8s_utils"
logs "github.com/projectsveltos/libsveltos/lib/logsettings"
"github.com/projectsveltos/libsveltos/lib/roles"
)
Expand Down Expand Up @@ -497,11 +498,11 @@ func removeServiceAccount(ctx context.Context, remoteClient client.Client, roleR
}
}

if deployer.IsOnlyOwnerReference(serviceAccount, roleRequest) {
if k8s_utils.IsOnlyOwnerReference(serviceAccount, roleRequest) {
return remoteClient.Delete(ctx, serviceAccount)
}

deployer.RemoveOwnerReference(serviceAccount, roleRequest)
k8s_utils.RemoveOwnerReference(serviceAccount, roleRequest)
return remoteClient.Update(ctx, serviceAccount)
}

Expand Down Expand Up @@ -574,7 +575,7 @@ func cleanStaleClusterRoleResources(ctx context.Context, remoteClient client.Cli
var u unstructured.Unstructured
u.SetUnstructuredContent(content)

if deployer.IsOnlyOwnerReference(&u, roleRequest) {
if k8s_utils.IsOnlyOwnerReference(&u, roleRequest) {
// First remove ClusterRoleBinding, then ClusterRole cause we find ClusterRoleBinding
// only after detecting a ClusterRole needs to be deleted
err = deleteClusterRoleBinding(ctx, remoteClient, cr.Name)
Expand Down Expand Up @@ -628,7 +629,7 @@ func cleanStaleRoleResources(ctx context.Context, remoteClient client.Client, ro
var u unstructured.Unstructured
u.SetUnstructuredContent(content)

if deployer.IsOnlyOwnerReference(&u, roleRequest) {
if k8s_utils.IsOnlyOwnerReference(&u, roleRequest) {
// First remove RoleBinding, then Role cause we find RoleBinding
// only after detecting a Role needs to be deleted
err = deleteRoleBinding(ctx, remoteClient, r.Namespace, r.Name)
Expand Down
4 changes: 2 additions & 2 deletions controllers/rolerequest_deployer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
libsveltosv1beta1 "github.com/projectsveltos/libsveltos/api/v1beta1"
"github.com/projectsveltos/libsveltos/lib/deployer"
fakedeployer "github.com/projectsveltos/libsveltos/lib/deployer/fake"
"github.com/projectsveltos/libsveltos/lib/k8s_utils"
"github.com/projectsveltos/libsveltos/lib/roles"
"github.com/projectsveltos/libsveltos/lib/utils"
)

var _ = Describe("Deployer", func() {
Expand Down Expand Up @@ -355,7 +355,7 @@ var _ = Describe("Deployer", func() {
Expect(addTypeInformationToObject(scheme, roleRequest)).To(Succeed())

viewClusterRoleName := randomString()
clusterRole, err := utils.GetUnstructured([]byte(fmt.Sprintf(viewClusterRole, viewClusterRoleName)))
clusterRole, err := k8s_utils.GetUnstructured([]byte(fmt.Sprintf(viewClusterRole, viewClusterRoleName)))
Expect(err).To(BeNil())

// Add labels and OwnerReference to pretend ClusterRole was created by RoleRequest
Expand Down
22 changes: 11 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/gdexlab/go-render v1.0.1
github.com/go-logr/logr v1.4.2
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/gomega v1.35.1
github.com/onsi/ginkgo/v2 v2.22.0
github.com/onsi/gomega v1.36.0
github.com/pkg/errors v0.9.1
github.com/projectsveltos/libsveltos v0.42.0
github.com/projectsveltos/libsveltos v0.42.1-0.20241130144741-c66164798b6d
github.com/prometheus/client_golang v1.20.5
github.com/spf13/pflag v1.0.5
golang.org/x/text v0.20.0
k8s.io/api v0.31.2
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.2
k8s.io/client-go v0.31.2
k8s.io/component-base v0.31.2
k8s.io/api v0.31.3
k8s.io/apiextensions-apiserver v0.31.3
k8s.io/apimachinery v0.31.3
k8s.io/client-go v0.31.3
k8s.io/component-base v0.31.3
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
sigs.k8s.io/cluster-api v1.8.5
sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/controller-runtime v0.19.2
)

require (
Expand Down Expand Up @@ -93,10 +93,10 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.31.2 // indirect
k8s.io/apiserver v0.31.3 // indirect
k8s.io/cluster-bootstrap v0.31.0 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/kubectl v0.31.2 // indirect
k8s.io/kubectl v0.31.3 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
Expand Down
44 changes: 22 additions & 22 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,19 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
github.com/onsi/gomega v1.36.0 h1:Pb12RlruUtj4XUuPUqeEWc6j5DkVVVA49Uf6YLfC95Y=
github.com/onsi/gomega v1.36.0/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projectsveltos/libsveltos v0.42.0 h1:U+mFYi2K4IPY1rvpg4jAPBqG4PaznUK4huo/xnFk7jc=
github.com/projectsveltos/libsveltos v0.42.0/go.mod h1:DvifWRZuPtGKi4oGzQzcGe8XBKlzIlx2DcaoukAio+M=
github.com/projectsveltos/libsveltos v0.42.1-0.20241130144741-c66164798b6d h1:nkFzEBPxllcpQuovtXJtxgQM5HP/hpZJw2JX/XbXtk0=
github.com/projectsveltos/libsveltos v0.42.1-0.20241130144741-c66164798b6d/go.mod h1:4hqQRjwZ/DZ6u0haL3zhdARZ3lpspLv57rkhpXIzbsg=
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
Expand Down Expand Up @@ -256,34 +256,34 @@ 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.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0=
k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk=
k8s.io/apiextensions-apiserver v0.31.2 h1:W8EwUb8+WXBLu56ser5IudT2cOho0gAKeTOnywBLxd0=
k8s.io/apiextensions-apiserver v0.31.2/go.mod h1:i+Geh+nGCJEGiCGR3MlBDkS7koHIIKWVfWeRFiOsUcM=
k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw=
k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc=
k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs=
k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4=
k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4=
k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs=
k8s.io/cluster-bootstrap v0.31.0 h1:jj5t1PArBPddvDypdNpzqnZQ/+qnGxpJuTF7SX05h1Y=
k8s.io/cluster-bootstrap v0.31.0/go.mod h1:6ujqWFrBV4amKe1ii/6BXgrd57bF/Q3gXebLJdmfSK4=
k8s.io/component-base v0.31.2 h1:Z1J1LIaC0AV+nzcPRFqfK09af6bZ4D1nAOpWsy9owlA=
k8s.io/component-base v0.31.2/go.mod h1:9PeyyFN/drHjtJZMCTkSpQJS3U9OXORnHQqMLDz0sUQ=
k8s.io/component-base v0.31.3 h1:DMCXXVx546Rfvhj+3cOm2EUxhS+EyztH423j+8sOwhQ=
k8s.io/component-base v0.31.3/go.mod h1:xME6BHfUOafRgT0rGVBGl7TuSg8Z9/deT7qq6w7qjIU=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo=
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA=
k8s.io/kubectl v0.31.2 h1:gTxbvRkMBwvTSAlobiTVqsH6S8Aa1aGyBcu5xYLsn8M=
k8s.io/kubectl v0.31.2/go.mod h1:EyASYVU6PY+032RrTh5ahtSOMgoDRIux9V1JLKtG5xM=
k8s.io/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes=
k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs=
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 h1:jGnCPejIetjiy2gqaJ5V0NLwTpF4wbQ6cZIItJCSHno=
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078/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/cluster-api v1.8.5 h1:lNA2fPN4fkXEs+oOQlnwxT/4VwRFBpv5kkSoJG8nqBA=
sigs.k8s.io/cluster-api v1.8.5/go.mod h1:pXv5LqLxuIbhGIXykyNKiJh+KrLweSBajVHHitPLyoY=
sigs.k8s.io/controller-runtime v0.19.1 h1:Son+Q40+Be3QWb+niBXAg2vFiYWolDjjRfO8hn/cxOk=
sigs.k8s.io/controller-runtime v0.19.1/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8=
sigs.k8s.io/controller-runtime v0.19.2/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=
Expand Down
8 changes: 4 additions & 4 deletions hack/tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ go 1.22.7

require (
github.com/a8m/envsubst v1.4.2
github.com/onsi/ginkgo/v2 v2.21.0
github.com/onsi/ginkgo/v2 v2.22.0
golang.org/x/oauth2 v0.24.0
k8s.io/client-go v0.31.2
k8s.io/client-go v0.31.3
sigs.k8s.io/controller-tools v0.16.5
sigs.k8s.io/kind v0.25.0
)
Expand Down Expand Up @@ -50,9 +50,9 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.31.2 // indirect
k8s.io/api v0.31.3 // indirect
k8s.io/apiextensions-apiserver v0.31.2 // indirect
k8s.io/apimachinery v0.31.2 // indirect
k8s.io/apimachinery v0.31.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/utils v0.0.0-20240902221715-702e33fdd3c3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
Expand Down
Loading