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

Introduce k0s airgap bundle-artifacts Check for merge conflicts #3074: Pull request #5360 synchronize by twz123
January 9, 2025 16:49 14s
January 9, 2025 16:49 14s
Use kubeadm's bootstrap token types Check for merge conflicts #3073: Pull request #5425 opened by twz123
January 9, 2025 16:45 12s
January 9, 2025 16:45 12s
Encapsulate debug flag handling Check for merge conflicts #3072: Pull request #5390 synchronize by twz123
January 9, 2025 16:00 17s
January 9, 2025 16:00 17s
Allow to disable CPLB load balancer Check for merge conflicts #3071: Pull request #5397 synchronize by juanluisvaladas
January 9, 2025 14:48 11s
January 9, 2025 14:48 11s
Bump github.com/k0sproject/k0sctl from 0.20.0 to 0.20.1 in /hack/tool Check for merge conflicts #3070: Pull request #5424 opened by juanluisvaladas
January 9, 2025 13:13 12s
January 9, 2025 13:13 12s
Let API subcommand accept the runtime config via stdin Check for merge conflicts #3069: Pull request #5422 synchronize by twz123
January 9, 2025 11:40 9s
January 9, 2025 11:40 9s
Only use persistent flags if appropriate Check for merge conflicts #3068: Pull request #5423 opened by twz123
January 9, 2025 11:36 12s
January 9, 2025 11:36 12s
Merge pull request #5396 from juanluisvaladas/cplb-unicast Check for merge conflicts #3067: Commit 3ca4e93 pushed by juanluisvaladas
January 9, 2025 10:28 2m 11s main
main
January 9, 2025 10:28 2m 11s
Implement Unicast VRRP for CPLB Check for merge conflicts #3066: Pull request #5396 synchronize by juanluisvaladas
January 9, 2025 10:26 13s
January 9, 2025 10:26 13s
Merge pull request #5416 from twz123/subcommand-show-help-by-default Check for merge conflicts #3065: Commit eb5ad6d pushed by twz123
January 9, 2025 10:25 2m 15s main
main
January 9, 2025 10:25 2m 15s
Merge pull request #5417 from twz123/remove-legacy-runtimecfg-migration Check for merge conflicts #3064: Commit 5982a2f pushed by twz123
January 9, 2025 09:38 2m 12s main
main
January 9, 2025 09:38 2m 12s
Merge pull request #5420 from twz123/remove-cfgvars-origin Check for merge conflicts #3063: Commit 0ad8cf8 pushed by twz123
January 9, 2025 09:34 2m 11s main
main
January 9, 2025 09:34 2m 11s
Introduce k0s airgap bundle-artifacts Check for merge conflicts #3062: Pull request #5360 synchronize by twz123
January 9, 2025 09:24 17s
January 9, 2025 09:24 17s
Merge pull request #5365 from twz123/make-disable-docker-integration Check for merge conflicts #3061: Commit 9d67a6a pushed by twz123
January 9, 2025 09:18 2m 10s main
main
January 9, 2025 09:18 2m 10s
Merge pull request #5381 from twz123/linux-only-subcommands Check for merge conflicts #3060: Commit bb264cb pushed by twz123
January 9, 2025 09:15 2m 15s main
main
January 9, 2025 09:15 2m 15s
Merge pull request #5418 from twz123/include-security-policy-in-docs Check for merge conflicts #3059: Commit 57585e3 pushed by twz123
January 9, 2025 09:00 2m 14s main
main
January 9, 2025 09:00 2m 14s
Let API subcommand accept the runtime config via stdin Check for merge conflicts #3058: Pull request #5422 synchronize by twz123
January 9, 2025 07:34 10s
January 9, 2025 07:34 10s
Let API subcommand accept the runtime config via stdin Check for merge conflicts #3057: Pull request #5422 synchronize by twz123
January 8, 2025 21:10 14s
January 8, 2025 21:10 14s
Let API subcommand accept the runtime config via stdin Check for merge conflicts #3056: Pull request #5422 opened by twz123
January 8, 2025 21:05 12s
January 8, 2025 21:05 12s
Merge pull request #5393 from juanluisvaladas/etcd-cplb-4664 Check for merge conflicts #3055: Commit 0a8fafb pushed by juanluisvaladas
January 8, 2025 17:11 2m 12s main
main
January 8, 2025 17:11 2m 12s
Ensure iface.FirstPublicAddress isn't a secondary IP Check for merge conflicts #3054: Pull request #5393 synchronize by juanluisvaladas
January 8, 2025 15:20 12s
January 8, 2025 15:20 12s
Ensure iface.FirstPublicAddress isn't a secondary IP Check for merge conflicts #3053: Pull request #5393 synchronize by juanluisvaladas
January 8, 2025 15:18 14s
January 8, 2025 15:18 14s
Ensure iface.FirstPublicAddress isn't a secondary IP Check for merge conflicts #3052: Pull request #5393 synchronize by juanluisvaladas
January 8, 2025 14:36 2m 12s
January 8, 2025 14:36 2m 12s
Bump sigs.k8s.io/controller-runtime from 0.19.3 to 0.19.4 Check for merge conflicts #3051: Pull request #5421 opened by dependabot bot
January 8, 2025 14:00 15s
January 8, 2025 14:00 15s
Remove unused CfgVars origin Check for merge conflicts #3050: Pull request #5420 opened by twz123
January 8, 2025 13:26 11s
January 8, 2025 13:26 11s