Skip to content

Actions: k0sproject/k0s

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yaml
3,149 workflow runs
3,149 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Use full patch version for go directives in go.mod Check for merge conflicts #3124: Pull request #5445 opened by twz123
January 17, 2025 11:20 20s
January 17, 2025 11:20 20s
Bump calico to 3.29.1 Check for merge conflicts #3123: Pull request #5443 synchronize by juanluisvaladas
January 16, 2025 21:25 13s
January 16, 2025 21:25 13s
Merge pull request #5397 from juanluisvaladas/disable-cplb-lb Check for merge conflicts #3122: Commit cb15775 pushed by juanluisvaladas
January 16, 2025 19:58 2m 13s main
main
January 16, 2025 19:58 2m 13s
Merge pull request #5422 from twz123/api-runtime-config-stdin Check for merge conflicts #3121: Commit 1dc87fa pushed by twz123
January 16, 2025 17:18 2m 22s main
main
January 16, 2025 17:18 2m 22s
Bump calico to 3.29.1 Check for merge conflicts #3120: Pull request #5443 synchronize by juanluisvaladas
January 16, 2025 14:59 18s
January 16, 2025 14:59 18s
Replace pid with flock for runtime config loading Check for merge conflicts #3119: Pull request #5435 synchronize by ncopa
January 16, 2025 13:56 10s
January 16, 2025 13:56 10s
Bump helm.sh/helm/v3 from 3.16.4 to 3.17.0 Check for merge conflicts #3118: Pull request #5444 opened by dependabot bot
January 16, 2025 13:51 11s
January 16, 2025 13:51 11s
Decouple controller flags from CLIOptions struct Check for merge conflicts #3117: Pull request #5438 synchronize by twz123
January 16, 2025 13:37 14s
January 16, 2025 13:37 14s
Replace pid with flock for runtime config loading Check for merge conflicts #3116: Pull request #5435 synchronize by ncopa
January 16, 2025 13:27 11s
January 16, 2025 13:27 11s
Bump calico to 3.29.1 Check for merge conflicts #3115: Pull request #5443 opened by juanluisvaladas
January 16, 2025 13:12 17s
January 16, 2025 13:12 17s
Bump Kubernetes to v1.31.5 Check for merge conflicts #3114: Pull request #5442 opened by twz123
January 16, 2025 12:14 14s
January 16, 2025 12:14 14s
[release-1.30] Bump Kubernetes to v1.30.9 Check for merge conflicts #3113: Pull request #5441 opened by twz123
January 16, 2025 12:01 19s
January 16, 2025 12:01 19s
[release-1.29] Bump Kubernetes to v1.29.13 Check for merge conflicts #3112: Pull request #5440 opened by twz123
January 16, 2025 11:51 17s
January 16, 2025 11:51 17s
Replace pid with flock for runtime config loading Check for merge conflicts #3111: Pull request #5435 synchronize by ncopa
January 16, 2025 10:12 22s
January 16, 2025 10:12 22s
Inline manifestsSaver Check for merge conflicts #3110: Pull request #5063 synchronize by twz123
January 16, 2025 08:59 10s
January 16, 2025 08:59 10s
Decouple controller flags from CLIOptions struct Check for merge conflicts #3109: Pull request #5438 opened by twz123
January 15, 2025 16:42 13s
January 15, 2025 16:42 13s
Let API subcommand accept the runtime config via stdin Check for merge conflicts #3108: Pull request #5422 synchronize by twz123
January 15, 2025 15:01 14s
January 15, 2025 15:01 14s
Merge pull request #5433 from twz123/no-cache-nodeconfig Check for merge conflicts #3107: Commit 7edf778 pushed by twz123
January 15, 2025 14:49 2m 15s main
main
January 15, 2025 14:49 2m 15s
Always treat an etcd backend as joinable Check for merge conflicts #3106: Pull request #5437 synchronize by twz123
January 15, 2025 14:39 12s
January 15, 2025 14:39 12s
Always treat an etcd backend as joinable Check for merge conflicts #3105: Pull request #5437 synchronize by twz123
January 15, 2025 13:28 13s
January 15, 2025 13:28 13s
Always treat an etcd backend as joinable Check for merge conflicts #3104: Pull request #5437 opened by twz123
January 15, 2025 13:15 11s
January 15, 2025 13:15 11s
[WIP] Bump kubernetes to 1.32.1 Check for merge conflicts #3103: Pull request #5436 synchronize by juanluisvaladas
January 14, 2025 18:02 11s
January 14, 2025 18:02 11s
[WIP] Bump kubernetes to 1.32.1 Check for merge conflicts #3102: Pull request #5436 opened by juanluisvaladas
January 14, 2025 18:00 16s
January 14, 2025 18:00 16s
Merge pull request #5434 from twz123/backport-5426-to-release-1.31 Check for merge conflicts #3101: Commit 977919d pushed by twz123
January 14, 2025 15:12 2m 15s release-1.31
release-1.31
January 14, 2025 15:12 2m 15s
Introduce k0s airgap bundle-artifacts Check for merge conflicts #3100: Pull request #5360 synchronize by twz123
January 14, 2025 13:45 11s
January 14, 2025 13:45 11s