Skip to content

Commit 1011ce2

Browse files
author
Per Goncalves da Silva
committed
Bump catalogd to v1
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 6c2be08 commit 1011ce2

File tree

21 files changed

+31
-31
lines changed

21 files changed

+31
-31
lines changed

‎cmd/manager/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
"sigs.k8s.io/controller-runtime/pkg/healthz"
4747
"sigs.k8s.io/controller-runtime/pkg/metrics/server"
4848

49-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
49+
catalogd "github.com/operator-framework/catalogd/api/v1"
5050
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
5151

5252
ocv1alpha1 "github.com/operator-framework/operator-controller/api/v1alpha1"

‎config/samples/catalogd_operatorcatalog.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: olm.operatorframework.io/v1alpha1
1+
apiVersion: olm.operatorframework.io/v1
22
kind: ClusterCatalog
33
metadata:
44
name: operatorhubio

‎docs/concepts/controlling-catalog-selection.md‎

Lines changed: 5 additions & 5 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
@@ -125,7 +125,7 @@ When multiple catalogs provide the same package, you can set priorities to resol
125125
In your `ClusterCatalog` resource, set the `priority` field:
126126

127127
```yaml
128-
apiVersion: olm.operatorframework.io/v1alpha1
128+
apiVersion: olm.operatorframework.io/v1
129129
kind: ClusterCatalog
130130
metadata:
131131
name: high-priority-catalog
@@ -160,7 +160,7 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera
160160
1. **Create or Update `ClusterCatalogs` with Appropriate Labels and Priority**
161161

162162
```yaml
163-
apiVersion: olm.operatorframework.io/v1alpha1
163+
apiVersion: olm.operatorframework.io/v1
164164
kind: ClusterCatalog
165165
metadata:
166166
name: catalog-a
@@ -175,7 +175,7 @@ If the system cannot resolve to a single bundle due to ambiguity, it will genera
175175
```
176176

177177
```yaml
178-
apiVersion: olm.operatorframework.io/v1alpha1
178+
apiVersion: olm.operatorframework.io/v1
179179
kind: ClusterCatalog
180180
metadata:
181181
name: catalog-b

‎docs/getting-started/olmv1_getting_started.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To create the catalog, run the following command:
3535
```bash
3636
# Create ClusterCatalog
3737
kubectl apply -f - <<EOF
38-
apiVersion: olm.operatorframework.io/v1alpha1
38+
apiVersion: olm.operatorframework.io/v1
3939
kind: ClusterCatalog
4040
metadata:
4141
name: operatorhubio

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Set the version for the desired package in the Catalog source to a comparison st
55
Example:
66

77
```yaml
8-
apiVersion: olm.operatorframework.io/v1alpha1
8+
apiVersion: olm.operatorframework.io/v1
99
kind: ClusterExtension
1010
metadata:
1111
name: argocd

‎docs/tutorials/add-catalog.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
2626
1. Create a catalog custom resource (CR):
2727

2828
``` yaml title="clustercatalog_cr.yaml"
29-
apiVersion: olm.operatorframework.io/v1alpha1
29+
apiVersion: olm.operatorframework.io/v1
3030
kind: ClusterCatalog
3131
metadata:
3232
name: operatorhubio
@@ -48,7 +48,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
4848
To disable polling, set a zero value, such as `0s`.
4949

5050
``` yaml title="Example `operatorhubio.yaml` CR"
51-
apiVersion: olm.operatorframework.io/v1alpha1
51+
apiVersion: olm.operatorframework.io/v1
5252
kind: ClusterCatalog
5353
metadata:
5454
name: operatorhub
@@ -96,7 +96,7 @@ This catalog is distributed as an image [quay.io/operatorhubio/catalog](https://
9696
Namespace:
9797
Labels: olm.operatorframework.io/metadata.name=operatorhubio
9898
Annotations: <none>
99-
API Version: olm.operatorframework.io/v1alpha1
99+
API Version: olm.operatorframework.io/v1
100100
Kind: ClusterCatalog
101101
Metadata:
102102
Creation Timestamp: 2024-10-02T19:51:24Z

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/onsi/gomega v1.35.1
1818
github.com/opencontainers/go-digest v1.0.0
1919
github.com/operator-framework/api v0.27.0
20-
github.com/operator-framework/catalogd v0.36.0
20+
github.com/operator-framework/catalogd v0.36.1-0.20241108223325-2f96c573d5a8
2121
github.com/operator-framework/helm-operator-plugins v0.7.0
2222
github.com/operator-framework/operator-registry v1.48.0
2323
github.com/spf13/pflag v1.0.5

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11 h1:eT
535535
github.com/openshift/crd-schema-checker v0.0.0-20240404194209-35a9033b1d11/go.mod h1:EmVJt97N+pfWFsli/ipXTBZqSG5F5KGQhm3c3IsGq1o=
536536
github.com/operator-framework/api v0.27.0 h1:OrVaGKZJvbZo58HTv2guz7aURkhVKYhFqZ/6VpifiXI=
537537
github.com/operator-framework/api v0.27.0/go.mod h1:lg2Xx+S8NQWGYlEOvFwQvH46E5EK5IrAIL7HWfAhciM=
538-
github.com/operator-framework/catalogd v0.36.0 h1:4ySpKitCooKPpTqQon/2dIGR7oEOIee8WYrRYwwQZ00=
539-
github.com/operator-framework/catalogd v0.36.0/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
538+
github.com/operator-framework/catalogd v0.36.1-0.20241108223325-2f96c573d5a8 h1:xAxHpe5YCHPF1Z1iVR3NAY4S5vjRBbSHlF6QYzen0EU=
539+
github.com/operator-framework/catalogd v0.36.1-0.20241108223325-2f96c573d5a8/go.mod h1:ERq4C2ksfkf3wu3XmtGP2fIkBSqS6LfaHhtcSEcU7Ww=
540540
github.com/operator-framework/helm-operator-plugins v0.7.0 h1:YmtIWFc9BaNaDc5mk/dkG0P2BqPZOqpDvjWih5Fczuk=
541541
github.com/operator-framework/helm-operator-plugins v0.7.0/go.mod h1:fUUCJR3bWtMBZ1qdDhbwjacsBHi9uT576tF4u/DwOgQ=
542542
github.com/operator-framework/operator-lib v0.15.0 h1:0QeRM4PMtThqINpcFGCEBnIV3Z8u7/8fYLEx6mUtdcM=

‎hack/test/pre-upgrade-setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TEST_CLUSTER_CATALOG_NAME=$2
2020
TEST_CLUSTER_EXTENSION_NAME=$3
2121

2222
kubectl apply -f - << EOF
23-
apiVersion: olm.operatorframework.io/v1alpha1
23+
apiVersion: olm.operatorframework.io/v1
2424
kind: ClusterCatalog
2525
metadata:
2626
name: ${TEST_CLUSTER_CATALOG_NAME}

‎internal/catalogmetadata/client/client.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"k8s.io/apimachinery/pkg/api/meta"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1414

15-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
15+
catalogd "github.com/operator-framework/catalogd/api/v1"
1616
"github.com/operator-framework/operator-registry/alpha/declcfg"
1717
)
1818

0 commit comments

Comments
 (0)