From 9d369c729390c54e8da61ce6768aa19e5ce97e86 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Mon, 21 Mar 2022 09:39:11 -0700 Subject: [PATCH] Run make bundle Signed-off-by: Jake Utley --- .../opentelemetry-operator.clusterserviceversion.yaml | 8 ++++++++ .../opentelemetry.io_opentelemetrycollectors.yaml | 6 ++++++ config/manager/kustomization.yaml | 8 +++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index 8700d742da..a7c008d5c9 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -297,7 +297,11 @@ spec: - args: - --metrics-addr=127.0.0.1:8080 - --enable-leader-election +<<<<<<< HEAD image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0 +======= + image: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator:0.46.0-13-g4a3699a +>>>>>>> c426cd0 (Run make bundle) livenessProbe: httpGet: path: /healthz @@ -389,7 +393,11 @@ spec: maturity: alpha provider: name: OpenTelemetry Community +<<<<<<< HEAD version: 0.47.0 +======= + version: 0.46.0-13-g4a3699a +>>>>>>> c426cd0 (Run make bundle) webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml index 90c6203964..c44b19f5ed 100644 --- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml +++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml @@ -232,6 +232,12 @@ spec: - sidecar - statefulset type: string + nodeSelector: + additionalProperties: + type: string + description: NodeSelector to schedule OpenTelemetry Collector pods. + This is only relevant to daemonsets, statefulsets and deployments + type: object podAnnotations: additionalProperties: type: string diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 7394a6d059..3d0ef219af 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,2 +1,8 @@ resources: - - manager.yaml +- manager.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: controller + newName: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator + newTag: 0.46.0-13-g4a3699a