diff --git a/PROJECT b/PROJECT
index 50ac542dc..f1fc23783 100644
--- a/PROJECT
+++ b/PROJECT
@@ -20,6 +20,6 @@ resources:
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"
diff --git a/api/v1alpha1/clusterextension_types.go b/api/v1/clusterextension_types.go
similarity index 99%
rename from api/v1alpha1/clusterextension_types.go
rename to api/v1/clusterextension_types.go
index ad99e7251..6eeff0889 100644
--- a/api/v1alpha1/clusterextension_types.go
+++ b/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"
diff --git a/api/v1alpha1/clusterextension_types_test.go b/api/v1/clusterextension_types_test.go
similarity index 99%
rename from api/v1alpha1/clusterextension_types_test.go
rename to api/v1/clusterextension_types_test.go
index 0ed4f1a08..297a15b13 100644
--- a/api/v1alpha1/clusterextension_types_test.go
+++ b/api/v1/clusterextension_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha1_test
+package v1_test
import (
"fmt"
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1/groupversion_info.go
similarity index 89%
rename from api/v1alpha1/groupversion_info.go
rename to api/v1/groupversion_info.go
index f46abbf3d..9d9bb0120 100644
--- a/api/v1alpha1/groupversion_info.go
+++ b/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 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}
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
similarity index 98%
rename from api/v1alpha1/zz_generated.deepcopy.go
rename to api/v1/zz_generated.deepcopy.go
index ccd143aec..b9ebc655a 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1/zz_generated.deepcopy.go
@@ -18,10 +18,10 @@ limitations under the License.
// Code generated by controller-gen. DO NOT EDIT.
-package v1alpha1
+package v1
import (
- "k8s.io/apimachinery/pkg/apis/meta/v1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)
@@ -199,7 +199,7 @@ func (in *ClusterExtensionStatus) DeepCopyInto(out *ClusterExtensionStatus) {
}
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
- *out = make([]v1.Condition, len(*in))
+ *out = make([]metav1.Condition, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index a64ba4ac2..ea9c0111c 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -44,7 +44,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"
+ ocv1alpha1 "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"
diff --git a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
index 61b81606b..f1c932e7e 100644
--- a/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
+++ b/config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
@@ -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
diff --git a/config/components/ca/kustomization.yaml b/config/components/ca/kustomization.yaml
index 5cbe13ad2..24f480f92 100644
--- a/config/components/ca/kustomization.yaml
+++ b/config/components/ca/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
+apiVersion: kustomize.config.k8s.io/v1
kind: Component
# No namespace is specified here, otherwise, it will overwrite _all_ the other namespaces!
resources:
diff --git a/config/components/coverage/kustomization.yaml b/config/components/coverage/kustomization.yaml
index 5522eb7f8..881dbd338 100644
--- a/config/components/coverage/kustomization.yaml
+++ b/config/components/coverage/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
+apiVersion: kustomize.config.k8s.io/v1
kind: Component
namespace: olmv1-system
resources:
diff --git a/config/components/registries-conf/kustomization.yaml b/config/components/registries-conf/kustomization.yaml
index e48262429..db64b74b9 100644
--- a/config/components/registries-conf/kustomization.yaml
+++ b/config/components/registries-conf/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
+apiVersion: kustomize.config.k8s.io/v1
kind: Component
namespace: olmv1-system
resources:
diff --git a/config/components/tls/kustomization.yaml b/config/components/tls/kustomization.yaml
index 8c1aa94cc..c3f1e3b35 100644
--- a/config/components/tls/kustomization.yaml
+++ b/config/components/tls/kustomization.yaml
@@ -1,4 +1,4 @@
-apiVersion: kustomize.config.k8s.io/v1alpha1
+apiVersion: kustomize.config.k8s.io/v1
kind: Component
namespace: olmv1-system
resources:
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/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index bd1783176..7816e8fef 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.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
diff --git a/config/samples/olm_v1alpha1_clusterextension.yaml b/config/samples/olm_v1_clusterextension.yaml
similarity index 99%
rename from config/samples/olm_v1alpha1_clusterextension.yaml
rename to config/samples/olm_v1_clusterextension.yaml
index 7536c3d90..71544ea5d 100644
--- a/config/samples/olm_v1alpha1_clusterextension.yaml
+++ b/config/samples/olm_v1_clusterextension.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
diff --git a/docs/api-reference/operator-controller-api-reference.md b/docs/api-reference/operator-controller-api-reference.md
index 86bd90190..5289d6449 100644
--- a/docs/api-reference/operator-controller-api-reference.md
+++ b/docs/api-reference/operator-controller-api-reference.md
@@ -1,12 +1,12 @@
# 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
+Package v1 contains API Schema definitions for the olm v1alpha1 API group
### Resource Types
- [ClusterExtension](#clusterextension)
@@ -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.
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 | | |
@@ -153,7 +153,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.
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 68d19c2b3..a97381544 100644
--- a/docs/concepts/controlling-catalog-selection.md
+++ b/docs/concepts/controlling-catalog-selection.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
@@ -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: catalogd.operatorframework.io/v1alpha1
+apiVersion: catalogd.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: catalogd.operatorframework.io/v1alpha1
+ apiVersion: catalogd.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: catalogd.operatorframework.io/v1alpha1
+ apiVersion: catalogd.operatorframework.io/v1
kind: ClusterCatalog
metadata:
name: catalog-b
@@ -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
diff --git a/docs/concepts/crd-upgrade-safety.md b/docs/concepts/crd-upgrade-safety.md
index 47ad18d7b..7b10099fa 100644
--- a/docs/concepts/crd-upgrade-safety.md
+++ b/docs/concepts/crd-upgrade-safety.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
@@ -103,7 +103,7 @@ spec:
singular: sample
scope: Namespaced
versions:
- - name: v1alpha1
+ - name: v1
schema:
openAPIV3Schema:
properties:
diff --git a/docs/concepts/upgrade-support.md b/docs/concepts/upgrade-support.md
index 9bc6e31ad..3c32023ae 100644
--- a/docs/concepts/upgrade-support.md
+++ b/docs/concepts/upgrade-support.md
@@ -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
diff --git a/docs/howto/how-to-channel-based-upgrades.md b/docs/howto/how-to-channel-based-upgrades.md
index 501a7f951..e7638d1a1 100644
--- a/docs/howto/how-to-channel-based-upgrades.md
+++ b/docs/howto/how-to-channel-based-upgrades.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
diff --git a/docs/howto/how-to-pin-version.md b/docs/howto/how-to-pin-version.md
index 606b994aa..5dc0660b0 100644
--- a/docs/howto/how-to-pin-version.md
+++ b/docs/howto/how-to-pin-version.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
diff --git a/docs/howto/how-to-version-range-upgrades.md b/docs/howto/how-to-version-range-upgrades.md
index ddb753fba..dc239fa39 100644
--- a/docs/howto/how-to-version-range-upgrades.md
+++ b/docs/howto/how-to-version-range-upgrades.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
diff --git a/docs/howto/how-to-z-stream-upgrades.md b/docs/howto/how-to-z-stream-upgrades.md
index 8666e09b7..1a638fd1b 100644
--- a/docs/howto/how-to-z-stream-upgrades.md
+++ b/docs/howto/how-to-z-stream-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
diff --git a/docs/tutorials/downgrade-extension.md b/docs/tutorials/downgrade-extension.md
index 0e57d4687..e400600fa 100644
--- a/docs/tutorials/downgrade-extension.md
+++ b/docs/tutorials/downgrade-extension.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:
diff --git a/hack/test/pre-upgrade-setup.sh b/hack/test/pre-upgrade-setup.sh
index 00734f952..d767af5a4 100755
--- a/hack/test/pre-upgrade-setup.sh
+++ b/hack/test/pre-upgrade-setup.sh
@@ -127,7 +127,7 @@ roleRef:
EOF
kubectl apply -f - << EOF
-apiVersion: olm.operatorframework.io/v1alpha1
+apiVersion: olm.operatorframework.io/v1
kind: ClusterExtension
metadata:
name: ${TEST_CLUSTER_EXTENSION_NAME}
diff --git a/hack/tools/catalogs/lib/manifests.sh b/hack/tools/catalogs/lib/manifests.sh
index 55a448f55..156eea677 100644
--- a/hack/tools/catalogs/lib/manifests.sh
+++ b/hack/tools/catalogs/lib/manifests.sh
@@ -85,7 +85,7 @@ EOF
generate_cluster_extension() {
cat <