From 01b7fd5bdfe2ce2c848e630bf65b21110583f8f6 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Fri, 18 Mar 2022 11:59:15 -0700 Subject: [PATCH 1/8] Support nodeSelector field for non-sidecar collectors Signed-off-by: Jake Utley --- apis/v1alpha1/opentelemetrycollector_types.go | 5 +++++ apis/v1alpha1/zz_generated.deepcopy.go | 7 +++++++ .../bases/opentelemetry.io_opentelemetrycollectors.yaml | 6 ++++++ pkg/collector/daemonset.go | 1 + pkg/collector/deployment.go | 1 + pkg/collector/statefulset.go | 1 + 6 files changed, 21 insertions(+) diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go index 6f62b62b73..98dfa9e52a 100644 --- a/apis/v1alpha1/opentelemetrycollector_types.go +++ b/apis/v1alpha1/opentelemetrycollector_types.go @@ -112,6 +112,11 @@ type OpenTelemetryCollectorSpec struct { // +optional Tolerations []v1.Toleration `json:"tolerations,omitempty"` + // NodeSelector to schedule OpenTelemetry Collector pods. + // This is only relevant to daemonsets, statefulsets and deployments + // +optional + NodeSelector map[string]string `json:"nodeSelector,omitempty"` + // PodAnnotations is the set of annotations that will be attached to // Collector and Target Allocator pods. // +optional diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go index e2d1070709..90e3ae0a8e 100644 --- a/apis/v1alpha1/zz_generated.deepcopy.go +++ b/apis/v1alpha1/zz_generated.deepcopy.go @@ -330,6 +330,13 @@ func (in *OpenTelemetryCollectorSpec) DeepCopyInto(out *OpenTelemetryCollectorSp (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.NodeSelector != nil { + in, out := &in.NodeSelector, &out.NodeSelector + *out = make(map[string]string, len(*in)) + for key, val := range *in { + (*out)[key] = val + } + } if in.PodAnnotations != nil { in, out := &in.PodAnnotations, &out.PodAnnotations *out = make(map[string]string, len(*in)) diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml index 733ac90a83..9bb28e7234 100644 --- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml +++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml @@ -230,6 +230,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/pkg/collector/daemonset.go b/pkg/collector/daemonset.go index 9bbb9472b3..5af932957d 100644 --- a/pkg/collector/daemonset.go +++ b/pkg/collector/daemonset.go @@ -53,6 +53,7 @@ func DaemonSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelem Containers: []corev1.Container{Container(cfg, logger, otelcol)}, Volumes: Volumes(cfg, otelcol), Tolerations: otelcol.Spec.Tolerations, + NodeSelector: otelcol.Spec.NodeSelector, HostNetwork: otelcol.Spec.HostNetwork, DNSPolicy: getDnsPolicy(otelcol), SecurityContext: otelcol.Spec.PodSecurityContext, diff --git a/pkg/collector/deployment.go b/pkg/collector/deployment.go index 08da24b761..f69f6203fa 100644 --- a/pkg/collector/deployment.go +++ b/pkg/collector/deployment.go @@ -57,6 +57,7 @@ func Deployment(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTele DNSPolicy: getDnsPolicy(otelcol), HostNetwork: otelcol.Spec.HostNetwork, Tolerations: otelcol.Spec.Tolerations, + NodeSelector: otelcol.Spec.NodeSelector, SecurityContext: otelcol.Spec.PodSecurityContext, }, }, diff --git a/pkg/collector/statefulset.go b/pkg/collector/statefulset.go index 9d14e52218..04fe18b334 100644 --- a/pkg/collector/statefulset.go +++ b/pkg/collector/statefulset.go @@ -57,6 +57,7 @@ func StatefulSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTel DNSPolicy: getDnsPolicy(otelcol), HostNetwork: otelcol.Spec.HostNetwork, Tolerations: otelcol.Spec.Tolerations, + NodeSelector: otelcol.Spec.NodeSelector, SecurityContext: otelcol.Spec.PodSecurityContext, }, }, From 4fd85b11f9948c758d008a56bd36c3d3f546fac6 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Fri, 18 Mar 2022 12:11:45 -0700 Subject: [PATCH 2/8] Add tests for nodeSelector Signed-off-by: Jake Utley --- pkg/collector/daemonset_test.go | 33 +++++++++++++++++++++++++++++++ pkg/collector/deployment_test.go | 33 +++++++++++++++++++++++++++++++ pkg/collector/statefulset_test.go | 33 +++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+) diff --git a/pkg/collector/daemonset_test.go b/pkg/collector/daemonset_test.go index 910d9a34b1..992e1ec806 100644 --- a/pkg/collector/daemonset_test.go +++ b/pkg/collector/daemonset_test.go @@ -153,3 +153,36 @@ func TestDaemonsetFilterLabels(t *testing.T) { assert.NotContains(t, d.ObjectMeta.Labels, k) } } + +func TestDaemonSetNodeSelector(t *testing.T) { + // Test default + otelcol_1 := v1alpha1.OpenTelemetryCollector{ + ObjectMeta: metav1.ObjectMeta{ + Name: "my-instance", + }, + } + + cfg := config.New() + + d1 := DaemonSet(cfg, logger, otelcol_1) + + assert.Empty(t, d1.Spec.Template.Spec.NodeSelector) + + // Test nodeSelector + otelcol_2 := v1alpha1.OpenTelemetryCollector{ + ObjectMeta: metav1.ObjectMeta{ + Name: "my-instance-hostnetwork", + }, + Spec: v1alpha1.OpenTelemetryCollectorSpec{ + HostNetwork: true, + NodeSelector: map[string]string{ + "node-key": "node-value", + }, + }, + } + + cfg = config.New() + + d2 := DaemonSet(cfg, logger, otelcol_2) + assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"}) +} diff --git a/pkg/collector/deployment_test.go b/pkg/collector/deployment_test.go index 9555a454b4..34833b930b 100644 --- a/pkg/collector/deployment_test.go +++ b/pkg/collector/deployment_test.go @@ -175,3 +175,36 @@ func TestDeploymentFilterLabels(t *testing.T) { assert.NotContains(t, d.ObjectMeta.Labels, k) } } + +func TestDeploymentNodeSelector(t *testing.T) { + // Test default + otelcol_1 := v1alpha1.OpenTelemetryCollector{ + ObjectMeta: metav1.ObjectMeta{ + Name: "my-instance", + }, + } + + cfg := config.New() + + d1 := Deployment(cfg, logger, otelcol_1) + + assert.Empty(t, d1.Spec.Template.Spec.NodeSelector) + + // Test nodeSelector + otelcol_2 := v1alpha1.OpenTelemetryCollector{ + ObjectMeta: metav1.ObjectMeta{ + Name: "my-instance-hostnetwork", + }, + Spec: v1alpha1.OpenTelemetryCollectorSpec{ + HostNetwork: true, + NodeSelector: map[string]string{ + "node-key": "node-value", + }, + }, + } + + cfg = config.New() + + d2 := Deployment(cfg, logger, otelcol_2) + assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"}) +} diff --git a/pkg/collector/statefulset_test.go b/pkg/collector/statefulset_test.go index a016b83ce2..413c3437cf 100644 --- a/pkg/collector/statefulset_test.go +++ b/pkg/collector/statefulset_test.go @@ -234,3 +234,36 @@ func TestStatefulSetFilterLabels(t *testing.T) { assert.NotContains(t, d.ObjectMeta.Labels, k) } } + +func TestStatefulSetNodeSelector(t *testing.T) { + // Test default + otelcol_1 := v1alpha1.OpenTelemetryCollector{ + ObjectMeta: metav1.ObjectMeta{ + Name: "my-instance", + }, + } + + cfg := config.New() + + d1 := StatefulSet(cfg, logger, otelcol_1) + + assert.Empty(t, d1.Spec.Template.Spec.NodeSelector) + + // Test nodeSelector + otelcol_2 := v1alpha1.OpenTelemetryCollector{ + ObjectMeta: metav1.ObjectMeta{ + Name: "my-instance-hostnetwork", + }, + Spec: v1alpha1.OpenTelemetryCollectorSpec{ + HostNetwork: true, + NodeSelector: map[string]string{ + "node-key": "node-value", + }, + }, + } + + cfg = config.New() + + d2 := StatefulSet(cfg, logger, otelcol_2) + assert.Equal(t, d2.Spec.Template.Spec.NodeSelector, map[string]string{"node-key": "node-value"}) +} From 4574e7667a6b0fda387e14851c6f26e6186fec26 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Fri, 18 Mar 2022 13:58:32 -0700 Subject: [PATCH 3/8] Revise resource names in tests Signed-off-by: Jake Utley --- pkg/collector/daemonset_test.go | 2 +- pkg/collector/deployment_test.go | 2 +- pkg/collector/statefulset_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/collector/daemonset_test.go b/pkg/collector/daemonset_test.go index 992e1ec806..c007678938 100644 --- a/pkg/collector/daemonset_test.go +++ b/pkg/collector/daemonset_test.go @@ -171,7 +171,7 @@ func TestDaemonSetNodeSelector(t *testing.T) { // Test nodeSelector otelcol_2 := v1alpha1.OpenTelemetryCollector{ ObjectMeta: metav1.ObjectMeta{ - Name: "my-instance-hostnetwork", + Name: "my-instance-nodeselector", }, Spec: v1alpha1.OpenTelemetryCollectorSpec{ HostNetwork: true, diff --git a/pkg/collector/deployment_test.go b/pkg/collector/deployment_test.go index 34833b930b..9d880173fa 100644 --- a/pkg/collector/deployment_test.go +++ b/pkg/collector/deployment_test.go @@ -193,7 +193,7 @@ func TestDeploymentNodeSelector(t *testing.T) { // Test nodeSelector otelcol_2 := v1alpha1.OpenTelemetryCollector{ ObjectMeta: metav1.ObjectMeta{ - Name: "my-instance-hostnetwork", + Name: "my-instance-nodeselector", }, Spec: v1alpha1.OpenTelemetryCollectorSpec{ HostNetwork: true, diff --git a/pkg/collector/statefulset_test.go b/pkg/collector/statefulset_test.go index 413c3437cf..fb83cced26 100644 --- a/pkg/collector/statefulset_test.go +++ b/pkg/collector/statefulset_test.go @@ -252,7 +252,7 @@ func TestStatefulSetNodeSelector(t *testing.T) { // Test nodeSelector otelcol_2 := v1alpha1.OpenTelemetryCollector{ ObjectMeta: metav1.ObjectMeta{ - Name: "my-instance-hostnetwork", + Name: "my-instance-nodeselector", }, Spec: v1alpha1.OpenTelemetryCollectorSpec{ HostNetwork: true, From 6a004a3da14e243dc32791d4c9ab803dc799935f Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Mon, 21 Mar 2022 09:39:11 -0700 Subject: [PATCH 4/8] 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 From ab1c0dbd3c753370280520d815f6c422777a2648 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Mon, 21 Mar 2022 09:46:21 -0700 Subject: [PATCH 5/8] More automated changes after 'make test' Signed-off-by: Jake Utley --- .../opentelemetry-operator.clusterserviceversion.yaml | 8 ++++++++ docs/api.md | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index a7c008d5c9..1c84b6c46a 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -297,11 +297,15 @@ spec: - args: - --metrics-addr=127.0.0.1:8080 - --enable-leader-election +<<<<<<< HEAD <<<<<<< 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) +======= + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.46.0 +>>>>>>> 77029c2 (More automated changes after 'make test') livenessProbe: httpGet: path: /healthz @@ -393,11 +397,15 @@ spec: maturity: alpha provider: name: OpenTelemetry Community +<<<<<<< HEAD <<<<<<< HEAD version: 0.47.0 ======= version: 0.46.0-13-g4a3699a >>>>>>> c426cd0 (Run make bundle) +======= + version: 0.46.0 +>>>>>>> 77029c2 (More automated changes after 'make test') webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/docs/api.md b/docs/api.md index 7bcf038609..0f63682c56 100644 --- a/docs/api.md +++ b/docs/api.md @@ -1464,6 +1464,13 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector. Enum: daemonset, deployment, sidecar, statefulset
false + + nodeSelector + map[string]string + + NodeSelector to schedule OpenTelemetry Collector pods. This is only relevant to daemonsets, statefulsets and deployments
+ + false podAnnotations map[string]string From e9b9b9b3691b6536198708ad71ec1b2341079af5 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Tue, 22 Mar 2022 15:13:23 -0700 Subject: [PATCH 6/8] Manually revert changes to kustomization.yaml Signed-off-by: Jake Utley --- config/manager/kustomization.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 3d0ef219af..7394a6d059 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -1,8 +1,2 @@ resources: -- 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 + - manager.yaml From 573cffda312523f03818d95fe8d678a39d8ff1d8 Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Fri, 25 Mar 2022 08:44:57 -0700 Subject: [PATCH 7/8] Revise field description Signed-off-by: Jake Utley --- apis/v1alpha1/opentelemetrycollector_types.go | 4 ++-- ...lemetry-operator.clusterserviceversion.yaml | 18 +----------------- ...entelemetry.io_opentelemetrycollectors.yaml | 6 ++++-- ...entelemetry.io_opentelemetrycollectors.yaml | 6 ++++-- docs/api.md | 4 ++-- 5 files changed, 13 insertions(+), 25 deletions(-) diff --git a/apis/v1alpha1/opentelemetrycollector_types.go b/apis/v1alpha1/opentelemetrycollector_types.go index 98dfa9e52a..b20332d658 100644 --- a/apis/v1alpha1/opentelemetrycollector_types.go +++ b/apis/v1alpha1/opentelemetrycollector_types.go @@ -108,12 +108,12 @@ type OpenTelemetryCollectorSpec struct { Resources v1.ResourceRequirements `json:"resources,omitempty"` // Toleration to schedule OpenTelemetry Collector pods. - // This is only relevant to daemonsets, statefulsets and deployments + // This is only relevant to daemonset, statefulset, and deployment mode // +optional Tolerations []v1.Toleration `json:"tolerations,omitempty"` // NodeSelector to schedule OpenTelemetry Collector pods. - // This is only relevant to daemonsets, statefulsets and deployments + // This is only relevant to daemonset, statefulset, and deployment mode // +optional NodeSelector map[string]string `json:"nodeSelector,omitempty"` diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index 1c84b6c46a..c642a4434c 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -297,15 +297,7 @@ spec: - args: - --metrics-addr=127.0.0.1:8080 - --enable-leader-election -<<<<<<< HEAD -<<<<<<< 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) -======= - image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.46.0 ->>>>>>> 77029c2 (More automated changes after 'make test') + image: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator:0.47.0 livenessProbe: httpGet: path: /healthz @@ -397,15 +389,7 @@ spec: maturity: alpha provider: name: OpenTelemetry Community -<<<<<<< HEAD -<<<<<<< HEAD version: 0.47.0 -======= - version: 0.46.0-13-g4a3699a ->>>>>>> c426cd0 (Run make bundle) -======= - version: 0.46.0 ->>>>>>> 77029c2 (More automated changes after 'make test') webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml index c44b19f5ed..871fb595ad 100644 --- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml +++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml @@ -236,7 +236,8 @@ spec: additionalProperties: type: string description: NodeSelector to schedule OpenTelemetry Collector pods. - This is only relevant to daemonsets, statefulsets and deployments + This is only relevant to daemonset, statefulset, and deployment + mode type: object podAnnotations: additionalProperties: @@ -682,7 +683,8 @@ spec: type: object tolerations: description: Toleration to schedule OpenTelemetry Collector pods. - This is only relevant to daemonsets, statefulsets and deployments + This is only relevant to daemonset, statefulset, and deployment + mode items: description: The pod this Toleration is attached to tolerates any taint that matches the triple using the matching diff --git a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml index 9bb28e7234..1621d0e6f0 100644 --- a/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml +++ b/config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml @@ -234,7 +234,8 @@ spec: additionalProperties: type: string description: NodeSelector to schedule OpenTelemetry Collector pods. - This is only relevant to daemonsets, statefulsets and deployments + This is only relevant to daemonset, statefulset, and deployment + mode type: object podAnnotations: additionalProperties: @@ -680,7 +681,8 @@ spec: type: object tolerations: description: Toleration to schedule OpenTelemetry Collector pods. - This is only relevant to daemonsets, statefulsets and deployments + This is only relevant to daemonset, statefulset, and deployment + mode items: description: The pod this Toleration is attached to tolerates any taint that matches the triple using the matching diff --git a/docs/api.md b/docs/api.md index 0f63682c56..dd4693b9c7 100644 --- a/docs/api.md +++ b/docs/api.md @@ -1468,7 +1468,7 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector. nodeSelector map[string]string - NodeSelector to schedule OpenTelemetry Collector pods. This is only relevant to daemonsets, statefulsets and deployments
+ NodeSelector to schedule OpenTelemetry Collector pods. This is only relevant to daemonset, statefulset, and deployment mode
false @@ -1533,7 +1533,7 @@ OpenTelemetryCollectorSpec defines the desired state of OpenTelemetryCollector. tolerations []object - Toleration to schedule OpenTelemetry Collector pods. This is only relevant to daemonsets, statefulsets and deployments
+ Toleration to schedule OpenTelemetry Collector pods. This is only relevant to daemonset, statefulset, and deployment mode
false From 92a114619b4971da84300618efa2cbc0398c0d5e Mon Sep 17 00:00:00 2001 From: Jake Utley Date: Fri, 25 Mar 2022 08:50:00 -0700 Subject: [PATCH 8/8] Use open-telemetry image repo Signed-off-by: Jake Utley --- .../manifests/opentelemetry-operator.clusterserviceversion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index c642a4434c..8700d742da 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -297,7 +297,7 @@ spec: - args: - --metrics-addr=127.0.0.1:8080 - --enable-leader-election - image: ghcr.io/jutley/opentelemetry-operator/opentelemetry-operator:0.47.0 + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.47.0 livenessProbe: httpGet: path: /healthz