Skip to content

Commit 4c71bf0

Browse files
author
Per Goncalves da Silva
committed
⚠️ bump ClusterExtension API to v1
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 6c2be08 commit 4c71bf0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+70
-74
lines changed

PROJECT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ resources:
1111
domain: operatorframework.io
1212
group: olm
1313
kind: ClusterExtension
14-
path: github.com/operator-framework/operator-controller/api/v1alpha1
14+
path: github.com/operator-framework/operator-controller/api/v1
1515
version: v1alpha1
1616
- api:
1717
crdVersion: v1
@@ -20,6 +20,6 @@ resources:
2020
domain: operatorframework.io
2121
group: olm
2222
kind: Extension
23-
path: github.com/operator-framework/operator-controller/api/v1alpha1
23+
path: github.com/operator-framework/operator-controller/api/v11
2424
version: v1alpha1
2525
version: "3"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package v1alpha1
17+
package v1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package v1alpha1_test
1+
package v1_test
22

33
import (
44
"fmt"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
// Package v1alpha1 contains API Schema definitions for the olm v1alpha1 API group
1818
// +kubebuilder:object:generate=true
1919
// +groupName=olm.operatorframework.io
20-
package v1alpha1
20+
package v1
2121

2222
import (
2323
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
2626

2727
var (
2828
// GroupVersion is group version used to register these objects
29-
GroupVersion = schema.GroupVersion{Group: "olm.operatorframework.io", Version: "v1alpha1"}
29+
GroupVersion = schema.GroupVersion{Group: "olm.operatorframework.io", Version: "v1"}
3030

3131
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
3232
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

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

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/manager/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import (
4949
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
5050
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
5151

52-
ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"
52+
ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1"
5353
"github.com/operator-framework/operator-controller/internal/action"
5454
"github.com/operator-framework/operator-controller/internal/applier"
5555
"github.com/operator-framework/operator-controller/internal/authentication"

config/samples/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Append samples of your project ##
22
resources:
3-
- olm_v1alpha1_clusterextension.yaml
3+
- olm_v1_clusterextension.yaml
44
- olm_v1alpha1_extension.yaml
55
#+kubebuilder:scaffold:manifestskustomizesamples

config/samples/olm_v1alpha1_clusterextension.yaml renamed to config/samples/olm_v1_clusterextension.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ subjects:
267267
name: argocd-installer
268268
namespace: argocd
269269
---
270-
apiVersion: olm.operatorframework.io/v1alpha1
270+
apiVersion: olm.operatorframework.io/v1
271271
kind: ClusterExtension
272272
metadata:
273273
name: argocd

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# API Reference
22

33
## Packages
4-
- [olm.operatorframework.io/v1alpha1](#olmoperatorframeworkiov1alpha1)
4+
- [olm.operatorframework.io/v1](#olmoperatorframeworkiov1)
55

66

7-
## olm.operatorframework.io/v1alpha1
7+
## olm.operatorframework.io/v1
88

99
Package v1alpha1 contains API Schema definitions for the olm v1alpha1 API group
1010

@@ -97,7 +97,7 @@ _Appears in:_
9797

9898
| Field | Description | Default | Validation |
9999
| --- | --- | --- | --- |
100-
| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | |
100+
| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | |
101101
| `kind` _string_ | `ClusterExtension` | | |
102102
| `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 | | |
103103
| `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 | | |
@@ -153,7 +153,7 @@ ClusterExtensionList contains a list of ClusterExtension
153153

154154
| Field | Description | Default | Validation |
155155
| --- | --- | --- | --- |
156-
| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | |
156+
| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | |
157157
| `kind` _string_ | `ClusterExtensionList` | | |
158158
| `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 | | |
159159
| `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/concepts/controlling-catalog-selection.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To select a specific catalog by name, you can use the `matchLabels` field in you
1818
#### Example
1919

2020
```yaml
21-
apiVersion: olm.operatorframework.io/v1alpha1
21+
apiVersion: olm.operatorframework.io/v1
2222
kind: ClusterExtension
2323
metadata:
2424
name: my-extension
@@ -39,7 +39,7 @@ If you have catalogs labeled with specific metadata, you can select them using `
3939
#### Using `matchLabels`
4040

4141
```yaml
42-
apiVersion: olm.operatorframework.io/v1alpha1
42+
apiVersion: olm.operatorframework.io/v1
4343
kind: ClusterExtension
4444
metadata:
4545
name: my-extension
@@ -56,7 +56,7 @@ This selects catalogs labeled with `example.com/support: "true"`.
5656
#### Using `matchExpressions`
5757

5858
```yaml
59-
apiVersion: olm.operatorframework.io/v1alpha1
59+
apiVersion: olm.operatorframework.io/v1
6060
kind: ClusterExtension
6161
metadata:
6262
name: my-extension
@@ -81,7 +81,7 @@ You can exclude catalogs by using the `NotIn` or `DoesNotExist` operators in `ma
8181
#### Example: Exclude Specific Catalogs
8282

8383
```yaml
84-
apiVersion: olm.operatorframework.io/v1alpha1
84+
apiVersion: olm.operatorframework.io/v1
8585
kind: ClusterExtension
8686
metadata:
8787
name: my-extension
@@ -101,7 +101,7 @@ This excludes the catalog named `unwanted-catalog` from consideration.
101101
#### Example: Exclude Catalogs with a Specific Label
102102

103103
```yaml
104-
apiVersion: olm.operatorframework.io/v1alpha1
104+
apiVersion: olm.operatorframework.io/v1
105105
kind: ClusterExtension
106106
metadata:
107107
name: my-extension
@@ -194,7 +194,7 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera
194194
2. **Create a `ClusterExtension` with Catalog Selection**
195195

196196
```yaml
197-
apiVersion: olm.operatorframework.io/v1alpha1
197+
apiVersion: olm.operatorframework.io/v1
198198
kind: ClusterExtension
199199
metadata:
200200
name: install-my-operator

0 commit comments

Comments
 (0)