From 5906123afa1c3eb351b2fb3b1289cb4605cea510 Mon Sep 17 00:00:00 2001 From: Joyce Ma Date: Thu, 4 Jan 2024 22:17:12 +0000 Subject: [PATCH] Fix conflicts in go.mod and go.sum --- go.mod | 9 --------- go.sum | 5 ----- 2 files changed, 14 deletions(-) diff --git a/go.mod b/go.mod index d50c3e3505..1663743313 100644 --- a/go.mod +++ b/go.mod @@ -45,21 +45,12 @@ require ( google.golang.org/api v0.139.0 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 -<<<<<<< HEAD - k8s.io/api v0.25.0 - k8s.io/apiextensions-apiserver v0.25.0 - k8s.io/apimachinery v0.25.16 - k8s.io/client-go v0.25.0 - k8s.io/code-generator v0.25.0 - k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 -======= k8s.io/api v0.27.2 k8s.io/apiextensions-apiserver v0.27.2 k8s.io/apimachinery v0.27.2 k8s.io/client-go v0.27.2 k8s.io/code-generator v0.27.2 k8s.io/gengo v0.0.0-20220902162205-c0856e24416d ->>>>>>> a0bd7ff78 (upgrade kdp part 1) k8s.io/klog/v2 v2.100.1 sigs.k8s.io/controller-runtime v0.15.2 sigs.k8s.io/controller-tools v0.6.2 diff --git a/go.sum b/go.sum index 67be341d8c..f57c3b2b54 100644 --- a/go.sum +++ b/go.sum @@ -1509,14 +1509,9 @@ k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotg k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/apimachinery v0.21.3/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI= -<<<<<<< HEAD -k8s.io/apimachinery v0.25.16 h1:Mk5h4zbHVZh4ZkgRnciYdLRqOREt2dAGTJesDY0WO7U= -k8s.io/apimachinery v0.25.16/go.mod h1:34oJjP2pnWhz64k0GETsMvDeAp2A2v+gKa/u3tV/+6k= -======= k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= ->>>>>>> a0bd7ff78 (upgrade kdp part 1) k8s.io/apiserver v0.21.3/go.mod h1:eDPWlZG6/cCCMj/JBcEpDoK+I+6i3r9GsChYBHSbAzU= k8s.io/cli-runtime v0.26.3 h1:3ULe0oI28xmgeLMVXIstB+ZL5CTGvWSMVMLeHxitIuc= k8s.io/cli-runtime v0.26.3/go.mod h1:5YEhXLV4kLt/OSy9yQwtSSNZU2Z7aTEYta1A+Jg4VC4=