From 902404bfc3050535801d1714b7319c29b10b8a05 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 6 Feb 2024 11:51:57 -0500 Subject: [PATCH] build against mariadb-operator zzzeek@6bd257b83323 attempting to follow steps at: https://github.com/openstack-k8s-operators/glance-operator/pull/426#discussion_r1479624532 source PR: https://github.com/openstack-k8s-operators/mariadb-operator/pull/184/ --- go.mod | 2 ++ go.sum | 4 ++-- hack/pin-bundle-images.sh | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a4c50ea01..d9902deae 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/openstack-k8s-operators/openstack-operator go 1.19 +replace github.com/openstack-k8s-operators/mariadb-operator/api => github.com/zzzeek/mariadb-operator/api v0.3.2 + require ( github.com/cert-manager/cert-manager v1.11.5 github.com/ghodss/yaml v1.0.0 diff --git a/go.sum b/go.sum index bf220f505..d04fdd896 100644 --- a/go.sum +++ b/go.sum @@ -173,8 +173,6 @@ github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.202401291510 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240129151020-c9467a8fbbfc/go.mod h1:ni4mvKeubWsTjKmcToJ+hIo7pJipM9hwiUv8qhm1R6Y= github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240205075416-5a5000e56580 h1:Nem1hsYnQZPZrQKvSJ7ocZsOYaEy6IR76z20Lr0ALtY= github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240205075416-5a5000e56580/go.mod h1:TFWmtTRY1KLPoSOOriSEP7LgCrBwF8qM5ASAPxuvzyg= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240201121152-3dcb5d5b24f7 h1:pFtnmP9SS0FX1EQVlDmOf26G8G+ZlZkvowJLQUhvV6I= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240201121152-3dcb5d5b24f7/go.mod h1:D4sr4UipU4qjyrcO2mjW8YlSm48AdkY69dloASUbNYE= github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240205081907-ca38cd1c0fd7 h1:kHXBC17KCkoHwVGt6kJEY0FAWZuXwTM62xsxfKtRdsk= github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240205081907-ca38cd1c0fd7/go.mod h1:l7kSCQE1bpv1loSSt9gdtGSDWzjUhbEkAjoDinqJzZI= github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240206080218-0a39e8ee1c07 h1:+Gwe9+fFtohJpoAd6pRxMzEAcH0BJjsiw23zPYb5mNE= @@ -240,6 +238,8 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/zzzeek/mariadb-operator/api v0.3.2 h1:z6ej/h0/oPkdwUM8+BtsTHwIjYBzhJ4JBFjbMtvXNhs= +github.com/zzzeek/mariadb-operator/api v0.3.2/go.mod h1:D4sr4UipU4qjyrcO2mjW8YlSm48AdkY69dloASUbNYE= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= diff --git a/hack/pin-bundle-images.sh b/hack/pin-bundle-images.sh index c205fc97a..831994f45 100755 --- a/hack/pin-bundle-images.sh +++ b/hack/pin-bundle-images.sh @@ -25,6 +25,12 @@ for MOD_PATH in $(go list -mod=readonly -m -json all | jq -r '. | select(.Path | BASE=$(echo $MOD_PATH | sed -e 's|github.com/.*/\(.*\)-operator/.*|\1|') + if [[ "${BASE}" == "mariadb" ]]; then + echo -n ",quay.io/rhn_engineering_mbayer/mariadb-operator-bundle:6bd257b833235fa20fcff327c10d0bd1b579b9b4" + continue + fi + + GIT_REPO=${MOD_PATH%"/apis"} GIT_REPO=${GIT_REPO%"/api"}