Skip to content

Commit b8056d1

Browse files
iblancasaiblancasa
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-operator into feature/3149
2 parents a26c876 + 1e35932 commit b8056d1

File tree

3 files changed

+108
-108
lines changed

3 files changed

+108
-108
lines changed

‎Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ scorecard-tests: operator-sdk
335335
.PHONY: container
336336
container: GOOS = linux
337337
container: manager must-gather
338-
docker build -t ${IMG} .
338+
docker build --load -t ${IMG} .
339339

340340
# Push the container image, used only for local dev purposes
341341
.PHONY: container-push
@@ -353,17 +353,17 @@ container-operator-opamp-bridge-push:
353353
.PHONY: container-target-allocator
354354
container-target-allocator: GOOS = linux
355355
container-target-allocator: targetallocator
356-
docker build -t ${TARGETALLOCATOR_IMG} cmd/otel-allocator
356+
docker build --load -t ${TARGETALLOCATOR_IMG} cmd/otel-allocator
357357

358358
.PHONY: container-operator-opamp-bridge
359359
container-operator-opamp-bridge: GOOS = linux
360360
container-operator-opamp-bridge: operator-opamp-bridge
361-
docker build -t ${OPERATOROPAMPBRIDGE_IMG} cmd/operator-opamp-bridge
361+
docker build --load -t ${OPERATOROPAMPBRIDGE_IMG} cmd/operator-opamp-bridge
362362

363363
.PHONY: container-bridge-test-server
364364
container-bridge-test-server: GOOS = linux
365365
container-bridge-test-server:
366-
docker build -t ${BRIDGETESTSERVER_IMG} tests/test-e2e-apps/bridge-server
366+
docker build --load -t ${BRIDGETESTSERVER_IMG} tests/test-e2e-apps/bridge-server
367367

368368
.PHONY: start-kind
369369
start-kind: kind
@@ -554,7 +554,7 @@ reset: kustomize operator-sdk manifests
554554
# Build the bundle image, used only for local dev purposes
555555
.PHONY: bundle-build
556556
bundle-build:
557-
docker build -f ./bundle/$(BUNDLE_VARIANT)/bundle.Dockerfile -t $(BUNDLE_IMG) ./bundle/$(BUNDLE_VARIANT)
557+
docker build --load -f ./bundle/$(BUNDLE_VARIANT)/bundle.Dockerfile -t $(BUNDLE_IMG) ./bundle/$(BUNDLE_VARIANT)
558558

559559
.PHONY: bundle-push
560560
bundle-push:

‎go.mod

