From f9b74bc366c869aa7d63e315426abac30dcbf5ae Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 6 Feb 2024 11:51:57 -0500 Subject: [PATCH] build for mariadb from PR 184 This provides a link to install the mariadb image built against the version in https://github.com/openstack-k8s-operators/mariadb-operator/pull/184. This adds rotatable username/password flow to the mariadb operator with associated client functions to be called in each downstream operator. follows steps at: https://github.com/openstack-k8s-operators/glance-operator/pull/426#discussion_r1479624532 --- apis/go.mod | 3 +++ apis/go.sum | 4 ++-- go.mod | 3 +++ go.sum | 4 ++-- hack/pin-bundle-images.sh | 5 +++++ 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apis/go.mod b/apis/go.mod index 8cf978b5c..981e21585 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -104,3 +104,6 @@ require ( // 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 + +// mbayer: building against specific mdb +replace github.com/openstack-k8s-operators/mariadb-operator/api => github.com/zzzeek/mariadb-operator/api v0.3.1-0.20240215161542-20fe01710039 //allow-merging diff --git a/apis/go.sum b/apis/go.sum index 865fc046d..ff830f292 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -99,8 +99,6 @@ github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.202402141 github.com/openstack-k8s-operators/lib-common/modules/storage v0.3.1-0.20240214144842-5dcac51e5b36/go.mod h1:sK82mkh2UzITsbNa/y6AKTZftHQnsYigqRx+rFbfZM4= github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240215104417-c6d1b337f267 h1:yMh0K2GObJyNbcFZ53oEicWX0vRUdxMFg3//dDjF1uo= github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240215104417-c6d1b337f267/go.mod h1:XV/teO705XYaiIBjgepLCv6fT8cb9jRvToti3pmjhY8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240215091212-cbf2ad281f43 h1:azblrnuVV8sLWihuqS7lJMrwpo1dtB1K5vvkug0agw4= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240215091212-cbf2ad281f43/go.mod h1:52Ja/B4RrrytMmKh+Kf+/BPe7Fq40Pi77vcFH4yJeoU= github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240215104837-f2f7715f20b4 h1:Hu1ERg87Ipsr9mLTAtV55J0UUXdbH0sttBpafu95aZY= github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240215104837-f2f7715f20b4/go.mod h1:Z4yjtZsjc1ElvM2rKoEK6Ylukq3dZ+uSgKcvYn98p4c= github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240215094959-ae7ad704ab84 h1:u6WM202VhJbenwsKSgYe6VIaK91nb9bQ2l/nwP/roIc= @@ -144,6 +142,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU 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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zzzeek/mariadb-operator/api v0.3.1-0.20240215161542-20fe01710039 h1:RLkDT9hqh32CYLjKyuYVhVU7zcaan6q7bX8FdIiEWYc= +github.com/zzzeek/mariadb-operator/api v0.3.1-0.20240215161542-20fe01710039/go.mod h1:52Ja/B4RrrytMmKh+Kf+/BPe7Fq40Pi77vcFH4yJeoU= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/go.mod b/go.mod index 44e9c7c35..11dfd8c9f 100644 --- a/go.mod +++ b/go.mod @@ -121,3 +121,6 @@ replace github.com/openstack-k8s-operators/openstack-operator/apis => ./apis // 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 + +// mbayer: building against specific mdb +replace github.com/openstack-k8s-operators/mariadb-operator/api => github.com/zzzeek/mariadb-operator/api v0.3.1-0.20240215161542-20fe01710039 //allow-merging diff --git a/go.sum b/go.sum index a10146743..42bcb3c20 100644 --- a/go.sum +++ b/go.sum @@ -117,8 +117,6 @@ github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.202402141448 github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240214144842-5dcac51e5b36/go.mod h1:82nzS+DbBe1tzaMvNHH8FctmZzQ14ZAJysFGsMJiivo= github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240215104417-c6d1b337f267 h1:yMh0K2GObJyNbcFZ53oEicWX0vRUdxMFg3//dDjF1uo= github.com/openstack-k8s-operators/manila-operator/api v0.3.1-0.20240215104417-c6d1b337f267/go.mod h1:XV/teO705XYaiIBjgepLCv6fT8cb9jRvToti3pmjhY8= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240215091212-cbf2ad281f43 h1:azblrnuVV8sLWihuqS7lJMrwpo1dtB1K5vvkug0agw4= -github.com/openstack-k8s-operators/mariadb-operator/api v0.3.1-0.20240215091212-cbf2ad281f43/go.mod h1:52Ja/B4RrrytMmKh+Kf+/BPe7Fq40Pi77vcFH4yJeoU= github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240215104837-f2f7715f20b4 h1:Hu1ERg87Ipsr9mLTAtV55J0UUXdbH0sttBpafu95aZY= github.com/openstack-k8s-operators/neutron-operator/api v0.3.1-0.20240215104837-f2f7715f20b4/go.mod h1:Z4yjtZsjc1ElvM2rKoEK6Ylukq3dZ+uSgKcvYn98p4c= github.com/openstack-k8s-operators/nova-operator/api v0.3.1-0.20240215094959-ae7ad704ab84 h1:u6WM202VhJbenwsKSgYe6VIaK91nb9bQ2l/nwP/roIc= @@ -170,6 +168,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU 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.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zzzeek/mariadb-operator/api v0.3.1-0.20240215161542-20fe01710039 h1:RLkDT9hqh32CYLjKyuYVhVU7zcaan6q7bX8FdIiEWYc= +github.com/zzzeek/mariadb-operator/api v0.3.1-0.20240215161542-20fe01710039/go.mod h1:52Ja/B4RrrytMmKh+Kf+/BPe7Fq40Pi77vcFH4yJeoU= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/hack/pin-bundle-images.sh b/hack/pin-bundle-images.sh index c205fc97a..bf585d2f1 100755 --- a/hack/pin-bundle-images.sh +++ b/hack/pin-bundle-images.sh @@ -25,6 +25,11 @@ 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:20fe01710039baee1445e2d17912e59bb0981ba9" + continue + fi + GIT_REPO=${MOD_PATH%"/apis"} GIT_REPO=${GIT_REPO%"/api"}