⚠️ Bump ClusterExtension API to v1 (#1228)

* ⚠️ bump ClusterExtension API to v1

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

* CE API updates

  - Regenerate CRD
  - Fixup import in conditionsets package

Signed-off-by: Joe Lanford <[email protected]>

* update imports to drop alpha1 suffix

and other minor version changes that were missed when bumping
API versions to v1.

Signed-off-by: everettraven <[email protected]>

---------

Signed-off-by: Per Goncalves da Silva <[email protected]>
Signed-off-by: Joe Lanford <[email protected]>
Signed-off-by: everettraven <[email protected]>
Co-authored-by: Per Goncalves da Silva <[email protected]>
Co-authored-by: Joe Lanford <[email protected]>
Co-authored-by: everettraven <[email protected]>

Author: 4 people

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"

api/v1alpha1/clusterextension_types.go 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 api/v1/clusterextension_types_test.go

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

api/v1alpha1/groupversion_info.go api/v1/groupversion_info.go

@@ -17,7 +17,7 @@ limitations under the License.
 // Package v1alpha1 contains API Schema definitions for the olm v1alpha1 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 api/v1/zz_generated.deepcopy.go

@@ -49,7 +49,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"
@@ -141,8 +141,8 @@ func main() {
 	setupLog.Info("set up manager")
 	cacheOptions := 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()},
@@ -196,7 +196,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.Namespace, nil
 		}),
 		helmclient.ClientRestConfigMapper(clientRestConfigMapper),