+31-31
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ require (
2626
github.com/prometheus-operator/prometheus-operator/pkg/client v0.75.2
2727
github.com/prometheus/client_golang v1.19.1
2828
github.com/prometheus/common v0.55.0
29-
github.com/prometheus/prometheus v0.53.1
29+
github.com/prometheus/prometheus v0.54.0
3030
github.com/shirou/gopsutil v3.21.11+incompatible
3131
github.com/spf13/pflag v1.0.5
3232
github.com/stretchr/testify v1.9.0
@@ -54,34 +54,34 @@ require (
5454
)
5555

5656
require (
57-
cloud.google.com/go/auth v0.5.1 // indirect
57+
cloud.google.com/go/auth v0.7.0 // indirect
5858
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
59-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
60-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
61-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
62-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
59+
cloud.google.com/go/compute/metadata v0.4.0 // indirect
60+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
61+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
62+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
6363
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect
6464
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect
6565
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
6666
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
6767
github.com/Microsoft/go-winio v0.6.1 // indirect
68-
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
68+
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
6969
github.com/armon/go-metrics v0.4.1 // indirect
7070
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
71-
github.com/aws/aws-sdk-go v1.53.16 // indirect
71+
github.com/aws/aws-sdk-go v1.54.19 // indirect
7272
github.com/beorn7/perks v1.0.1 // indirect
7373
github.com/blang/semver/v4 v4.0.0 // indirect
7474
github.com/bytedance/sonic v1.11.6 // indirect
7575
github.com/bytedance/sonic/loader v0.1.1 // indirect
7676
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7777
github.com/cloudwego/base64x v0.1.4 // indirect
7878
github.com/cloudwego/iasm v0.2.0 // indirect
79-
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50 // indirect
79+
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect
8080
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8181
github.com/dennwc/varint v1.0.0 // indirect
82-
github.com/digitalocean/godo v1.117.0 // indirect
82+
github.com/digitalocean/godo v1.118.0 // indirect
8383
github.com/distribution/reference v0.6.0 // indirect
84-
github.com/docker/docker v26.1.4+incompatible // indirect
84+
github.com/docker/docker v27.1.1+incompatible // indirect
8585
github.com/docker/go-connections v0.4.0 // indirect
8686
github.com/docker/go-units v0.5.0 // indirect
8787
github.com/edsrzf/mmap-go v1.1.0 // indirect
@@ -127,12 +127,12 @@ require (
127127
github.com/google/gofuzz v1.2.0 // indirect
128128
github.com/google/s2a-go v0.1.7 // indirect
129129
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
130-
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
131-
github.com/gophercloud/gophercloud v1.12.0 // indirect
130+
github.com/googleapis/gax-go/v2 v2.12.5 // indirect
131+
github.com/gophercloud/gophercloud v1.13.0 // indirect
132132
github.com/gorilla/websocket v1.5.1 // indirect
133133
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
134134
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
135-
github.com/hashicorp/consul/api v1.29.1 // indirect
135+
github.com/hashicorp/consul/api v1.29.2 // indirect
136136
github.com/hashicorp/cronexpr v1.1.2 // indirect
137137
github.com/hashicorp/errwrap v1.1.0 // indirect
138138
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -143,9 +143,9 @@ require (
143143
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
144144
github.com/hashicorp/go-version v1.7.0 // indirect
145145
github.com/hashicorp/golang-lru v0.6.0 // indirect
146-
github.com/hashicorp/nomad/api v0.0.0-20240604134157-e73d8bb1140d // indirect
146+
github.com/hashicorp/nomad/api v0.0.0-20240717122358-3d93bd3778f3 // indirect
147147
github.com/hashicorp/serf v0.10.1 // indirect
148-
github.com/hetznercloud/hcloud-go/v2 v2.9.0 // indirect
148+
github.com/hetznercloud/hcloud-go/v2 v2.10.2 // indirect
149149
github.com/imdario/mergo v0.3.16 // indirect
150150
github.com/inconshreveable/mousetrap v1.1.0 // indirect
151151
github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect
@@ -156,12 +156,12 @@ require (
156156
github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
157157
github.com/kylelemons/godebug v1.1.0 // indirect
158158
github.com/leodido/go-urn v1.4.0 // indirect
159-
github.com/linode/linodego v1.35.0 // indirect
159+
github.com/linode/linodego v1.37.0 // indirect
160160
github.com/mailru/easyjson v0.7.7 // indirect
161161
github.com/mattn/go-colorable v0.1.13 // indirect
162162
github.com/mattn/go-isatty v0.0.20 // indirect
163163
github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
164-
github.com/miekg/dns v1.1.59 // indirect
164+
github.com/miekg/dns v1.1.61 // indirect
165165
github.com/mitchellh/go-homedir v1.1.0 // indirect
166166
github.com/moby/docker-image-spec v1.3.1 // indirect
167167
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -172,7 +172,7 @@ require (
172172
github.com/opencontainers/go-digest v1.0.0 // indirect
173173
github.com/opencontainers/image-spec v1.0.2 // indirect
174174
github.com/opentracing/opentracing-go v1.2.0 // indirect
175-
github.com/ovh/go-ovh v1.5.1 // indirect
175+
github.com/ovh/go-ovh v1.6.0 // indirect
176176
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
177177
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
178178
github.com/pkg/errors v0.9.1 // indirect
@@ -182,7 +182,7 @@ require (
182182
github.com/prometheus/client_model v0.6.1 // indirect
183183
github.com/prometheus/common/sigv4 v0.1.0 // indirect
184184
github.com/prometheus/procfs v0.15.1 // indirect
185-
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.27 // indirect
185+
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 // indirect
186186
github.com/sirupsen/logrus v1.9.3 // indirect
187187
github.com/spf13/cobra v1.8.0 // indirect
188188
github.com/tklauser/go-sysconf v0.3.13 // indirect
@@ -193,27 +193,27 @@ require (
193193
github.com/yusufpapurcu/wmi v1.2.3 // indirect
194194
go.mongodb.org/mongo-driver v1.14.0 // indirect
195195
go.opencensus.io v0.24.0 // indirect
196-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
196+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
197197
go.opentelemetry.io/otel/trace v1.28.0 // indirect
198198
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
199199
go.uber.org/atomic v1.11.0 // indirect
200200
golang.org/x/arch v0.8.0 // indirect
201-
golang.org/x/crypto v0.24.0 // indirect
201+
golang.org/x/crypto v0.25.0 // indirect
202202
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
203-
golang.org/x/mod v0.18.0 // indirect
204-
golang.org/x/net v0.26.0 // indirect
203+
golang.org/x/mod v0.19.0 // indirect
204+
golang.org/x/net v0.27.0 // indirect
205205
golang.org/x/oauth2 v0.21.0 // indirect
206206
golang.org/x/sync v0.7.0 // indirect
207-
golang.org/x/sys v0.21.0 // indirect
208-
golang.org/x/term v0.21.0 // indirect
207+
golang.org/x/sys v0.22.0 // indirect
208+
golang.org/x/term v0.22.0 // indirect
209209
golang.org/x/text v0.16.0 // indirect
210210
golang.org/x/time v0.5.0 // indirect
211-
golang.org/x/tools v0.22.0 // indirect
211+
golang.org/x/tools v0.23.0 // indirect
212212
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
213-
google.golang.org/api v0.183.0 // indirect
214-
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
215-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
216-
google.golang.org/grpc v1.64.1 // indirect
213+
google.golang.org/api v0.188.0 // indirect
214+
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
215+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect
216+
google.golang.org/grpc v1.65.0 // indirect
217217
google.golang.org/protobuf v1.34.2 // indirect
218218
gopkg.in/inf.v0 v0.9.1 // indirect
219219
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)