diff --git a/go.mod b/go.mod index 5e2d0c7c..37188bd6 100644 --- a/go.mod +++ b/go.mod @@ -83,3 +83,7 @@ require ( ) replace cloud.google.com/go => cloud.google.com/go v0.100.2 + +// mschuppert: map to latest commit from release-4.13 tag +// must consistent within modules and service operators +replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging diff --git a/go.sum b/go.sum index 41e46d61..a9e010b1 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc= github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= -github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs= -github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY= +github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI= +github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230628130307-16734cb02944 h1:bDKRzHlPbODo5d+uQu3/KOf3q98/0DzoAMrKu4S+70k= github.com/openstack-k8s-operators/infra-operator/apis v0.0.0-20230628130307-16734cb02944/go.mod h1:uuwrYRvdp5VwsWJpA47MnDT+UQjX1UWixagit7FzwV8= github.com/openstack-k8s-operators/keystone-operator/api v0.0.0-20230622141005-e9220a4b3dfe h1:NHbwjF+CqxdCKx1rY+/EjMqGr56lMoWsahzkYfTRtbk= diff --git a/renovate.json b/renovate.json index 41521064..fe9d7e0e 100644 --- a/renovate.json +++ b/renovate.json @@ -27,14 +27,16 @@ }, { "groupName": "k8s.io", - "matchPackagePrefixes": [ - "k8s.io", - "sigs.k8s.io" - ], - "schedule": [ - "every weekend" - ], - "allowedVersions": "< 1.0.0" + "matchPackagePatterns": ["^k8s.io"], + "excludePackagePatterns": ["^k8s.io/kube-openapi"], + "allowedVersions": "< 0.27.0", + "enabled": true + }, + { + "groupName": "sigs.k8s.io/controller-runtime", + "matchPackagePatterns": ["^sigs.k8s.io/controller-runtime"], + "allowedVersions": "< 0.15.0", + "enabled": true } ], "postUpgradeTasks": {