From 5cdaf127dee831961e86c2784338f8a5d6f3ffe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Panti=C4=87?= Date: Fri, 12 Jul 2024 10:01:46 +0200 Subject: [PATCH] chore: change import alias to match the actual import (#345) --- pkg/kcp/redisinstance/loadIpRange.go | 8 ++++---- pkg/kcp/redisinstance/reconciler.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kcp/redisinstance/loadIpRange.go b/pkg/kcp/redisinstance/loadIpRange.go index b1678f0ae..90069ea18 100644 --- a/pkg/kcp/redisinstance/loadIpRange.go +++ b/pkg/kcp/redisinstance/loadIpRange.go @@ -6,7 +6,7 @@ import ( types2 "github.com/kyma-project/cloud-manager/pkg/kcp/redisinstance/types" - cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/composed" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -22,7 +22,7 @@ func loadIpRange(ctx context.Context, st composed.State) (error, context.Context redisInstance := state.ObjAsRedisInstance() ipRangeName := redisInstance.Spec.IpRange.Name - ipRange := &cloudresourcesv1beta1.IpRange{} + ipRange := &cloudcontrolv1beta1.IpRange{} err := state.Cluster().K8sClient().Get(ctx, types.NamespacedName{ Namespace: state.Obj().GetNamespace(), Name: ipRangeName, @@ -37,9 +37,9 @@ func loadIpRange(ctx context.Context, st composed.State) (error, context.Context WithValues("ipRange", ipRangeName). Error(err, "Referred IpRange does not exist") meta.SetStatusCondition(redisInstance.Conditions(), metav1.Condition{ - Type: cloudresourcesv1beta1.ConditionTypeError, + Type: cloudcontrolv1beta1.ConditionTypeError, Status: "True", - Reason: cloudresourcesv1beta1.ReasonInvalidIpRangeReference, + Reason: cloudcontrolv1beta1.ReasonInvalidIpRangeReference, Message: fmt.Sprintf("Referred IpRange %s/%s does not exist", state.Obj().GetNamespace(), ipRangeName), }) redisInstance.SetStatusStateToError() diff --git a/pkg/kcp/redisinstance/reconciler.go b/pkg/kcp/redisinstance/reconciler.go index 947a16ba5..496bc17c4 100644 --- a/pkg/kcp/redisinstance/reconciler.go +++ b/pkg/kcp/redisinstance/reconciler.go @@ -6,7 +6,7 @@ import ( "github.com/kyma-project/cloud-manager/pkg/kcp/provider/gcp/redisinstance" "sigs.k8s.io/controller-runtime/pkg/reconcile" - cloudresourcesv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" + cloudcontrolv1beta1 "github.com/kyma-project/cloud-manager/api/cloud-control/v1beta1" "github.com/kyma-project/cloud-manager/pkg/common/actions/focal" "github.com/kyma-project/cloud-manager/pkg/composed" "k8s.io/apimachinery/pkg/types" @@ -65,6 +65,6 @@ func (r *redisInstanceReconciler) newAction() composed.Action { func (r *redisInstanceReconciler) newFocalState(name types.NamespacedName) focal.State { return r.focalStateFactory.NewState( - r.composedStateFactory.NewState(name, &cloudresourcesv1beta1.RedisInstance{}), + r.composedStateFactory.NewState(name, &cloudcontrolv1beta1.RedisInstance{}), ) }