Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump otelcol version #30

Merged
merged 3 commits into from
Feb 13, 2024
Merged

chore(deps): bump otelcol version #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7de1911
chore(deps): bump otelcol version
OverOrion Feb 8, 2024
e9ff5a5
fix(kustomize): follow-up for image renaming
OverOrion Feb 9, 2024
7193efd
chore(deps): follow up for 'GRPCClientSettings, use ClientConfig inst…
OverOrion Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api/telemetry/v1alpha1/oteloutput_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions api/telemetry/v1alpha1/otlp_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
58 changes: 29 additions & 29 deletions api/telemetry/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion internal/controller/telemetry/collector_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
{
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/telemetry/otel_conf_gen_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Loading