From 541307c9520fd0464cded58d04a4fc540887922d Mon Sep 17 00:00:00 2001 From: Guilherme Cassolato Date: Wed, 21 Jun 2023 15:10:47 +0200 Subject: [PATCH] [rlp-v2] Sync RLPv2 base branch with main (#202) * Build images with replaces image (#193) * [makefile] Updating the `replaces` directive in CSV * [gh workflow] Adding `replacesVersion` as input for workflow_dispatch * [config] Adding default replaces operator value * [bundle] Updated bundle * Building the catalog with the replaces directive (#194) * [catalog] Building the catalog with the replaces directive * [catalog] Setting default replaces version to `0.0.0-alpha` * [bundle] Updating config and bundle with new default release version * upgrade operator-sdk v1.28.1 * fix verify-bundle task * Create a ServiceMeshMember, rather than mutating the ServiceMeshMemberRoll * Fixed access to servicemeshmember * [test] Unit-tests for common/k8s_utils.go (part 2 of 3) (#191) * test: Add unit-tests to StatusConditionsMarshalJSON (#167) * test: Add unit-tests to IsOwnedBy (#167) * refactor: Add comment to IsOwnedBy (#167) * test: Add unit-test to GetServicePortNumber (#167) * Update gateway-api module to v0.6.2 (#153) * Update gateway api dep to v0.6.2 Update controller runtime Set go version 1.19 Use github.com/onsi/ginkgo/v2 which is used by the latest version if controller-runtime (envtest). * Update GatewayClass, Gateway and HTTPRoute to v1beta1 Since v0.6.0 GatewayClass, Gateway and HTTPRoute have moved to the v1beta1 version of the API and support in v1alpha2 will be removed eventually. All references to these APIS are now updated to use v1beta1. PolicyTargetReference are still v1alpha2. * [test] Unit-tests for common/k8s_utils.go (part 3 of 3) & Unit-tests and improvements for common/yaml_decoder.go (#195) * test: Add test-case to TestObjectKeyListDifference (#167) - when inputA and inputB have no common elements then return inputA as the result * refactor: Rename tests for ObjectKeyListDifference (#167) * test: Add unit-tests to ContainsObjectKey (#167) * test: Add unit-tests to FindObjectKey (#167) * test: Add unit-tests to FindDeploymentStatusCondition (#167) * refactor: Clarify test name in TestStatusConditionsMarshalJSON (#167) * test: Add unit-tests to DecodeFile (#167) * refactor, improvements: DecodeFile YAML decoder (#167) - Refactor logger initialisation and document decoding to fail fast and return errors immediately - Enhanced empty doc check - Add comment to the function --------- Co-authored-by: dd di cesare <4183971+didierofrivia@users.noreply.github.com> Co-authored-by: Eguzki Astiz Lezaun Co-authored-by: Alex Snaps Co-authored-by: artem_tiupin <70763601+art-tapin@users.noreply.github.com> Co-authored-by: Michael Nairn --- controllers/ratelimitpolicy_controller_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/ratelimitpolicy_controller_test.go b/controllers/ratelimitpolicy_controller_test.go index 3028aae08..3933e154d 100644 --- a/controllers/ratelimitpolicy_controller_test.go +++ b/controllers/ratelimitpolicy_controller_test.go @@ -117,7 +117,7 @@ func testBuildBasicRoutePolicy(policyName, ns, routeName string) *kuadrantv1beta Name: gatewayapiv1beta1.ObjectName(routeName), }, Limits: map[string]kuadrantv1beta2.Limit{ - "l1": kuadrantv1beta2.Limit{ + "l1": { Rates: []kuadrantv1beta2.Rate{ { Limit: 1, Duration: 3, Unit: kuadrantv1beta2.TimeUnit("minute"), @@ -146,7 +146,7 @@ func testBuildGatewayPolicy(policyName, ns, gwName string) *kuadrantv1beta2.Rate Name: gatewayapiv1beta1.ObjectName(gwName), }, Limits: map[string]kuadrantv1beta2.Limit{ - "l1": kuadrantv1beta2.Limit{ + "l1": { Rates: []kuadrantv1beta2.Rate{ { Limit: 1, Duration: 3, Unit: kuadrantv1beta2.TimeUnit("minute"),