Skip to content

Commit 46729f8

Browse files
fabianburthfabianburth
committed
chore: upgrade to ocm version 0.14.0 (after restructure)
1 parent f5ca710 commit 46729f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+325
-502
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ GEN_CRD_API_REFERENCE_DOCS ?= $(LOCALBIN)/gen-crd-api-reference-docs
144144

145145
## Tool Versions
146146
KUSTOMIZE_VERSION ?= v3.8.7
147-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
147+
CONTROLLER_TOOLS_VERSION ?= v0.17.3
148148
GEN_API_REF_DOCS_VERSION ?= e327d0730470cbd61b06300f81c5fcf91c23c113
149149
MKCERT_VERSION ?= v1.4.4
150150
GOLANGCI_LINT_VERSION ?= v2.1.1

‎api/v1alpha1/componentdescriptor_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package v1alpha1
22

33
import (
4-
"github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1"
54
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
"ocm.software/ocm/api/ocm/compdesc/versions/ocm.software/v3alpha1"
66
)
77

88
// ComponentDescriptorStatus defines the observed state of ComponentDescriptor.

‎api/v1alpha1/reference_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"k8s.io/apimachinery/pkg/runtime/schema"
99
"sigs.k8s.io/controller-runtime/pkg/client"
1010

11-
ocmmetav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
11+
ocmmetav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
1212
)
1313

1414
// ObjectReference defines a resource which may be accessed via a snapshot or component version

‎api/v1alpha1/resource_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package v1alpha1
33
import (
44
"time"
55

6-
ocmmetav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
76
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
7+
ocmmetav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
88
)
99

1010
const ResourceKind = "Resource"

‎api/v1alpha1/snapshot_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package v1alpha1
22

33
import (
4-
ocmmetav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
54
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
5+
ocmmetav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
66
"sigs.k8s.io/controller-runtime/pkg/client"
77
)
88

‎api/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/componentversion_contoller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"k8s.io/client-go/tools/record"
1717
ctrl "sigs.k8s.io/controller-runtime"
1818

19-
ocmdesc "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
20-
v1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
19+
ocmdesc "ocm.software/ocm/api/ocm/compdesc"
20+
v1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
2121

2222
"github.com/open-component-model/ocm-controller/api/v1alpha1"
2323
ocmfake "github.com/open-component-model/ocm-controller/pkg/fakes"

‎controllers/componentversion_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import (
1111
"github.com/fluxcd/pkg/apis/meta"
1212
"github.com/fluxcd/pkg/runtime/patch"
1313
rreconcile "github.com/fluxcd/pkg/runtime/reconcile"
14-
"github.com/open-component-model/ocm/pkg/contexts/ocm"
15-
ocmdesc "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc"
16-
compdesc "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/versions/ocm.software/v3alpha1"
1714
mh "github.com/open-component-model/pkg/metrics"
1815
corev1 "k8s.io/api/core/v1"
1916
apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -22,6 +19,9 @@ import (
2219
"k8s.io/apimachinery/pkg/runtime"
2320
"k8s.io/apimachinery/pkg/types"
2421
kuberecorder "k8s.io/client-go/tools/record"
22+
"ocm.software/ocm/api/ocm"
23+
ocmdesc "ocm.software/ocm/api/ocm/compdesc"
24+
compdesc "ocm.software/ocm/api/ocm/compdesc/versions/ocm.software/v3alpha1"
2525
ctrl "sigs.k8s.io/controller-runtime"
2626
"sigs.k8s.io/controller-runtime/pkg/builder"
2727
"sigs.k8s.io/controller-runtime/pkg/client"

‎controllers/configuration_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030
"sigs.k8s.io/yaml"
3131

32-
ocmmetav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
32+
ocmmetav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
3333

3434
"github.com/open-component-model/ocm-controller/api/v1alpha1"
3535
cachefakes "github.com/open-component-model/ocm-controller/pkg/cache/fakes"

‎controllers/fluxdeployer_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020

2121
"github.com/open-component-model/ocm-controller/api/v1alpha1"
2222
"github.com/open-component-model/ocm-controller/pkg/cache/fakes"
23-
ocmmetav1 "github.com/open-component-model/ocm/pkg/contexts/ocm/compdesc/meta/v1"
23+
ocmmetav1 "ocm.software/ocm/api/ocm/compdesc/meta/v1"
2424
)
2525

2626
func TestFluxDeployerReconcile(t *testing.T) {

0 commit comments

Comments
 (0)