From 89157ee111a4dfed9ce100dacd2947e50f8f450a Mon Sep 17 00:00:00 2001 From: Joe Lanford Date: Thu, 3 Jul 2025 16:24:43 -0400 Subject: [PATCH] crd-generator annotation text: generated -> generator Signed-off-by: Joe Lanford --- .../olm.operatorframework.io_clustercatalogs.yaml | 2 +- .../standard/olm.operatorframework.io_clustercatalogs.yaml | 2 +- .../olm.operatorframework.io_clusterextensions.yaml | 2 +- .../standard/olm.operatorframework.io_clusterextensions.yaml | 2 +- hack/tools/crd-generator/main.go | 2 +- .../olm.operatorframework.io_clusterextensions.yaml | 2 +- .../standard/olm.operatorframework.io_clusterextensions.yaml | 2 +- manifests/experimental-e2e.yaml | 4 ++-- manifests/experimental.yaml | 4 ++-- manifests/standard-e2e.yaml | 4 ++-- manifests/standard.yaml | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml b/config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml index 08a76e1089..2d5722a47d 100644 --- a/config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml +++ b/config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clustercatalogs.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml b/config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml index 09b8c85db3..cde14b13b1 100644 --- a/config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml +++ b/config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clustercatalogs.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml b/config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml index 9dc0e3a7ea..162683603d 100644 --- a/config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml +++ b/config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml b/config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml index 1579ed1ea7..18faa59789 100644 --- a/config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml +++ b/config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/hack/tools/crd-generator/main.go b/hack/tools/crd-generator/main.go index 9edc0d6b19..9687489f45 100644 --- a/hack/tools/crd-generator/main.go +++ b/hack/tools/crd-generator/main.go @@ -35,7 +35,7 @@ import ( const ( // FeatureSetAnnotation is the annotation key used in the Operator-Controller API CRDs to specify // the installed Operator-Controller API channel. - GeneratorAnnotation = "olm.operatorframework.io/generated" + GeneratorAnnotation = "olm.operatorframework.io/generator" VersionAnnotation = "controller-gen.kubebuilder.io/version" StandardChannel = "standard" ExperimentalChannel = "experimental" diff --git a/hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml b/hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml index add3ef0a95..0b72d59c70 100644 --- a/hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml +++ b/hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml b/hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml index 6974dada86..276484101c 100644 --- a/hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml +++ b/hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml @@ -4,7 +4,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/manifests/experimental-e2e.yaml b/manifests/experimental-e2e.yaml index 65f966f0e4..dab56aec0e 100644 --- a/manifests/experimental-e2e.yaml +++ b/manifests/experimental-e2e.yaml @@ -15,7 +15,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: experimental - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clustercatalogs.olm.operatorframework.io spec: group: olm.operatorframework.io @@ -458,7 +458,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: experimental - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/manifests/experimental.yaml b/manifests/experimental.yaml index a1b0b47708..60e2156e98 100644 --- a/manifests/experimental.yaml +++ b/manifests/experimental.yaml @@ -15,7 +15,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: experimental - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clustercatalogs.olm.operatorframework.io spec: group: olm.operatorframework.io @@ -458,7 +458,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: experimental - olm.operatorframework.io/generated: experimental + olm.operatorframework.io/generator: experimental name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/manifests/standard-e2e.yaml b/manifests/standard-e2e.yaml index b028d3f2f4..a8aff9838e 100644 --- a/manifests/standard-e2e.yaml +++ b/manifests/standard-e2e.yaml @@ -15,7 +15,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: standard-e2e - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clustercatalogs.olm.operatorframework.io spec: group: olm.operatorframework.io @@ -458,7 +458,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: standard-e2e - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io diff --git a/manifests/standard.yaml b/manifests/standard.yaml index 69f3c55832..fa25463055 100644 --- a/manifests/standard.yaml +++ b/manifests/standard.yaml @@ -15,7 +15,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: standard - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clustercatalogs.olm.operatorframework.io spec: group: olm.operatorframework.io @@ -458,7 +458,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.18.0 olm.operatorframework.io/feature-set: standard - olm.operatorframework.io/generated: standard + olm.operatorframework.io/generator: standard name: clusterextensions.olm.operatorframework.io spec: group: olm.operatorframework.io