Merge pull request #30 from kube-logging/otelcol-version-bump

chore(deps): bump otelcol version
kube-logging · Feb 13, 2024 · cc58a64 · cc58a64
2 parents aa9bc75 + 7193efd
commit cc58a64
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 39 deletions.
diff --git a/api/telemetry/v1alpha1/oteloutput_types.go b/api/telemetry/v1alpha1/oteloutput_types.go
@@ -32,10 +32,10 @@ type OtelOutputSpec struct {
 
 // OTLP grpc exporter config ref: https://github.com/open-telemetry/opentelemetry-collector/blob/main/exporter/otlpexporter/config.go
 type OTLPgrpc struct {
-	QueueConfig        QueueSettings `json:"sending_queue,omitempty" yaml:"sending_queue,omitempty"`
-	RetryConfig        BackOffConfig `json:"retry_on_failure,omitempty" yaml:"retry_on_failure,omitempty"`
-	TimeoutSettings    `json:",inline" yaml:",inline"`
-	GRPCClientSettings `json:",inline" yaml:",inline"`
+	QueueConfig     QueueSettings `json:"sending_queue,omitempty" yaml:"sending_queue,omitempty"`
+	RetryConfig     BackOffConfig `json:"retry_on_failure,omitempty" yaml:"retry_on_failure,omitempty"`
+	TimeoutSettings `json:",inline" yaml:",inline"`
+	ClientConfig    `json:",inline" yaml:",inline"`
 }
 
 // OtelOutputStatus defines the observed state of OtelOutput

diff --git a/api/telemetry/v1alpha1/otlp_config.go b/api/telemetry/v1alpha1/otlp_config.go
@@ -68,8 +68,8 @@ type KeepaliveClientConfig struct {
 	PermitWithoutStream bool          `json:"permit_without_stream,omitempty" yaml:"permit_without_stream,omitempty"`
 }
 
-// GRPCClientSettings defines common settings for a gRPC client configuration.
-type GRPCClientSettings struct {
+// ClientConfig defines common settings for a gRPC client configuration.
+type ClientConfig struct {
 	// The target to which the exporter is going to send traces or metrics,
 	// using the gRPC protocol. The valid syntax is described at
 	// https://github.com/grpc/grpc/blob/master/doc/naming.md.

diff --git a/api/telemetry/v1alpha1/zz_generated.deepcopy.go b/api/telemetry/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ghcr.io/kube-logging/telemetry-controller
+  newName: controller
   newTag: latest
diff --git a/internal/controller/telemetry/collector_controller.go b/internal/controller/telemetry/collector_controller.go
@@ -211,7 +211,7 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		Spec: otelv1alpha1.OpenTelemetryCollectorSpec{
 			Config:         otelConfig,
 			Mode:           otelv1alpha1.ModeDaemonSet,
-			Image:          "otel/opentelemetry-collector-contrib:0.93.0",
+			Image:          "otel/opentelemetry-collector-contrib:0.94.0",
 			ServiceAccount: saName.Name,
 			VolumeMounts: []apiv1.VolumeMount{
 				{

diff --git a/internal/controller/telemetry/otel_conf_gen_test.go b/internal/controller/telemetry/otel_conf_gen_test.go
@@ -98,7 +98,7 @@ func TestOtelColConfComplex(t *testing.T) {
 				},
 				Spec: v1alpha1.OtelOutputSpec{
 					OTLP: v1alpha1.OTLPgrpc{
-						GRPCClientSettings: v1alpha1.GRPCClientSettings{
+						ClientConfig: v1alpha1.ClientConfig{
 							Endpoint: "receiver-collector.example-tenant-ns.svc.cluster.local:4317",
 							TLSSetting: v1alpha1.TLSClientSetting{
 								Insecure: true,
@@ -114,7 +114,7 @@ func TestOtelColConfComplex(t *testing.T) {
 				},
 				Spec: v1alpha1.OtelOutputSpec{
 					OTLP: v1alpha1.OTLPgrpc{
-						GRPCClientSettings: v1alpha1.GRPCClientSettings{
+						ClientConfig: v1alpha1.ClientConfig{
 							Endpoint: "receiver-collector.example-tenant-ns.svc.cluster.local:4317",
 							TLSSetting: v1alpha1.TLSClientSetting{
 								Insecure: true,