diff --git a/operators/multiclusterobservability/Makefile b/operators/multiclusterobservability/Makefile index 7199467e19..c32077550a 100644 --- a/operators/multiclusterobservability/Makefile +++ b/operators/multiclusterobservability/Makefile @@ -41,7 +41,7 @@ BUNDLE_IMG ?= controller-bundle:$(VERSION) # Image URL to use all building/pushing image targets IMG ?= quay.io/stolostron/multicluster-observability-operator:latest # Produce CRDs that work back to Kubernetes 1.11 (no version conversion) -CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false" +CRD_OPTIONS ?= "crd" # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/operators/multiclusterobservability/bundle/manifests/multicluster-observability-operator.clusterserviceversion.yaml b/operators/multiclusterobservability/bundle/manifests/multicluster-observability-operator.clusterserviceversion.yaml index 3e246bdc08..688f892aec 100644 --- a/operators/multiclusterobservability/bundle/manifests/multicluster-observability-operator.clusterserviceversion.yaml +++ b/operators/multiclusterobservability/bundle/manifests/multicluster-observability-operator.clusterserviceversion.yaml @@ -49,7 +49,7 @@ metadata: } ] capabilities: Basic Install - createdAt: "2023-12-11T07:57:04Z" + createdAt: "2023-12-11T10:33:35Z" operators.operatorframework.io/builder: operator-sdk-v1.32.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 name: multicluster-observability-operator.v0.1.0 diff --git a/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_multiclusterobservabilities.yaml b/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_multiclusterobservabilities.yaml index 81e81c20ba..f881043d33 100644 --- a/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_multiclusterobservabilities.yaml +++ b/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_multiclusterobservabilities.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 + controller-gen.kubebuilder.io/version: v0.13.0 service.beta.openshift.io/inject-cabundle: "true" creationTimestamp: null name: multiclusterobservabilities.observability.open-cluster-management.io @@ -199,9 +199,9 @@ spec: type: string statefulSetStorageClass: default: gp2 - description: "\tSpecify the storageClass Stateful Sets. This storage + description: Specify the storageClass Stateful Sets. This storage class will also be used for Object Storage if MetricObjectStorage - was configured for the system to create the storage." + was configured for the system to create the storage. type: string type: object tolerations: @@ -1406,5 +1406,5 @@ status: acceptedNames: kind: "" plural: "" - conditions: [] - storedVersions: [] + conditions: null + storedVersions: null diff --git a/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_observabilityaddons.yaml b/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_observabilityaddons.yaml index 0b6328a4a5..f21dde0a4f 100644 --- a/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_observabilityaddons.yaml +++ b/operators/multiclusterobservability/bundle/manifests/observability.open-cluster-management.io_observabilityaddons.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 + controller-gen.kubebuilder.io/version: v0.13.0 creationTimestamp: null name: observabilityaddons.observability.open-cluster-management.io spec: @@ -136,5 +136,5 @@ status: acceptedNames: kind: "" plural: "" - conditions: [] - storedVersions: [] + conditions: null + storedVersions: null diff --git a/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_multiclusterobservabilities.yaml b/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_multiclusterobservabilities.yaml index 538f7998d8..7664a5abd5 100644 --- a/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_multiclusterobservabilities.yaml +++ b/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_multiclusterobservabilities.yaml @@ -1,11 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: multiclusterobservabilities.observability.open-cluster-management.io spec: group: observability.open-cluster-management.io @@ -183,9 +181,9 @@ spec: type: string statefulSetStorageClass: default: gp2 - description: "\tSpecify the storageClass Stateful Sets. This storage + description: Specify the storageClass Stateful Sets. This storage class will also be used for Object Storage if MetricObjectStorage - was configured for the system to create the storage." + was configured for the system to create the storage. type: string type: object tolerations: @@ -1388,9 +1386,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml b/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml index 6ae419db2a..05331357d0 100644 --- a/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml +++ b/operators/multiclusterobservability/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml @@ -1,11 +1,9 @@ - --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.13.0 name: observabilityaddons.observability.open-cluster-management.io spec: group: observability.open-cluster-management.io @@ -134,9 +132,3 @@ spec: storage: true subresources: status: {} -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/operators/multiclusterobservability/config/rbac/role.yaml b/operators/multiclusterobservability/config/rbac/role.yaml index 8f94993a97..453c9564f3 100644 --- a/operators/multiclusterobservability/config/rbac/role.yaml +++ b/operators/multiclusterobservability/config/rbac/role.yaml @@ -1,9 +1,7 @@ - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/operators/multiclusterobservability/config/webhook/manifests.yaml b/operators/multiclusterobservability/config/webhook/manifests.yaml index 2fe3672650..caad857a8f 100644 --- a/operators/multiclusterobservability/config/webhook/manifests.yaml +++ b/operators/multiclusterobservability/config/webhook/manifests.yaml @@ -1,9 +1,7 @@ - --- apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: