⚠️ Bump CatalogExtension API to v1

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

PROJECT

@@ -11,15 +11,15 @@ resources:
   domain: operatorframework.io
   group: olm
   kind: ClusterExtension
-  path: github.com/operator-framework/operator-controller/api/v1alpha1
-  version: v1alpha1
+  path: github.com/operator-framework/operator-controller/api/v1
+  version: v1
 - api:
     crdVersion: v1
     namespaced: true
   controller: true
   domain: operatorframework.io
   group: olm
   kind: Extension
-  path: github.com/operator-framework/operator-controller/api/v1alpha1
-  version: v1alpha1
+  path: github.com/operator-framework/operator-controller/api/v1
+  version: v1
 version: "3"

README.md

@@ -68,7 +68,7 @@ kubectl wait --for=condition=Unpacked=True clustercatalog/operatorhubio --timeou
 ```bash
 # Apply the sample ClusterExtension. Manifest already includes
 # namespace and adequately privileged service account
-kubectl apply -f config/samples/olm_v1alpha1_clusterextension.yaml
+kubectl apply -f config/samples/olm_v1_clusterextension.yaml
 ```
 
 #### Upgrade/Downgrade
@@ -87,7 +87,7 @@ kubectl delete clusterextension/argocd && kubectl delete namespace argocd
 
 ```bash
 # Delete cluster-scoped resources
-kubectl delete --ignore-not-found=true -f config/samples/olm_v1alpha1_clusterextension.yaml 
+kubectl delete --ignore-not-found=true -f config/samples/olm_v1_clusterextension.yaml 
 ```
 
 ### Advanced Usage
@@ -133,7 +133,7 @@ kubectl create clusterrolebinding "argocd-operator-installer-cluster-admin" \
 ```bash
 # Apply ClusterExtension
 cat <<EOF
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd

api/v1alpha1/clusterextension_types.go renamed to api/v1/clusterextension_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"

api/v1alpha1/clusterextension_types_test.go renamed to api/v1/clusterextension_types_test.go

@@ -1,4 +1,4 @@
-package v1alpha1_test
+package v1_test
 
 import (
 	"fmt"

api/v1alpha1/groupversion_info.go renamed to 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 olm v1alpha1 API group
+// Package v1 contains API Schema definitions for the olm 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}

api/v1alpha1/zz_generated.deepcopy.go renamed to api/v1/zz_generated.deepcopy.go

@@ -43,7 +43,7 @@ import (
 	catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
 	helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
 
-	ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
+	ocv1 "github.com/operator-framework/operator-controller/api/v1"
 	"github.com/operator-framework/operator-controller/internal/action"
 	"github.com/operator-framework/operator-controller/internal/applier"
 	"github.com/operator-framework/operator-controller/internal/authentication"
@@ -119,7 +119,7 @@ func main() {
 		systemNamespace = podNamespace()
 	}
 
-	dependentRequirement, err := k8slabels.NewRequirement(labels.OwnerKindKey, selection.In, []string{ocv1alpha1.ClusterExtensionKind})
+	dependentRequirement, err := k8slabels.NewRequirement(labels.OwnerKindKey, selection.In, []string{ocv1.ClusterExtensionKind})
 	if err != nil {
 		setupLog.Error(err, "unable to create dependent label selector for cache")
 		os.Exit(1)
@@ -135,8 +135,8 @@ func main() {
 		LeaderElectionID:       "9c4404e7.operatorframework.io",
 		Cache: crcache.Options{
 			ByObject: map[client.Object]crcache.ByObject{
-				&ocv1alpha1.ClusterExtension{}: {Label: k8slabels.Everything()},
-				&catalogd.ClusterCatalog{}:     {Label: k8slabels.Everything()},
+				&ocv1.ClusterExtension{}:   {Label: k8slabels.Everything()},
+				&catalogd.ClusterCatalog{}: {Label: k8slabels.Everything()},
 			},
 			DefaultNamespaces: map[string]crcache.Config{
 				systemNamespace: {LabelSelector: k8slabels.Everything()},
@@ -171,7 +171,7 @@ func main() {
 	cfgGetter, err := helmclient.NewActionConfigGetter(mgr.GetConfig(), mgr.GetRESTMapper(),
 		helmclient.StorageDriverMapper(action.ChunkedStorageDriverMapper(coreClient, mgr.GetAPIReader(), systemNamespace)),
 		helmclient.ClientNamespaceMapper(func(obj client.Object) (string, error) {
-			ext := obj.(*ocv1alpha1.ClusterExtension)
+			ext := obj.(*ocv1.ClusterExtension)
 			return ext.Spec.Install.Namespace, nil
 		}),
 		helmclient.ClientRestConfigMapper(clientRestConfigMapper),
@@ -251,7 +251,7 @@ func main() {
 
 	cm := contentmanager.NewManager(clientRestConfigMapper, mgr.GetConfig(), mgr.GetRESTMapper())
 	err = clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupContentManagerCacheFinalizer, finalizerFunc(func(ctx context.Context, obj client.Object) (crfinalizer.Result, error) {
-		ext := obj.(*ocv1alpha1.ClusterExtension)
+		ext := obj.(*ocv1.ClusterExtension)
 		err := cm.Delete(ext)
 		return crfinalizer.Result{}, err
 	}))

cmd/manager/main.go

@@ -14,7 +14,7 @@ spec:
     singular: clusterextension
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - name: v1
     schema:
       openAPIV3Schema:
         description: ClusterExtension is the Schema for the clusterextensions API

config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml

@@ -1,4 +1,4 @@
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterCatalog
 metadata:
   name: operatorhubio

config/samples/catalogd_operatorcatalog.yaml

@@ -1,5 +1,5 @@
 ## Append samples of your project ##
 resources:
-- olm_v1alpha1_clusterextension.yaml
-- olm_v1alpha1_extension.yaml
+- olm_v1_clusterextension.yaml
+- olm_v1_extension.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples