From fcabb01ec0ac8e1a90ff8e63a4fcfc4c3452335b Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 10 Feb 2023 00:58:04 +0100 Subject: [PATCH 1/2] chore(go-mod): fixed Koperator submodule tags Previously invalid tags were specified for Koperator sub-Go-modules (api, properties), tagged these and referenced the latest tags. --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 5cc48d865..691020198 100644 --- a/go.mod +++ b/go.mod @@ -10,8 +10,8 @@ require ( github.com/banzaicloud/istio-client-go v0.0.17 github.com/banzaicloud/istio-operator/api/v2 v2.15.1 github.com/banzaicloud/k8s-objectmatcher v1.8.0 - github.com/banzaicloud/koperator/api v0.0.0 - github.com/banzaicloud/koperator/properties v0.0.0 + github.com/banzaicloud/koperator/api v0.23.0 + github.com/banzaicloud/koperator/properties v0.4.1 github.com/cert-manager/cert-manager v1.9.1 github.com/cisco-open/cluster-registry-controller/api v0.2.5 github.com/envoyproxy/go-control-plane v0.10.3 diff --git a/go.sum b/go.sum index 5b5edb713..f46282da0 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,10 @@ github.com/banzaicloud/istio-operator/api/v2 v2.15.1 h1:BZg8COvoOJtfx/dgN7KpoOnc github.com/banzaicloud/istio-operator/api/v2 v2.15.1/go.mod h1:5qCpwWlIfxiLvBfTvT2mD2wp5RlFCDEt8Xql4sYPNBc= github.com/banzaicloud/k8s-objectmatcher v1.8.0 h1:Nugn25elKtPMTA2br+JgHNeSQ04sc05MDPmpJnd1N2A= github.com/banzaicloud/k8s-objectmatcher v1.8.0/go.mod h1:p2LSNAjlECf07fbhDyebTkPUIYnU05G+WfGgkTmgeMg= +github.com/banzaicloud/koperator/api v0.23.0 h1:WQYmDvboA6VNRSFoGJTi/fjL+hEjdM/sBtP32ymKrfg= +github.com/banzaicloud/koperator/api v0.23.0/go.mod h1:VnxVrXvw0QdlvJzke5ZFr+x+RD4K6zhjHXUdBO+iD/Q= +github.com/banzaicloud/koperator/properties v0.4.1 h1:SB2QgXlcK1Dc7Z1rg65PJifErDa8OQnoWCCJgmC7SGc= +github.com/banzaicloud/koperator/properties v0.4.1/go.mod h1:TcL+llxuhW3UeQtVEDYEXGouFLF2P+LuZZVudSb6jyA= github.com/banzaicloud/operator-tools v0.28.0 h1:GSfc0qZr6zo7WrNxdgWZE1LcTChPU8QFYOTDirYVtIM= github.com/banzaicloud/operator-tools v0.28.0/go.mod h1:t0dyFGJUR9Q5CwsUcq1nDJC0wSZqeh6nzUZkUp3vCXg= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= From a12a8e24901f02dbd92718b950509b05d0c3f514 Mon Sep 17 00:00:00 2001 From: Patrik Egyed Date: Fri, 10 Feb 2023 00:59:01 +0100 Subject: [PATCH 2/2] chore(go-mod): removed local replacements Previously the local sub-Go-modules (api, properties) were depended upon by the root Go module using a local replacement. Removed this because it is not transitive to downstream usage - where Koperator is also a dependency - and is anyway only neede for development purposes which can be kept on local machine instead of having it committed to the repo. --- go.mod | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.mod b/go.mod index 691020198..4c3b10cbc 100644 --- a/go.mod +++ b/go.mod @@ -134,8 +134,6 @@ require ( ) replace ( - github.com/banzaicloud/koperator/api => ./api - github.com/banzaicloud/koperator/properties => ./properties github.com/gogo/protobuf => github.com/waynz0r/protobuf v1.3.3-0.20210811122234-64636cae0910 github.com/golang/protobuf => github.com/luciferinlove/protobuf v0.0.0-20220913214010-c63936d75066 )