diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 2efadb2a0..709f5e9c9 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -46,7 +46,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/metrics/server" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client" ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" diff --git a/config/samples/catalogd_operatorcatalog.yaml b/config/samples/catalogd_operatorcatalog.yaml index 48f1da573..47fb4d700 100644 --- a/config/samples/catalogd_operatorcatalog.yaml +++ b/config/samples/catalogd_operatorcatalog.yaml @@ -1,4 +1,4 @@ -apiVersion: olm.operatorframework.io/v1alpha1 +apiVersion: olm.operatorframework.io/v1 kind: ClusterCatalog metadata: name: operatorhubio diff --git a/docs/api-reference/catalogd-api-reference.md b/docs/api-reference/catalogd-api-reference.md index 83c155835..b313d2646 100644 --- a/docs/api-reference/catalogd-api-reference.md +++ b/docs/api-reference/catalogd-api-reference.md @@ -1,20 +1,12 @@ # API Reference ## Packages -- [olm.operatorframework.io/core](#olmoperatorframeworkiocore) -- [olm.operatorframework.io/v1alpha1](#olmoperatorframeworkiov1alpha1) +- [olm.operatorframework.io/v1](#olmoperatorframeworkiov1) -## olm.operatorframework.io/core +## olm.operatorframework.io/v1 -Package api is the internal version of the API. - - - - -## olm.operatorframework.io/v1alpha1 - -Package v1alpha1 contains API Schema definitions for the core v1alpha1 API group +Package v1 contains API Schema definitions for the core v1 API group ### Resource Types - [ClusterCatalog](#clustercatalog) @@ -71,7 +63,7 @@ _Appears in:_ | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | | +| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | | | `kind` _string_ | `ClusterCatalog` | | | | `kind` _string_ | Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | | | | `apiVersion` _string_ | APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | | | @@ -92,7 +84,7 @@ ClusterCatalogList contains a list of ClusterCatalog | Field | Description | Default | Validation | | --- | --- | --- | --- | -| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | | +| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | | | `kind` _string_ | `ClusterCatalogList` | | | | `kind` _string_ | Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds | | | | `apiVersion` _string_ | APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources | | | diff --git a/docs/concepts/controlling-catalog-selection.md b/docs/concepts/controlling-catalog-selection.md index 13b782d0f..ff0fbfc3a 100644 --- a/docs/concepts/controlling-catalog-selection.md +++ b/docs/concepts/controlling-catalog-selection.md @@ -125,7 +125,7 @@ When multiple catalogs provide the same package, you can set priorities to resol In your `ClusterCatalog` resource, set the `priority` field: ```yaml -apiVersion: olm.operatorframework.io/v1alpha1 +apiVersion: olm.operatorframework.io/v1 kind: ClusterCatalog metadata: name: high-priority-catalog @@ -160,7 +160,7 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera 1. **Create or Update `ClusterCatalogs` with Appropriate Labels and Priority** ```yaml - apiVersion: olm.operatorframework.io/v1alpha1 + apiVersion: olm.operatorframework.io/v1 kind: ClusterCatalog metadata: name: catalog-a @@ -175,7 +175,7 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera ``` ```yaml - apiVersion: olm.operatorframework.io/v1alpha1 + apiVersion: olm.operatorframework.io/v1 kind: ClusterCatalog metadata: name: catalog-b diff --git a/docs/getting-started/olmv1_getting_started.md b/docs/getting-started/olmv1_getting_started.md index efffddde8..49ec4a137 100644 --- a/docs/getting-started/olmv1_getting_started.md +++ b/docs/getting-started/olmv1_getting_started.md @@ -35,7 +35,7 @@ To create the catalog, run the following command: ```bash # Create ClusterCatalog kubectl apply -f - < - API Version: olm.operatorframework.io/v1alpha1 + API Version: olm.operatorframework.io/v1 Kind: ClusterCatalog Metadata: Creation Timestamp: 2024-10-02T19:51:24Z diff --git a/go.mod b/go.mod index 28624580a..00c04ee42 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/onsi/gomega v1.35.1 github.com/opencontainers/go-digest v1.0.0 github.com/operator-framework/api v0.27.0 - github.com/operator-framework/catalogd v0.36.0 + github.com/operator-framework/catalogd v1.0.0-rc1 github.com/operator-framework/helm-operator-plugins v0.7.0 github.com/operator-framework/operator-registry v1.48.0 github.com/spf13/pflag v1.0.5 diff --git a/go.sum b/go.sum index b0a62ef63..266c4f34e 100644 --- a/go.sum +++ b/go.sum @@ -535,8 +535,8 @@ github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eT github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o= github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI= github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM= -github.com/operator-framework/catalogd v0.36.0 h1:4ySpKitCooKPpTqQon/2dIGR7oEOIee8WYrRYwwQZ00= -github.com/operator-framework/catalogd v0.36.0/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww= +github.com/operator-framework/catalogd v1.0.0-rc1 h1:wuM8yLy52lwrfyVJJ++l8zV+pxJOnuQLC84fO0UTbts= +github.com/operator-framework/catalogd v1.0.0-rc1/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww= github.com/operator-framework/helm-operator-plugins v0.7.0 h1:YmtIWFc9BaNaDc5mk/dkG0P2BqPZOqpDvjWih5Fczuk= github.com/operator-framework/helm-operator-plugins v0.7.0/go.mod h1:fUUCJR3bWtMBZ1qdDhbwjacsBHi9uT576tF4u/DwOgQ= github.com/operator-framework/operator-lib v0.15.0 h1:0QeRM4PMtThqINpcFGCEBnIV3Z8u7/8fYLEx6mUtdcM= diff --git a/hack/test/pre-upgrade-setup.sh b/hack/test/pre-upgrade-setup.sh index 00734f952..fc13dfc7d 100755 --- a/hack/test/pre-upgrade-setup.sh +++ b/hack/test/pre-upgrade-setup.sh @@ -20,7 +20,7 @@ TEST_CLUSTER_CATALOG_NAME=$2 TEST_CLUSTER_EXTENSION_NAME=$3 kubectl apply -f - << EOF -apiVersion: olm.operatorframework.io/v1alpha1 +apiVersion: olm.operatorframework.io/v1 kind: ClusterCatalog metadata: name: ${TEST_CLUSTER_CATALOG_NAME} diff --git a/internal/catalogmetadata/client/client.go b/internal/catalogmetadata/client/client.go index a68c6c989..4b75e6291 100644 --- a/internal/catalogmetadata/client/client.go +++ b/internal/catalogmetadata/client/client.go @@ -12,7 +12,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" "github.com/operator-framework/operator-registry/alpha/declcfg" ) diff --git a/internal/catalogmetadata/client/client_test.go b/internal/catalogmetadata/client/client_test.go index 15430d7c1..16adb94a0 100644 --- a/internal/catalogmetadata/client/client_test.go +++ b/internal/catalogmetadata/client/client_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" "github.com/operator-framework/operator-registry/alpha/declcfg" catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client" diff --git a/internal/controllers/clustercatalog_controller.go b/internal/controllers/clustercatalog_controller.go index dc86ed59f..daf2668c5 100644 --- a/internal/controllers/clustercatalog_controller.go +++ b/internal/controllers/clustercatalog_controller.go @@ -25,7 +25,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" ) type CatalogCache interface { diff --git a/internal/controllers/clustercatalog_controller_test.go b/internal/controllers/clustercatalog_controller_test.go index 639f20c96..fb190b470 100644 --- a/internal/controllers/clustercatalog_controller_test.go +++ b/internal/controllers/clustercatalog_controller_test.go @@ -14,7 +14,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" "github.com/operator-framework/operator-controller/internal/controllers" "github.com/operator-framework/operator-controller/internal/scheme" diff --git a/internal/controllers/clusterextension_controller.go b/internal/controllers/clusterextension_controller.go index 76ebd3932..295067a57 100644 --- a/internal/controllers/clusterextension_controller.go +++ b/internal/controllers/clusterextension_controller.go @@ -45,7 +45,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/operator-framework/api/pkg/operators/v1alpha1" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client" "github.com/operator-framework/operator-registry/alpha/declcfg" diff --git a/internal/resolve/catalog.go b/internal/resolve/catalog.go index 761448bea..ecc2787a2 100644 --- a/internal/resolve/catalog.go +++ b/internal/resolve/catalog.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" "github.com/operator-framework/operator-registry/alpha/declcfg" ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" diff --git a/internal/resolve/catalog_test.go b/internal/resolve/catalog_test.go index ba6a70027..0ee7d199c 100644 --- a/internal/resolve/catalog_test.go +++ b/internal/resolve/catalog_test.go @@ -16,7 +16,7 @@ import ( "k8s.io/utils/ptr" "sigs.k8s.io/controller-runtime/pkg/client" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" "github.com/operator-framework/operator-registry/alpha/declcfg" "github.com/operator-framework/operator-registry/alpha/property" diff --git a/internal/scheme/scheme.go b/internal/scheme/scheme.go index 933d89b05..6f5d6635c 100644 --- a/internal/scheme/scheme.go +++ b/internal/scheme/scheme.go @@ -7,7 +7,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" ) diff --git a/test/e2e/cluster_extension_install_test.go b/test/e2e/cluster_extension_install_test.go index 2a93a1de4..81e791ec6 100644 --- a/test/e2e/cluster_extension_install_test.go +++ b/test/e2e/cluster_extension_install_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/utils/env" "sigs.k8s.io/controller-runtime/pkg/client" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" ) diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index e5e937822..df6d3fdd9 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -13,7 +13,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" "github.com/operator-framework/operator-controller/internal/scheme" ) diff --git a/test/extension-developer-e2e/extension_developer_test.go b/test/extension-developer-e2e/extension_developer_test.go index bb6bdad39..deef16ced 100644 --- a/test/extension-developer-e2e/extension_developer_test.go +++ b/test/extension-developer-e2e/extension_developer_test.go @@ -18,7 +18,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" ) diff --git a/test/upgrade-e2e/post_upgrade_test.go b/test/upgrade-e2e/post_upgrade_test.go index 78f7284a8..1386c2610 100644 --- a/test/upgrade-e2e/post_upgrade_test.go +++ b/test/upgrade-e2e/post_upgrade_test.go @@ -18,7 +18,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - catalogdv1alpha1 "github.com/operator-framework/catalogd/api/core/v1alpha1" + catalogd "github.com/operator-framework/catalogd/api/v1" ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1" ) @@ -65,14 +65,14 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) { t.Log("Checking that the ClusterCatalog is serving") require.EventuallyWithT(t, func(ct *assert.CollectT) { - var clusterCatalog catalogdv1alpha1.ClusterCatalog + var clusterCatalog catalogd.ClusterCatalog assert.NoError(ct, c.Get(ctx, types.NamespacedName{Name: testClusterCatalogName}, &clusterCatalog)) - cond := apimeta.FindStatusCondition(clusterCatalog.Status.Conditions, catalogdv1alpha1.TypeServing) + cond := apimeta.FindStatusCondition(clusterCatalog.Status.Conditions, catalogd.TypeServing) if !assert.NotNil(ct, cond) { return } assert.Equal(ct, metav1.ConditionTrue, cond.Status) - assert.Equal(ct, catalogdv1alpha1.ReasonAvailable, cond.Reason) + assert.Equal(ct, catalogd.ReasonAvailable, cond.Reason) }, time.Minute, time.Second) t.Log("Checking that the ClusterExtension is installed")