[pull] master from kumahq:master #27
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
…certs (backport of #10160, #10162, #10161) (#10168) * fix(kuma-cp): consistently check for expiring ZoneIngress/ZoneEgress certs (#10160) Signed-off-by: Mike Beaumont <mjboamail@gmail.com> * fix(kuma-cp): cleanup generated egress certs (#10162) Signed-off-by: Mike Beaumont <mjboamail@gmail.com> Co-authored-by: Bart Smykla <bartek@smykla.com> * fix(kuma-cp): index generated certs by proxy type (#10161) Signed-off-by: Mike Beaumont <mjboamail@gmail.com> --------- Signed-off-by: Mike Beaumont <mjboamail@gmail.com> Co-authored-by: Mike Beaumont <mjboamail@gmail.com> Co-authored-by: Bart Smykla <bartek@smykla.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
…10192) Signed-off-by: Mike Beaumont <mjboamail@gmail.com> Co-authored-by: Bart Smykla <bartek@smykla.com>
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
) Bumps [Kong/public-shared-actions](https://github.com/kong/public-shared-actions) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/kong/public-shared-actions/releases) - [Commits](Kong/public-shared-actions@2f02738...a98be01) --- updated-dependencies: - dependency-name: Kong/public-shared-actions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…10196) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.3.0 to 6.0.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@38e1018...a4f60bb) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@0ad4b8f...44c2b7a) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…6ec40e35 (#10198) Bumps kumahq/kuma-gui to version [master@f9850df1940b18345d4d2045be5801816ec40e35](https://github.com/kumahq/kuma-gui/tree/f9850df1940b18345d4d2045be5801816ec40e35) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…69d70f59 (#10199) Bumps kumahq/kuma-gui to version [release-2.7@859680c3cc57f135c2c84af7d6e9004969d70f59](https://github.com/kumahq/kuma-gui/tree/859680c3cc57f135c2c84af7d6e9004969d70f59) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…c473a7f0 (#10201) Bumps kumahq/kuma-gui to version [master@f085327955fa82459d729ec5c5e53035c473a7f0](https://github.com/kumahq/kuma-gui/tree/f085327955fa82459d729ec5c5e53035c473a7f0) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
- Rename "commands" to "rules" Rules are more flexible if we want to introduce some additional logic for example to remove particular iptables rule or check if it exists. Before we would end up with a list of commands inside chains, which would make it harder if we in example would like to check if the rules we want to add/remove already exists, because we would have to iterate over all "commands" inside chains and create new `Command`s for check (-C|--check) or delete. We also won't need short/long parameters in rules anymore - Get rid of rules.Append/Insert and add rules.NewRule - Change rule position param type from `int` to `uint` iptables -I|--insert doesen't allow to pass negative numbers as rule positions - Rename chain.Insert/Append/AppendIf methods Chains don't contain commands anymore. They contain rules. By changing names of these methods we give ourselves more flexibility about what we want to do with the rules inside chains. - Put flag string literals in consts package for rules (-I|--insert etc.) - Move regular chain and table names to consts package - Pass table name to rules Table name might be used to generate command arguments for checking or removing rules. - Change receiver name from "b" to "c" in Chain (b was incorrect) - Make `Rule` parameter names concistent In other places we are using `chain` and `table` instead of `chainName` and `tableName` - Rename Build methods to BuildForRestore `Build` is vague and `BuildForRestore` is more correct as returned strings are intended for `iptables-restore` usage only. - Rename variable "cmds" to "lines" in Chain.BuildForRestore - Change parameter builder's Build method to return []string instead of string We can use it then as a list of parameters for iptables execution - Allow chain constructors to return and pass through errors You shouldn't be able to create a Chain without a name or without providing a table to which the chain belongs to. - Rename "table" package/directory to "tables" for consistency - Rename "chain" package/directory to "chains" for consistency - Replace TableBuilder with Table interface Having this intermediate structure was cumbersome and unnecessary. I removed BuildForRestore method from TableBuilder and replaced it with the function BuildRulesForRestore which accepts Table interface. It makes it simpler in the future to introduce logic for cleanup and/or check of existing iptables rules. Signed-off-by: Bart Smykla <bartek@smykla.com>
Signed-off-by: Jay Chen <1180092+jijiechen@users.noreply.github.com>
- Got rid of unnecessary internal `defaultConfig` function We had `defaultConfig` and `DefaultConfig`, where latter was just calling former function. - Simplified configuration handling by removing `MergeConfigWithDefaults` This commit removed the unnecessary and hard-to-maintain `MergeConfigWithDefaults` function. Instead, we now use `DefaultConfig` directly and explicitly set modified values in commands like `kumactl install transparent-proxy` and CNI. I've also streamlined the `transparentProxyArgs` structure by removing parameters that can be directly configured via the `Config` structure. This paves the way for potentially removing this intermediate structure altogether in the future, although that would involve more complex changes in flag parsing. - Added `StoreFirewalld` parameter to `Config` structure I think it's the logical place for this value as it's basically part of the configuration. - Replaced writes to Writers with pure `fmt.Fprintln` to make code cleaner We don't have to cast string literals to `[]byte` now and don't have to explicitly ignore errors. Signed-off-by: Bart Smykla <bartek@smykla.com>
- Introduced `InitializedConfig` structure
`InitializedConfig` extends the `Config` struct by adding fields that require
additional logic to retrieve their values. These values typically involve
interacting with the system or external resources.
An `InitializedConfig` can contain nested configuration structs. If these
nested structs share field names with the `Config` struct, they should embed
the corresponding field from `Config` during initialization. I.e.
```go
type Redirect struct {
// NamePrefix is a prefix which will be used go generate chains name
NamePrefix string
Inbound TrafficFlow
Outbound TrafficFlow
DNS DNS
VNet VNet
}
type InitializedRedirect struct {
Redirect
DNS InitializedDNS
}
func (c Redirect) Initialize() (InitializedRedirect, error) {
var err error
initialized := InitializedRedirect{Redirect: c}
// .DNS
initialized.DNS, err = c.DNS.Initialize()
...
return initialized, nil
}
```
I moved obtaining DNS servers from `/etc/resolv.conf` and getting loopback
network interface name to initialization methods for appropriate sub-configs.
- Combined static variables in `builder_restore.go`
By combining them all together at top it makes it easier to read.
- Moved iptables/ip6tables consts to consts package
As we have a package for consts let's use it everywhere
- Got rid of unnecessary `IPTables` struct
This structure was unnecessary as it was only used in
`BuildIPTablesForRestore`, which also was using only its one method
`BuildForRestore`. I moved logic of this method directly inside
`BuildIPTablesForRestore`, which removes unnecessary complexity.
Signed-off-by: Bart Smykla <bartek@smykla.com>
feat: add cloudsmith pkg hosting attribution
…30461f9a (#10210) Bumps kumahq/kuma-gui to version [master@1339f19c8a82e4f2b001e03d36f9606c30461f9a](https://github.com/kumahq/kuma-gui/tree/1339f19c8a82e4f2b001e03d36f9606c30461f9a) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Bart Smykla <bartek@smykla.com>
Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](ossf/scorecard-action@0864cf1...dc50aa9) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.3 to 3.25.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@d39d31e...b7cec75) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…1.19.1 (#10226) chore(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](prometheus/client_golang@v1.19.0...v1.19.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.24.0 to 0.25.0. - [Commits](golang/net@v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…30.0 to 0.31.0 (#10222) chore(deps): bump github.com/testcontainers/testcontainers-go Bumps [github.com/testcontainers/testcontainers-go](https://github.com/testcontainers/testcontainers-go) from 0.30.0 to 0.31.0. - [Release notes](https://github.com/testcontainers/testcontainers-go/releases) - [Commits](testcontainers/testcontainers-go@v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: github.com/testcontainers/testcontainers-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…rfiles (#10221) chore(deps): bump postgres in /test/dockerfiles Bumps postgres from `4aea012` to `ba727f7`. --- updated-dependencies: - dependency-name: postgres dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…2f68abba (#10213) Bumps kumahq/kuma-gui to version [master@44cf02f02626ded03c85db712c1659ff2f68abba](https://github.com/kumahq/kuma-gui/tree/44cf02f02626ded03c85db712c1659ff2f68abba) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> Co-authored-by: Mike Beaumont <mjboamail@gmail.com>
…86f09726 (#10231) Bumps kumahq/kuma-gui to version [master@1f3222f9cdd7b9a769986103b6d9942086f09726](https://github.com/kumahq/kuma-gui/tree/1f3222f9cdd7b9a769986103b6d9942086f09726) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Fixes #10156 Signed-off-by: spacewander <spacewanderlzx@gmail.com> Co-authored-by: Charly Molter <charly.molter@konghq.com>
…20724b93 (#10540) Bumps kumahq/kuma-gui to version [master@18949c77c3bb027d07093a806649e0e420724b93](https://github.com/kumahq/kuma-gui/tree/18949c77c3bb027d07093a806649e0e420724b93) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…10547) Bumps [github.com/spiffe/go-spiffe/v2](https://github.com/spiffe/go-spiffe) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/spiffe/go-spiffe/releases) - [Changelog](https://github.com/spiffe/go-spiffe/blob/main/CHANGELOG.md) - [Commits](spiffe/go-spiffe@v2.2.0...v2.3.0) --- updated-dependencies: - dependency-name: github.com/spiffe/go-spiffe/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
…o 1.5.1 (#10546) chore(deps): bump github.com/containernetworking/plugins Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/containernetworking/plugins/releases) - [Commits](containernetworking/plugins@v1.5.0...v1.5.1) --- updated-dependencies: - dependency-name: github.com/containernetworking/plugins dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
--------- Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
…d9198ff1 (#10536) Bumps kumahq/kuma-gui to version [release-2.8@ad77e49b0f6111cda50cc471c4756616d9198ff1](https://github.com/kumahq/kuma-gui/tree/ad77e49b0f6111cda50cc471c4756616d9198ff1) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Bumps [cloudsmith-io/action](https://github.com/cloudsmith-io/action) from 0.6.9 to 0.6.10. - [Release notes](https://github.com/cloudsmith-io/action/releases) - [Commits](cloudsmith-io/action@fb7f780...8c47c26) --- updated-dependencies: - dependency-name: cloudsmith-io/action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
… plugin resources (#10543) Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
* fix(kuma-cp): validate the bandwidth strictly Signed-off-by: spacewander <spacewanderlzx@gmail.com> * Update UPGRADE.md Signed-off-by: Krzysztof Słonka <slonka@users.noreply.github.com> --------- Signed-off-by: spacewander <spacewanderlzx@gmail.com> Signed-off-by: Krzysztof Słonka <slonka@users.noreply.github.com> Co-authored-by: Krzysztof Słonka <slonka@users.noreply.github.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
…24efa6df (#10553) Bumps kumahq/kuma-gui to version [master@cb6fb967670c6a0c9018df3cc5cf5dc724efa6df](https://github.com/kumahq/kuma-gui/tree/cb6fb967670c6a0c9018df3cc5cf5dc724efa6df) Signed-off-by: GitHub <noreply@github.com> 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>
…46005523 (#10556) Bumps kumahq/kuma-gui to version [release-2.8@eccbeaf46ac4088a051031f8bcdaff2446005523](https://github.com/kumahq/kuma-gui/tree/eccbeaf46ac4088a051031f8bcdaff2446005523) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…86ce43d5 (#10558) Bumps kumahq/kuma-gui to version [master@c3637f25200d646ef20167ac5ad991e286ce43d5](https://github.com/kumahq/kuma-gui/tree/c3637f25200d646ef20167ac5ad991e286ce43d5) Signed-off-by: GitHub <noreply@github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Only part of this test was adjusted in #10426 Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
…10564) Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.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>
feat(meshexternalservice): make type optional Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-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>
**Do NOT squash on merging.** Allow merge commit first in the [repository settings](https://github.com/kumahq/kuma/settings). Generated by [action](https://github.com/kumahq/kuma/actions/runs/9596977037)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )