From 4f3697295bb5b614532c4c95ed086b7292cebe6f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 24 Jul 2023 00:07:39 +0900 Subject: [PATCH] Bump lib-common/modules/test to 0.1.1 This is required to adapt the recent change in type of Replicas spec in infra-operator. --- go.mod | 4 ++-- go.sum | 4 ++-- tests/functional/horizon_controller_test.go | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d3ef8a06..f9572316 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,11 @@ require ( github.com/openstack-k8s-operators/infra-operator/apis v0.1.0 github.com/openstack-k8s-operators/keystone-operator/api v0.1.0 github.com/openstack-k8s-operators/lib-common/modules/common v0.1.0 - github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230714104628-12cc1e43cccd + github.com/openstack-k8s-operators/lib-common/modules/test v0.1.1 k8s.io/api v0.26.7 k8s.io/apimachinery v0.26.7 k8s.io/client-go v0.26.7 + k8s.io/utils v0.0.0-20230711102312-30195339c3c7 sigs.k8s.io/controller-runtime v0.14.6 ) @@ -83,7 +84,6 @@ require ( k8s.io/component-base v0.26.7 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/kube-openapi v0.0.0-20230515203736-54b630e78af5 // indirect - k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/go.sum b/go.sum index db06dcdf..60b950e9 100644 --- a/go.sum +++ b/go.sum @@ -241,8 +241,8 @@ github.com/openstack-k8s-operators/lib-common/modules/common v0.1.0 h1:F1iYRBwa0 github.com/openstack-k8s-operators/lib-common/modules/common v0.1.0/go.mod h1:3hAC5Ce0AOSt85BqD6DgTKNkJHmpXwqbwL8mVWRJQqo= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.0 h1:mMeJvCQfZmakssvMyHjzp/ngxKysETDj9GJYhRwydzg= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.1.0/go.mod h1:+paEFOL5IlJzhg9fy7/1+HSErVkWUgUj1ORLFwgvxnI= -github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230714104628-12cc1e43cccd h1:7k0cGN5xiLsDrHF3vjPGfTlxSH+HdG8rysT8qOxmFGU= -github.com/openstack-k8s-operators/lib-common/modules/test v0.0.0-20230714104628-12cc1e43cccd/go.mod h1:qOUQZZ7eMirFWPS4uxoTWL5+CC+3vwX5kSyHsk9pLtg= +github.com/openstack-k8s-operators/lib-common/modules/test v0.1.1 h1:upLnnux++Cuzxuta7z4VhD3aVwslXYYuptKk5R1EJPU= +github.com/openstack-k8s-operators/lib-common/modules/test v0.1.1/go.mod h1:lIJaEPmGwyY4k9ti39OXzZCtv+SybPHSRMg+PfXvPTQ= github.com/openstack-k8s-operators/mariadb-operator/api v0.1.0 h1:oM0ZzFHHj+ioCc7NXHIO6+sy7I2yiN29DI9/jh4fe54= github.com/openstack-k8s-operators/mariadb-operator/api v0.1.0/go.mod h1:m5XuZSa5Zt5uAw3WbJYOIkFAGXy01mybVekcKOq1qHI= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/tests/functional/horizon_controller_test.go b/tests/functional/horizon_controller_test.go index 70338e60..e86d72d6 100644 --- a/tests/functional/horizon_controller_test.go +++ b/tests/functional/horizon_controller_test.go @@ -7,6 +7,7 @@ import ( . "github.com/onsi/gomega" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" + "k8s.io/utils/pointer" condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition" . "github.com/openstack-k8s-operators/lib-common/modules/common/test/helpers" @@ -30,7 +31,7 @@ var _ = Describe("Horizon controller", func() { Namespace: horizonName.Namespace, } memcachedSpec = memcachedv1.MemcachedSpec{ - Replicas: int32(3), + Replicas: pointer.Int32(3), } // lib-common uses OPERATOR_TEMPLATES env var to locate the "templates"