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.

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

[pull] master from kumahq:master #26

Merged
merged 106 commits into from
May 7, 2024
Merged

[pull] master from kumahq:master #26

merged 106 commits into from
May 7, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Apr 22, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

jakubdyszkiewicz and others added 7 commits April 22, 2024 10:17
… 4.17.1 (#10038)

chore(deps): bump github.com/golang-migrate/migrate/v4

Bumps [github.com/golang-migrate/migrate/v4](https://github.com/golang-migrate/migrate) from 4.17.0 to 4.17.1.
- [Release notes](https://github.com/golang-migrate/migrate/releases)
- [Changelog](https://github.com/golang-migrate/migrate/blob/master/.goreleaser.yml)
- [Commits](golang-migrate/migrate@v4.17.0...v4.17.1)

---
updated-dependencies:
- dependency-name: github.com/golang-migrate/migrate/v4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…rfiles (#10041)

chore(deps): bump postgres in /test/dockerfiles

Bumps postgres from `5c58707` to `f4b0987`.

---
updated-dependencies:
- dependency-name: postgres
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@9bb5618...1d96c77)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4.3.1...1746f4a)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@pull pull bot added the ⤵️ pull label Apr 22, 2024
dependabot bot and others added 22 commits April 23, 2024 08:28
Bumps [github.com/cilium/ebpf](https://github.com/cilium/ebpf) from 0.14.0 to 0.15.0.
- [Release notes](https://github.com/cilium/ebpf/releases)
- [Commits](cilium/ebpf@v0.14.0...v0.15.0)

---
updated-dependencies:
- dependency-name: github.com/cilium/ebpf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
fix madr docs hyperlink mismatch problems

Signed-off-by: Icarus Wu <[email protected]>
…7195f9a2 (#10043)

Bumps kumahq/kuma-gui to version [master@211e345db942180fb8cbfffa18f679417195f9a2](https://github.com/kumahq/kuma-gui/tree/211e345db942180fb8cbfffa18f679417195f9a2)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…2a3f5645 (#10044)

Bumps kumahq/kuma-gui to version [master@d3be8b91a48cae43853740d8c059a9912a3f5645](https://github.com/kumahq/kuma-gui/tree/d3be8b91a48cae43853740d8c059a9912a3f5645)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* feat(metrics): add error type to nack metric

Signed-off-by: slonka <[email protected]>

* feat(metrics): make check

Signed-off-by: slonka <[email protected]>

* feat(metrics): add no_error to ack

Signed-off-by: slonka <[email protected]>

---------

Signed-off-by: slonka <[email protected]>
…roxy (#10045)

Because of the construction of the log line, where everything was
located at the same line, we were not able to figure out at the
beginnig of the log if it'll be successfull or not, so everything
was logged in stderr. It's wrong when you have a monitoring set
to watch stderr. I changed it so now the same information is
placed in multiple lines and only failure is send to stderr.

Signed-off-by: Bart Smykla <[email protected]>
…ee758973 (#10052)

Bumps kumahq/kuma-gui to version [master@5a60feadae00cf118efddd0de567baddee758973](https://github.com/kumahq/kuma-gui/tree/5a60feadae00cf118efddd0de567baddee758973)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…roxy (backport of #10045) (#10047)

fix(transparent-proxy): stop logging all to stderr when installing tproxy (#10045)

Because of the construction of the log line, where everything was
located at the same line, we were not able to figure out at the
beginnig of the log if it'll be successfull or not, so everything
was logged in stderr. It's wrong when you have a monitoring set
to watch stderr. I changed it so now the same information is
placed in multiple lines and only failure is send to stderr.

Signed-off-by: Bart Smykla <[email protected]>
Co-authored-by: Bart Smykla <[email protected]>
…d1bd1fd5 (#10053)

Bumps kumahq/kuma-gui to version [master@b962c57b38d97d728f7915806a31d2fed1bd1fd5](https://github.com/kumahq/kuma-gui/tree/b962c57b38d97d728f7915806a31d2fed1bd1fd5)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Co-authored-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
…cd517bb5 (#10060)

Bumps kumahq/kuma-gui to version [master@8553c737d7f85ab2ba08ba40df07e258cd517bb5](https://github.com/kumahq/kuma-gui/tree/8553c737d7f85ab2ba08ba40df07e258cd517bb5)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…a3797365 (#10061)

Bumps kumahq/kuma-gui to version [master@b32f5ff0a3dd0e78c29c7aefb675b067a3797365](https://github.com/kumahq/kuma-gui/tree/b32f5ff0a3dd0e78c29c7aefb675b067a3797365)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…aster

chore(release): merge release 2.7 to master
…a1be504c (#10062)

Bumps kumahq/kuma-gui to version [master@8c2b54f8ecfc4c4e078bbff04fcec85ea1be504c](https://github.com/kumahq/kuma-gui/tree/8c2b54f8ecfc4c4e078bbff04fcec85ea1be504c)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…0cba6528 (#10064)

Bumps kumahq/kuma-gui to version [release-2.7@be68aadf480247c57827007cdaa6c8dc0cba6528](https://github.com/kumahq/kuma-gui/tree/be68aadf480247c57827007cdaa6c8dc0cba6528)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Get rid of unnecessary intermediate `TransparentProxyConfig`
struct. It's a leftover from the time when we had two tproxy
engines. Now we can safely use `Config` struct.

There is no V2 or V1 iptables engines. There is only one, so we
don't have to have interface representing engine and can just use
pure functions, so I could get rid of `TransparentProxyV2` struct
and `TransparentProxy`

We can use general `Config` struct, so I removed
`transparentProxyArgs` struct for tproxy uninstall.

Replace writes to stdout buffers with `fmt.Fprintln` in tproxy
uninsatll, which is simpler and more elegant`.

Signed-off-by: Bart Smykla <[email protected]>
jakubdyszkiewicz and others added 29 commits April 30, 2024 12:30
Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Co-authored-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Co-authored-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Signed-off-by: Mike Beaumont <[email protected]>
* test(e2e): never fail when running debug commands

We want to export any state available and not fail in the middle of an
export

Signed-off-by: Charly Molter <[email protected]>
* fix(api-server): fix trace/span ID processing in logs

Problem:
Currently, processing trace/span IDs before logging them (e.g.,
converting them to Datadog format) requires calling
`NewSpanLogValuesProcessorContext` with the `runtime.Extensions()`
context. However, this context isn't always available, particularly when
 handling errors in REST endpoint handlers through `AddFieldsFromCtx`.
 This inconsistency leads to the processing function being ignored.

Proposed Solutions:
- Pass `runtime.Extensions()` Context to `HandleError`: While effective,
 this approach adds significant boilerplate code and requires disabling
 the `contextcheck` linter in multiple locations (see PR 10094).

- Leverage slog's Contextual Logging (ref issue 8216): This approach
offers cleaner code but requires significant changes to our logging
infrastructure (ones which I immediately faced when tried to do a quick
POC):
  - slog lacks the concept of logger names, necessitating a custom
    `slog.Handler` for maintaining desired log structure.
  - We'd need to abandon using globally configured/named loggers or
  potentially introduce deferred logger initialization logic for slog.

Current Solution (For This PR):
To address the issue without a major logging overhaul, this PR proposes
a simpler solution:

- Pass the logger instance through the context when constructing
  ApiServer.
- Restore the logger from the context in `HandleError` function.

This approach, while not ideal due to the passing logger via context,
effectively resolves the problem without introducing complex logging
changes.

Additional changes:
I adjusted the signature of `NewApiServer` function to accept the whole
`runtime.Runtime`, which reduced significantly the amount of necessary
arguments, which were attained from the `runtime.Runtime`. It makes
`contextcheck` linter happy as we don't have to pass
`runtime.Extensions()` context as an argument, which linter would flag
as passed and not used, without realising it's not the regular
context.

Signed-off-by: Bart Smykla <[email protected]>

* chore: add missing test.Runtime.Extensions()

Signed-off-by: Bart Smykla <[email protected]>

---------

Signed-off-by: Bart Smykla <[email protected]>
Signed-off-by: Mike Beaumont <[email protected]>
Co-authored-by: Bart Smykla <[email protected]>
…10174)

Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.1.0 to 5.3.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@9d1e062...38e1018)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
#10175)

Bumps [actions/create-github-app-token](https://github.com/actions/create-github-app-token) from 1.9.3 to 1.10.0.
- [Release notes](https://github.com/actions/create-github-app-token/releases)
- [Commits](actions/create-github-app-token@7bfa3a4...a0de6af)

---
updated-dependencies:
- dependency-name: actions/create-github-app-token
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@0c52d54...cdcb360)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Use latest version of ci-tools which does the right thing

Signed-off-by: Charly Molter <[email protected]>
…10177)

Bumps google.golang.org/protobuf from 1.33.0 to 1.34.1.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.33.0 to 1.33.1.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.33.0...v1.33.1)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.19.0 to 0.20.0.
- [Commits](golang/sys@v0.19.0...v0.20.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…dcd82e` in /tools/releases/dockerfiles (#10183)

chore(deps): bump distroless/base-nossl-debian11

Bumps distroless/base-nossl-debian11 from `4cba3ac` to `1dcd82e`.

---
updated-dependencies:
- dependency-name: distroless/base-nossl-debian11
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ols/releases/dockerfiles (#10184)

chore(deps): bump ubuntu in /tools/releases/dockerfiles

Bumps ubuntu from jammy-20240416 to jammy-20240427.

---
updated-dependencies:
- dependency-name: ubuntu
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…n /test/dockerfiles (#10182)

chore(deps): bump kumahq/ubuntu-netools in /test/dockerfiles

Bumps [kumahq/ubuntu-netools](https://github.com/kumahq/ci-tools) from `9fd7668` to `59423e3`.
- [Release notes](https://github.com/kumahq/ci-tools/releases)
- [Commits](https://github.com/kumahq/ci-tools/commits)

---
updated-dependencies:
- dependency-name: kumahq/ubuntu-netools
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Charly Molter <[email protected]>
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.14.0 to 0.15.0.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.14.0...v0.15.0)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Stop using the older endpoints as there are better more
coherent ones.

Signed-off-by: Charly Molter <[email protected]>
…48d0af6f (#10187)

Bumps kumahq/kuma-gui to version [master@f624dc916003cf5bc9c5509a0e7cea0648d0af6f](https://github.com/kumahq/kuma-gui/tree/f624dc916003cf5bc9c5509a0e7cea0648d0af6f)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…cca1e3a1 (#10188)

Bumps kumahq/kuma-gui to version [master@3502fcf6d2ea66a1eb3d8bcb22849304cca1e3a1](https://github.com/kumahq/kuma-gui/tree/3502fcf6d2ea66a1eb3d8bcb22849304cca1e3a1)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…67135ff3 (#10190)

Bumps kumahq/kuma-gui to version [master@d6d20ac1f56975cbaf6b0f1a2207476867135ff3](https://github.com/kumahq/kuma-gui/tree/d6d20ac1f56975cbaf6b0f1a2207476867135ff3)

Signed-off-by: GitHub <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@pull pull bot merged commit 16e335c into slonka:master May 7, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants