⚠️ Bump ClusterCatalog API to v1 (#380)

* bump ClusterCatalog API to v1 Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> * Update test/e2e/unpack_test.go --------- Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com> Co-authored-by: Joe Lanford <joe.lanford@gmail.com>
operator-framework · Nov 8, 2024 · 2f96c57 · 2f96c57
1 parent 20acf03
commit 2f96c57
Show file tree

Hide file tree

Showing 28 changed files with 443 additions and 462 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Procedure steps marked with an asterisk (`*`) are likely to change with future A
 
     ```sh
     $ kubectl apply -f - << EOF
-    apiVersion: olm.operatorframework.io/v1alpha1
+    apiVersion: olm.operatorframework.io/v1
     kind: ClusterCatalog
     metadata:
       name: operatorhubio
@@ -42,7 +42,7 @@ Procedure steps marked with an asterisk (`*`) are likely to change with future A
     Namespace:
     Labels:       olm.operatorframework.io/metadata.name=operatorhubio
     Annotations:  <none>
-    API Version:  olm.operatorframework.io/v1alpha1
+    API Version:  olm.operatorframework.io/v1
     Kind:         ClusterCatalog
     Metadata:
       Creation Timestamp:  2024-10-17T13:48:46Z

diff --git a/api/core/doc.go b/api/core/doc.go
diff --git a/api/core/v1alpha1/clustercatalog_types.go → api/v1/clustercatalog_types.go b/api/core/v1alpha1/clustercatalog_types.go → api/v1/clustercatalog_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/...ore/v1alpha1/clustercatalog_types_test.go → api/v1/clustercatalog_types_test.go b/...ore/v1alpha1/clustercatalog_types_test.go → api/v1/clustercatalog_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha1
+package v1
 
 import (
 	"context"
@@ -20,10 +20,12 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
+const crdFilePath = "../../config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml"
+
 func TestImageSourceCELValidationRules(t *testing.T) {
-	validators := fieldValidatorsFromFile(t, "../../../config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml")
+	validators := fieldValidatorsFromFile(t, crdFilePath)
 	pth := "openAPIV3Schema.properties.spec.properties.source.properties.image"
-	validator, found := validators["v1alpha1"][pth]
+	validator, found := validators[GroupVersion.Version][pth]
 	require.True(t, found)
 
 	for name, tc := range map[string]struct {
@@ -157,9 +159,9 @@ func TestImageSourceCELValidationRules(t *testing.T) {
 }
 
 func TestResolvedImageSourceCELValidation(t *testing.T) {
-	validators := fieldValidatorsFromFile(t, "../../../config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml")
+	validators := fieldValidatorsFromFile(t, crdFilePath)
 	pth := "openAPIV3Schema.properties.status.properties.resolvedSource.properties.image.properties.ref"
-	validator, found := validators["v1alpha1"][pth]
+	validator, found := validators[GroupVersion.Version][pth]
 	require.True(t, found)
 
 	for name, tc := range map[string]struct {
@@ -250,9 +252,9 @@ func TestResolvedImageSourceCELValidation(t *testing.T) {
 }
 
 func TestClusterCatalogURLsCELValidation(t *testing.T) {
-	validators := fieldValidatorsFromFile(t, "../../../config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml")
+	validators := fieldValidatorsFromFile(t, crdFilePath)
 	pth := "openAPIV3Schema.properties.status.properties.urls.properties.base"
-	validator, found := validators["v1alpha1"][pth]
+	validator, found := validators[GroupVersion.Version][pth]
 	require.True(t, found)
 	for name, tc := range map[string]struct {
 		urls     ClusterCatalogURLs
@@ -294,9 +296,9 @@ func TestClusterCatalogURLsCELValidation(t *testing.T) {
 }
 
 func TestSourceCELValidation(t *testing.T) {
-	validators := fieldValidatorsFromFile(t, "../../../config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml")
+	validators := fieldValidatorsFromFile(t, crdFilePath)
 	pth := "openAPIV3Schema.properties.spec.properties.source"
-	validator, found := validators["v1alpha1"][pth]
+	validator, found := validators[GroupVersion.Version][pth]
 	require.True(t, found)
 	for name, tc := range map[string]struct {
 		source   CatalogSource
@@ -335,9 +337,9 @@ func TestSourceCELValidation(t *testing.T) {
 }
 
 func TestResolvedSourceCELValidation(t *testing.T) {
-	validators := fieldValidatorsFromFile(t, "../../../config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml")
+	validators := fieldValidatorsFromFile(t, crdFilePath)
 	pth := "openAPIV3Schema.properties.status.properties.resolvedSource"
-	validator, found := validators["v1alpha1"][pth]
+	validator, found := validators[GroupVersion.Version][pth]
 
 	require.True(t, found)
 	for name, tc := range map[string]struct {

diff --git a/api/core/v1alpha1/groupversion_info.go → api/v1/groupversion_info.go b/api/core/v1alpha1/groupversion_info.go → api/v1/groupversion_info.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the core v1alpha1 API group
+// Package v1 contains API Schema definitions for the core v1 API group
 // +kubebuilder:object:generate=true
 // +groupName=olm.operatorframework.io
-package v1alpha1
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "olm.operatorframework.io", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "olm.operatorframework.io", Version: "v1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/core/v1alpha1/zz_generated.deepcopy.go → api/v1/zz_generated.deepcopy.go b/api/core/v1alpha1/zz_generated.deepcopy.go → api/v1/zz_generated.deepcopy.go
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -51,7 +51,7 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/operator-framework/catalogd/api/core/v1alpha1"
+	catalogdv1 "github.com/operator-framework/catalogd/api/v1"
 	corecontrollers "github.com/operator-framework/catalogd/internal/controllers/core"
 	"github.com/operator-framework/catalogd/internal/features"
 	"github.com/operator-framework/catalogd/internal/garbagecollection"
@@ -76,7 +76,7 @@ const (
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
-	utilruntime.Must(v1alpha1.AddToScheme(scheme))
+	utilruntime.Must(catalogdv1.AddToScheme(scheme))
 	//+kubebuilder:scaffold:scheme
 }
 

diff --git a/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml b/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
@@ -24,7 +24,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v1alpha1
+    name: v1
     schema:
       openAPIV3Schema:
         description: |-

diff --git a/config/base/default/clustercatalogs/default-catalogs.yaml b/config/base/default/clustercatalogs/default-catalogs.yaml
@@ -1,4 +1,4 @@
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterCatalog
 metadata:
   name: operatorhubio

diff --git a/config/base/manager/webhook/manifests.yaml b/config/base/manager/webhook/manifests.yaml
@@ -10,14 +10,14 @@ webhooks:
     service:
       name: webhook-service
       namespace: system
-      path: /mutate-olm-operatorframework-io-v1alpha1-clustercatalog
+      path: /mutate-olm-operatorframework-io-v1-clustercatalog
   failurePolicy: Fail
   name: inject-metadata-name.olm.operatorframework.io
   rules:
   - apiGroups:
     - olm.operatorframework.io
     apiVersions:
-    - v1alpha1
+    - v1
     operations:
     - CREATE
     - UPDATE

diff --git a/...samples/core_v1alpha1_clustercatalog.yaml → config/samples/core_v1_clustercatalog.yaml b/...samples/core_v1alpha1_clustercatalog.yaml → config/samples/core_v1_clustercatalog.yaml
@@ -1,4 +1,4 @@
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterCatalog
 metadata:
   name: operatorhubio

diff --git a/docs/fetching-catalog-contents.md b/docs/fetching-catalog-contents.md
@@ -145,7 +145,7 @@ This section outlines a way of exposing the `Catalogd` Service's endpoints outsi
 
     ```sh
       $ kubectl apply -f - << EOF
-      apiVersion: olm.operatorframework.io/v1alpha1
+      apiVersion: olm.operatorframework.io/v1
       kind: ClusterCatalog
         metadata:
           name: operatorhubio