Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/k8s.io/apiextensions-a…
Browse files Browse the repository at this point in the history
…piserver-0.31.0
  • Loading branch information
JiriCtvrtka committed Sep 9, 2024
2 parents bda93d9 + 7adc33b commit b308fd7
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 118 deletions.
6 changes: 3 additions & 3 deletions build/packer/ansible/agent-aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@
mode: "u+x,g+x,o+x"

- name: Install chromium
shell: "dnf install -y https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm"
when: ansible_architecture == "x86_64"
# NOTE: no chromium package for arm64
yum:
name: chromium
state: latest

- name: Install doctl client for digital ocean
get_url:
Expand Down
2 changes: 1 addition & 1 deletion build/packer/aws.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ source "amazon-ebs" "arm-agent" {
iit-billing-tag = "pmm-worker"
}
launch_block_device_mappings {
device_name = "/dev/xvda"
device_name = "/dev/sda1"
volume_size = 30
volume_type = "gp3"
delete_on_termination = true
Expand Down
130 changes: 65 additions & 65 deletions cli-tests/package-lock.json

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

2 changes: 1 addition & 1 deletion cli-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"devDependencies": {
"@types/promise-retry": "^1.1.3",
"@types/shelljs": "^0.8.12",
"@typescript-eslint/eslint-plugin": "^8.2.0",
"@typescript-eslint/eslint-plugin": "^8.3.0",
"@typescript-eslint/parser": "^7.18.0",
"eslint": "8.57",
"eslint-config-airbnb-base": "^15.0.0",
Expand Down
Binary file modified descriptor.bin
Binary file not shown.
34 changes: 20 additions & 14 deletions tools/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/BurntSushi/go-sumtype v0.0.0-20190304192233-fcb4a6205bdc
github.com/Percona-Lab/swagger-order v0.0.0-20191002141859-166b3973d026
github.com/apache/skywalking-eyes v0.6.0
github.com/bufbuild/buf v1.37.0
github.com/bufbuild/buf v1.39.0
github.com/daixiang0/gci v0.13.0
github.com/envoyproxy/protoc-gen-validate v1.1.0
github.com/go-delve/delve v1.23.0
Expand All @@ -33,8 +33,8 @@ require (

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.2-20240717164558-a6c49f84cc0f.2 // indirect
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.16.2-20240801134127-09fbc17f7c9e.1 // indirect
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.34.2-20240801134127-09fbc17f7c9e.2 // indirect
buf.build/gen/go/bufbuild/registry/connectrpc/go v1.16.2-20240821192916-45ba72cdd479.1 // indirect
buf.build/gen/go/bufbuild/registry/protocolbuffers/go v1.34.2-20240821192916-45ba72cdd479.2 // indirect
code.gitea.io/sdk/gitea v0.18.0 // indirect
connectrpc.com/connect v1.16.2 // indirect
connectrpc.com/otelconnect v0.7.1 // indirect
Expand All @@ -44,7 +44,7 @@ require (
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.5 // indirect
github.com/Microsoft/hcsshim v0.12.6 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
Expand All @@ -54,8 +54,8 @@ require (
github.com/bmatcuk/doublestar/v2 v2.0.4 // indirect
github.com/bufbuild/protocompile v0.14.0 // indirect
github.com/bufbuild/protoplugin v0.0.0-20240323223605-e2735f6c31ee // indirect
github.com/bufbuild/protovalidate-go v0.6.3 // indirect
github.com/bufbuild/protoyaml-go v0.1.10 // indirect
github.com/bufbuild/protovalidate-go v0.6.4 // indirect
github.com/bufbuild/protoyaml-go v0.1.11 // indirect
github.com/chigopher/pathlib v0.19.1 // indirect
github.com/cilium/ebpf v0.11.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
Expand Down Expand Up @@ -104,11 +104,13 @@ require (
github.com/go-openapi/validate v0.21.0 // indirect
github.com/go-sql-driver/mysql v1.5.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/go-toolsmith/astcast v1.0.0 // indirect
github.com/go-toolsmith/astequal v1.0.1 // indirect
github.com/go-toolsmith/astinfo v1.0.0 // indirect
github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5 // indirect
github.com/go-toolsmith/typep v1.0.2 // indirect
github.com/gofrs/flock v0.12.1 // indirect
github.com/gofrs/uuid v4.4.0+incompatible // indirect
github.com/gofrs/uuid/v5 v5.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand Down Expand Up @@ -174,6 +176,7 @@ require (
github.com/moby/term v0.5.0 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/ginkgo/v2 v2.20.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
Expand All @@ -183,6 +186,8 @@ require (
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pkg/profile v1.7.0 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/quic-go v0.46.0 // indirect
github.com/reva2/bitbucket-insights-api v1.0.0 // indirect
github.com/reviewdog/errorformat v0.0.0-20240608101709-1d3280ed6bd4 // indirect
github.com/reviewdog/go-bitbucket v0.0.0-20201024094602-708c3f6a7de0 // indirect
Expand All @@ -209,20 +214,21 @@ require (
github.com/xanzy/ssh-agent v0.3.3 // indirect
go.mongodb.org/mongo-driver v1.9.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
go.starlark.net v0.0.0-20231101134539-556fd59b42f6 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/mock v0.4.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/arch v0.6.0 // indirect
golang.org/x/build v0.0.0-20240712162709-0b82a206aadf // indirect
golang.org/x/crypto v0.26.0 // indirect
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
Expand All @@ -231,8 +237,8 @@ require (
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect
google.golang.org/grpc v1.65.0 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit b308fd7

Please sign in to comment.