Skip to content

Commit 06c8d13

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #56 from mjudeikis/mcr.release
Update kcp and mcr dependencies
2 parents 9618ad5 + 36e74ff commit 06c8d13

File tree

18 files changed

+99
-377
lines changed

18 files changed

+99
-377
lines changed

‎apiexport/internal/provider/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import (
3939
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
4040

4141
kcpcache "github.com/kcp-dev/apimachinery/v2/pkg/cache"
42-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
4342
"github.com/kcp-dev/logicalcluster/v3"
43+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
4444

4545
mcpcache "github.com/kcp-dev/multicluster-provider/internal/cache"
4646
mcrecorder "github.com/kcp-dev/multicluster-provider/internal/events/recorder"

‎apiexport/provider.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
"sigs.k8s.io/multicluster-runtime/pkg/clusters"
4141
"sigs.k8s.io/multicluster-runtime/pkg/multicluster"
4242

43-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
43+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
4444

4545
"github.com/kcp-dev/multicluster-provider/apiexport/internal/provider"
4646
)

‎envtest/eventually.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"k8s.io/apimachinery/pkg/util/wait"
2727
"k8s.io/utils/ptr"
2828

29-
conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1"
30-
"github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions"
29+
conditionsv1alpha1 "github.com/kcp-dev/sdk/apis/third_party/conditions/apis/conditions/v1alpha1"
30+
"github.com/kcp-dev/sdk/apis/third_party/conditions/util/conditions"
3131
)
3232

3333
// Eventually asserts that given condition will be met in waitFor time, periodically checking target function

‎envtest/scheme.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ package envtest
1919
import (
2020
"k8s.io/client-go/kubernetes/scheme"
2121

22-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
23-
apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2"
24-
corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
25-
tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
26-
topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1"
22+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
23+
apisv1alpha2 "github.com/kcp-dev/sdk/apis/apis/v1alpha2"
24+
corev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
25+
tenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"
26+
topologyv1alpha1 "github.com/kcp-dev/sdk/apis/topology/v1alpha1"
2727
)
2828

2929
func init() {

‎envtest/workspaces.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/client"
3434
"sigs.k8s.io/yaml"
3535

36-
"github.com/kcp-dev/kcp/sdk/apis/core"
37-
corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
38-
tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
3936
"github.com/kcp-dev/logicalcluster/v3"
37+
"github.com/kcp-dev/sdk/apis/core"
38+
corev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
39+
tenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"
4040

4141
kcpclient "github.com/kcp-dev/multicluster-provider/client"
4242
)

‎examples/apiexport/main.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ import (
3838
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
3939
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
4040

41-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
42-
corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
43-
tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
41+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
42+
corev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
43+
tenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"
4444

4545
"github.com/kcp-dev/multicluster-provider/apiexport"
4646
)

‎examples/initializingworkspaces/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ import (
4242
mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager"
4343
mcreconcile "sigs.k8s.io/multicluster-runtime/pkg/reconcile"
4444

45-
apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1"
46-
corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
47-
"github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization"
48-
tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
45+
apisv1alpha1 "github.com/kcp-dev/sdk/apis/apis/v1alpha1"
46+
corev1alpha1 "github.com/kcp-dev/sdk/apis/core/v1alpha1"
47+
"github.com/kcp-dev/sdk/apis/tenancy/initialization"
48+
tenancyv1alpha1 "github.com/kcp-dev/sdk/apis/tenancy/v1alpha1"
4949

5050
"github.com/kcp-dev/multicluster-provider/initializingworkspaces"
5151
)

‎examples/logicalclusters/go.mod‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)