@@ -291,7 +291,7 @@ func main() {
 
 	cm := contentmanager.NewManager(clientRestConfigMapper, mgr.GetConfig(), mgr.GetRESTMapper())
 	err = clusterExtensionFinalizers.Register(controllers.ClusterExtensionCleanupContentManagerCacheFinalizer, finalizers.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

@@ -30,7 +30,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    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,5 +1,5 @@
 ## Append samples of your project ##
 resources:
-- olm_v1alpha1_clusterextension.yaml
+- olm_v1_clusterextension.yaml
 - olm_v1alpha1_extension.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples

config/samples/kustomization.yaml

@@ -267,7 +267,7 @@ subjects:
   name: argocd-installer
   namespace: argocd
 ---
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd

config/samples/olm_v1alpha1_clusterextension.yaml config/samples/olm_v1_clusterextension.yaml

@@ -1,10 +1,10 @@
 # API Reference
 
 ## Packages
-- [olm.operatorframework.io/v1alpha1](#olmoperatorframeworkiov1alpha1)
+- [olm.operatorframework.io/v1](#olmoperatorframeworkiov1)
 
 
-## olm.operatorframework.io/v1alpha1
+## olm.operatorframework.io/v1
 
 Package v1alpha1 contains API Schema definitions for the olm v1alpha1 API group
 
@@ -97,7 +97,7 @@ _Appears in:_
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | |
+| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | |
 | `kind` _string_ | `ClusterExtension` | | |
 | `kind` _string_ | Kind is a string value representing the REST resource this object represents.<br />Servers may infer this from the endpoint the client submits requests to.<br />Cannot be updated.<br />In CamelCase.<br />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.<br />Servers should convert recognized schemas to the latest internal value, and<br />may reject unrecognized values.<br />More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources |  |  |
@@ -151,7 +151,7 @@ ClusterExtensionList contains a list of ClusterExtension
 
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
-| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | |
+| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | |
 | `kind` _string_ | `ClusterExtensionList` | | |
 | `kind` _string_ | Kind is a string value representing the REST resource this object represents.<br />Servers may infer this from the endpoint the client submits requests to.<br />Cannot be updated.<br />In CamelCase.<br />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.<br />Servers should convert recognized schemas to the latest internal value, and<br />may reject unrecognized values.<br />More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources |  |  |

docs/api-reference/operator-controller-api-reference.md

@@ -18,7 +18,7 @@ To select a specific catalog by name, you can use the `matchLabels` field in you
 #### Example
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: my-extension
@@ -39,7 +39,7 @@ If you have catalogs labeled with specific metadata, you can select them using `
 #### Using `matchLabels`
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: my-extension
@@ -56,7 +56,7 @@ This selects catalogs labeled with `example.com/support: "true"`.
 #### Using `matchExpressions`
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: my-extension
@@ -81,7 +81,7 @@ You can exclude catalogs by using the `NotIn` or `DoesNotExist` operators in `ma
 #### Example: Exclude Specific Catalogs
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: my-extension
@@ -101,7 +101,7 @@ This excludes the catalog named `unwanted-catalog` from consideration.
 #### Example: Exclude Catalogs with a Specific Label
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: my-extension
@@ -194,7 +194,7 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera
 2. **Create a `ClusterExtension` with Catalog Selection**
 
    ```yaml
-   apiVersion: olm.operatorframework.io/v1alpha1
+   apiVersion: olm.operatorframework.io/v1
    kind: ClusterExtension
    metadata:
      name: install-my-operator

docs/concepts/controlling-catalog-selection.md

@@ -56,7 +56,7 @@ The CRD Upgrade Safety preflight check can be entirely disabled by adding the
 `preflight.crdUpgradeSafety.disabled` field with a value of "true" to the ClusterExtension of the CRD.
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
     name: clusterextension-sample

docs/concepts/crd-upgrade-safety.md

@@ -38,7 +38,7 @@ If `1.0.0` is installed, OLM v1 behavior differs in the following ways:
 You can change the default behavior of the upgrade constraints by setting the `upgradeConstraintPolicy` parameter in your cluster extension's custom resource (CR).
 
 ``` yaml hl_lines="10"
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: <extension_name>
@@ -86,7 +86,7 @@ If you set the field to `SelfCertified`, no upgrade constraints are set on the p
 Example `ClusterExtension` with `.spec.upgradeConstraintPolicy` field set to `SelfCertified`:
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: extension-sample

docs/concepts/upgrade-support.md

@@ -5,7 +5,7 @@ A "channel" is a package author defined stream of updates for an extension. A se
 Example:
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd
@@ -27,7 +27,7 @@ Note that the `version` field also accepts a version range to further restrict t
 Example:
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd

docs/howto/how-to-channel-based-upgrades.md

@@ -5,7 +5,7 @@ To disable automatic updates, and pin the version of an extension, set `version`
 Example:
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd

docs/howto/how-to-pin-version.md

@@ -5,7 +5,7 @@ Set the version for the desired package in the Catalog source to a comparison st
 Example:
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd

docs/howto/how-to-version-range-upgrades.md

@@ -5,7 +5,7 @@ To restrict automatic updates to only z-stream patches and avoid breaking change
 Example:
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd

docs/howto/how-to-z-stream-upgrades.md

@@ -31,7 +31,7 @@ Add the `crdUpgradeSafety` field and set its `policy` to `Disabled` in the `Clus
 **Example:**
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: example-extension
@@ -71,7 +71,7 @@ Set the `upgradeConstraintPolicy` to `SelfCertified` in the `ClusterExtension` r
 **Example:**
 
 ```yaml
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: example-extension
@@ -113,7 +113,7 @@ Once the CRD safety checks are disabled and upgrade constraints are set, you can
    Within the YAML editor, update the `spec` section as follows:
 
    ```yaml
-   apiVersion: olm.operatorframework.io/v1alpha1
+   apiVersion: olm.operatorframework.io/v1
    kind: ClusterExtension
    metadata:
      name: <extension_name>

docs/tutorials/downgrade-extension.md

@@ -34,7 +34,7 @@ For information on determining the ServiceAccount's permission, please see [Deri
 1. Create a CR for the Kubernetes extension you want to install:
 
     ``` yaml title="Example CR"
-    apiVersion: olm.operatorframework.io/v1alpha1
+    apiVersion: olm.operatorframework.io/v1
     kind: ClusterExtension
     metadata:
       name: <extension_name>
@@ -107,7 +107,7 @@ For information on determining the ServiceAccount's permission, please see [Deri
         Namespace:
         Labels:       <none>
         Annotations:  <none>
-        API Version:  olm.operatorframework.io/v1alpha1
+        API Version:  olm.operatorframework.io/v1
         Kind:         ClusterExtension
         Metadata:
         Creation Timestamp:  2024-10-03T16:02:40Z

docs/tutorials/install-extension.md

@@ -23,7 +23,7 @@ For more detailed information see [Upgrade Support](../concepts/upgrade-support.
 Suppose we have successfully created and installed v0.5.0 of the ArgoCD operator with the following `ClusterExtension`:
 
 ``` yaml title="Example CR"
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: argocd
@@ -43,7 +43,7 @@ spec:
 
     ``` terminal
       kubectl apply -f - <<EOF
-      apiVersion: olm.operatorframework.io/v1alpha1
+      apiVersion: olm.operatorframework.io/v1
       kind: ClusterExtension
         metadata:
           name: argocd
@@ -92,12 +92,12 @@ spec:
 
     ??? success
       ``` text title="Example output"
-        apiVersion: olm.operatorframework.io/v1alpha1
+        apiVersion: olm.operatorframework.io/v1
         kind: ClusterExtension
         metadata:
         annotations:
             kubectl.kubernetes.io/last-applied-configuration: |
-            {"apiVersion":"olm.operatorframework.io/v1alpha1","kind":"ClusterExtension","metadata":{"annotations":{},"name":"argocd"},"spec":{"install":{"namespace":"argocd","serviceAccount":{"name":"argocd-installer"}},"source":{"catalog":{"packageName":"argocd-operator","version":"0.6.0"},"sourceType":"Catalog"}}}
+            {"apiVersion":"olm.operatorframework.io/v1","kind":"ClusterExtension","metadata":{"annotations":{},"name":"argocd"},"spec":{"install":{"namespace":"argocd","serviceAccount":{"name":"argocd-installer"}},"source":{"catalog":{"packageName":"argocd-operator","version":"0.6.0"},"sourceType":"Catalog"}}}
         creationTimestamp: "2024-10-03T16:02:40Z"
         finalizers:
         - olm.operatorframework.io/cleanup-unpack-cache

docs/tutorials/upgrade-extension.md

@@ -85,7 +85,7 @@ EOF
 generate_cluster_extension() {
     cat <<EOF
 ---
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
 kind: ClusterExtension
 metadata:
   name: \${EXTENSION_NAME}