Skip to content

Commit 32498f1

Browse files
perdasilvaPer Goncalves da Silvaeverettraven
authored
⚠️ Bump catalogd to v1 (#1441)
* Bump catalogd to v1 Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> * update catalogd dep to v1.0.0-rc1 Signed-off-by: everettraven <everettraven@gmail.com> * run make verify to regenerate generated content Signed-off-by: everettraven <everettraven@gmail.com> --------- Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com> Signed-off-by: everettraven <everettraven@gmail.com> Co-authored-by: Per Goncalves da Silva <pegoncal@redhat.com> Co-authored-by: everettraven <everettraven@gmail.com>
1 parent cb08ad4 commit 32498f1

21 files changed

+33
-41
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
ocv1 "github.com/operator-framework/operator-controller/api/v1"

‎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/api-reference/catalogd-api-reference.md

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
# API Reference
22

33
## Packages
4-
- [olm.operatorframework.io/core](#olmoperatorframeworkiocore)
5-
- [olm.operatorframework.io/v1alpha1](#olmoperatorframeworkiov1alpha1)
4+
- [olm.operatorframework.io/v1](#olmoperatorframeworkiov1)
65

76

8-
## olm.operatorframework.io/core
7+
## olm.operatorframework.io/v1
98

10-
Package api is the internal version of the API.
11-
12-
13-
14-
15-
## olm.operatorframework.io/v1alpha1
16-
17-
Package v1alpha1 contains API Schema definitions for the core v1alpha1 API group
9+
Package v1 contains API Schema definitions for the core v1 API group
1810

1911
### Resource Types
2012
- [ClusterCatalog](#clustercatalog)
@@ -71,7 +63,7 @@ _Appears in:_
7163

7264
| Field | Description | Default | Validation |
7365
| --- | --- | --- | --- |
74-
| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | |
66+
| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | |
7567
| `kind` _string_ | `ClusterCatalog` | | |
7668
| `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 | | |
7769
| `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 | | |
@@ -92,7 +84,7 @@ ClusterCatalogList contains a list of ClusterCatalog
9284

9385
| Field | Description | Default | Validation |
9486
| --- | --- | --- | --- |
95-
| `apiVersion` _string_ | `olm.operatorframework.io/v1alpha1` | | |
87+
| `apiVersion` _string_ | `olm.operatorframework.io/v1` | | |
9688
| `kind` _string_ | `ClusterCatalogList` | | |
9789
| `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 | | |
9890
| `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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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/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 v1.0.0-rc1
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 v1.0.0-rc1 h1:wuM8yLy52lwrfyVJJ++l8zV+pxJOnuQLC84fO0UTbts=
539+
github.com/operator-framework/catalogd v1.0.0-rc1/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

‎internal/catalogmetadata/client/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/stretchr/testify/require"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616

17-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
17+
catalogd "github.com/operator-framework/catalogd/api/v1"
1818
"github.com/operator-framework/operator-registry/alpha/declcfg"
1919

2020
catalogClient "github.com/operator-framework/operator-controller/internal/catalogmetadata/client"

‎internal/controllers/clustercatalog_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
ctrl "sigs.k8s.io/controller-runtime"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727

28-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
28+
catalogd "github.com/operator-framework/catalogd/api/v1"
2929
)
3030

3131
type CatalogCache interface {

‎internal/controllers/clustercatalog_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
ctrl "sigs.k8s.io/controller-runtime"
1515
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1616

17-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
17+
catalogd "github.com/operator-framework/catalogd/api/v1"
1818

1919
"github.com/operator-framework/operator-controller/internal/controllers"
2020
"github.com/operator-framework/operator-controller/internal/scheme"

‎internal/controllers/clusterextension_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4646

4747
"github.com/operator-framework/api/pkg/operators/v1alpha1"
48-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
48+
catalogd "github.com/operator-framework/catalogd/api/v1"
4949
helmclient "github.com/operator-framework/helm-operator-plugins/pkg/client"
5050
"github.com/operator-framework/operator-registry/alpha/declcfg"
5151

‎internal/resolve/catalog.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616
"sigs.k8s.io/controller-runtime/pkg/log"
1717

18-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
18+
catalogd "github.com/operator-framework/catalogd/api/v1"
1919
"github.com/operator-framework/operator-registry/alpha/declcfg"
2020

2121
ocv1 "github.com/operator-framework/operator-controller/api/v1"

‎internal/resolve/catalog_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"k8s.io/utils/ptr"
1717
"sigs.k8s.io/controller-runtime/pkg/client"
1818

19-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
19+
catalogd "github.com/operator-framework/catalogd/api/v1"
2020
"github.com/operator-framework/operator-registry/alpha/declcfg"
2121
"github.com/operator-framework/operator-registry/alpha/property"
2222

‎internal/scheme/scheme.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
88
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
99

10-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
10+
catalogd "github.com/operator-framework/catalogd/api/v1"
1111

1212
ocv1 "github.com/operator-framework/operator-controller/api/v1"
1313
)

‎test/e2e/cluster_extension_install_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/utils/env"
2929
"sigs.k8s.io/controller-runtime/pkg/client"
3030

31-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
31+
catalogd "github.com/operator-framework/catalogd/api/v1"
3232

3333
ocv1 "github.com/operator-framework/operator-controller/api/v1"
3434
)

‎test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
ctrl "sigs.k8s.io/controller-runtime"
1414
"sigs.k8s.io/controller-runtime/pkg/client"
1515

16-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
16+
catalogd "github.com/operator-framework/catalogd/api/v1"
1717

1818
"github.com/operator-framework/operator-controller/internal/scheme"
1919
)

‎test/extension-developer-e2e/extension_developer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
ctrl "sigs.k8s.io/controller-runtime"
1919
"sigs.k8s.io/controller-runtime/pkg/client"
2020

21-
catalogd "github.com/operator-framework/catalogd/api/core/v1alpha1"
21+
catalogd "github.com/operator-framework/catalogd/api/v1"
2222

2323
ocv1 "github.com/operator-framework/operator-controller/api/v1"
2424
)

‎test/upgrade-e2e/post_upgrade_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"k8s.io/apimachinery/pkg/types"
1919
"sigs.k8s.io/controller-runtime/pkg/client"
2020

21-
catalogdv1alpha1 "github.com/operator-framework/catalogd/api/core/v1alpha1"
21+
catalogd "github.com/operator-framework/catalogd/api/v1"
2222

2323
ocv1 "github.com/operator-framework/operator-controller/api/v1"
2424
)
@@ -65,14 +65,14 @@ func TestClusterExtensionAfterOLMUpgrade(t *testing.T) {
6565

6666
t.Log("Checking that the ClusterCatalog is serving")
6767
require.EventuallyWithT(t, func(ct *assert.CollectT) {
68-
var clusterCatalog catalogdv1alpha1.ClusterCatalog
68+
var clusterCatalog catalogd.ClusterCatalog
6969
assert.NoError(ct, c.Get(ctx, types.NamespacedName{Name: testClusterCatalogName}, &clusterCatalog))
70-
cond := apimeta.FindStatusCondition(clusterCatalog.Status.Conditions, catalogdv1alpha1.TypeServing)
70+
cond := apimeta.FindStatusCondition(clusterCatalog.Status.Conditions, catalogd.TypeServing)
7171
if !assert.NotNil(ct, cond) {
7272
return
7373
}
7474
assert.Equal(ct, metav1.ConditionTrue, cond.Status)
75-
assert.Equal(ct, catalogdv1alpha1.ReasonAvailable, cond.Reason)
75+
assert.Equal(ct, catalogd.ReasonAvailable, cond.Reason)
7676
}, time.Minute, time.Second)
7777

7878
t.Log("Checking that the ClusterExtension is installed")

0 commit comments

Comments
 (0)