From 2115480f2be545d91515bf6763b4d1972bb128c3 Mon Sep 17 00:00:00 2001 From: Anatolii Guzovatii Date: Tue, 28 Mar 2023 13:18:44 +0300 Subject: [PATCH] [INTERNAL] Use local replacement for sub-modules As part of https://github.com/banzaicloud/koperator/pull/929, the local replacement for sub-modules was removed in favor of using valid tags. Adobe Koperator fork has some internal changes in the api sub-module, so we need to use the local version of the sub-module instead of the upstream version, so we are forced to revert the changes from #929. --- go.mod | 6 ++++-- go.sum | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 5389aba66..e30dab480 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.23.2 - github.com/banzaicloud/koperator/properties v0.4.1 + github.com/banzaicloud/koperator/api v0.0.0 + github.com/banzaicloud/koperator/properties v0.0.0 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 @@ -140,6 +140,8 @@ 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 ) diff --git a/go.sum b/go.sum index efab9f90e..0d6de2a9f 100644 --- a/go.sum +++ b/go.sum @@ -100,10 +100,6 @@ 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.2 h1:4K0FbGaefM3673GptjYO0XuthECu0S7zn389IAF5VLU= -github.com/banzaicloud/koperator/api v0.23.2/go.mod h1:qvpewvjdELAnfO70vg9397CXZ4K4uHxpiWtf5fhKSrQ= -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=