389cd740c8
Fix URL pruning when joining an etcd member
...
* Fix URL pruning when joining an etcd member
Problem:
Existing member clientURLs were checked if they contain the joining
node's IP. In some edge cases this would prune valid URLs when the
joining IP is a substring match of the only existing member's IP.
Because of this, it was impossible to e.g. join 10.0.0.2 to an existing
node that has an IP of 10.0.0.2X or 10.0.0.2XX:
level=fatal msg="starting kubernetes: preparing server: start managed database:
joining etcd cluster: etcdclient: no available endpoints"
Solution:
Fixed by properly parsing the URLs and comparing the IPs for equality
instead of substring match.
Signed-off-by: Malte Starostik <info@stellaware.de>
(cherry picked from commit b23955e835
2021-08-13 11:50:05 -07:00
439e32b042
fix Node stuck at deletion ( #3777 )
...
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-08-06 19:57:38 +02:00
f72e2cb3ea
Bump helm-controller to v0.10.2
...
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-08-05 09:36:13 -07:00
99eadcc10b
Merge pull request #3692 from galal-hussein/fix_multiple_bootstrap_keys_119
...
[Release-1.19] Fix multiple bootstrap keys found
2021-07-21 15:00:34 -07:00
970cb0cfc4
Fix multiple bootstrap keys found
...
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
migrate empty string key properly
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
simplifying the code
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
migrate old token key format
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
fix warning msg
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
replace error with warn in delete
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
more fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
more fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-07-21 23:00:23 +02:00
fc40821116
Bump containerd to v1.4.8-k3s1
...
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-07-20 15:04:59 -07:00
202e8ffe2f
Merge pull request #3668 from galal-hussein/backport_empty_string_fix
...
[release-1.19] Backport empty string fix
2021-07-19 16:02:46 -07:00
f7e2220af2
go mod tidy
...
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-07-19 23:14:17 +02:00
739b16b165
Upgrade kine
...
Fix storing bootstrap data with empty token string (#3422 )
* Fix storing bootstrap data with empty token string
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* delete node password secret after restoration
fixes to bootstrap key
vendor update
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* fix comment
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* fix typo
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* more fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* fixes
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* typos
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* Removing dynamic listener file after restoration
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
* go mod tidy
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
update kine
add bootstrap save
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
fix save bootstrap
Signed-off-by: galal-hussein <hussein.galal.ahmed.11@gmail.com>
2021-07-19 22:41:50 +02:00
45b1f22982
Merge pull request #3667 from manuelbuil/issue_3635
...
[release-1.19] Upgrade k3s-root version
2021-07-19 22:34:43 +02:00
44063d6ef2
[release-1.19] Upgrade k3s-root version
...
Signed-off-by: Manuel Buil <mbuil@suse.com>
2021-07-19 20:47:19 +02:00
79b4dc2c81
Revert "Adding support for waitgroup to the Startuphooks ( #3654 ) ( #3658 )" ( #3664 )
...
This reverts commit 8a81349b2f
2021-07-19 11:35:01 -07:00
8a81349b2f
Adding support for waitgroup to the Startuphooks ( #3654 ) ( #3658 )
...
The startup hooks where executing after the deploy controller. We needed the deploy controller to wait until the startup hooks had completed.
Signed-off-by: Luther Monson <luther.monson@gmail.com>
Co-authored-by: Jamie Phillips <jamie.phillips@suse.com>
2021-07-17 03:09:13 +02:00
89c4433700
[release-1.19] Bump Kubernetes to v1.19.13 ( #3656 )
...
* Bump golang to 1.15.14
* Update to v1.19.13
Signed-off-by: Chris Kim <oats87g@gmail.com>
2021-07-15 22:38:11 -07:00
0064a39615
[release-1.19] Update coredns ( #3539 )
...
* Update coredns from 1.6.9 to 1.8.3
Signed-off-by: Ricardo Weir <ricardo.weir@suse.com>
2021-07-08 16:33:21 -07:00
559d0c4729
Update to v1.19.12 ( #3476 )
...
* Update to v1.19.12
Signed-off-by: root <derek.nola@suse.com>
2021-06-17 14:35:50 -07:00
39552458bc
runc: v1.0.0-rc95 ( #3349 )
...
- Addresses #3301
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
2021-05-19 11:52:23 -07:00
50726feb40
Handle conntrack-related sysctls in supervisor agent setup
...
(cherry picked from commit 7e175e8ad4
2021-05-19 01:04:17 -07:00
8359ad21fe
Merge pull request #3330 from erikwilson/v1.19.11-k3s1
...
Update Kubernetes to v1.19.11-k3s1
2021-05-14 13:54:46 -07:00
54dded0797
Bump to go 1.15.12
2021-05-14 10:44:36 -07:00
d8425402ec
Update Kubernetes to v1.19.11-k3s
2021-05-14 10:25:06 -07:00
584ed26f76
[backport 1.19] runc: v1.0.0-rc94 ( #3313 )
...
- bump the runc version to v1.0.0-rc94
- build runc from its own source tree instead of from ./vendor/
- side-steps incompatibility with upstream kubelet container manager
backport of #3305
addresses #3301
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
2021-05-13 15:12:49 -07:00
9037cadcb4
Merge pull request #3320 from MonzElmasry/validate-go-mod-ci-1.19
...
[release-1.19]Add ci step to validate incorerct replacement fork
2021-05-13 05:06:52 +02:00
7ab6d5cf19
Merge pull request #3318 from MonzElmasry/disable-apiserver-flag-1.19
...
[release-1.19]change --disable-api-server flag to --disable-apiserver
2021-05-13 01:43:30 +02:00
d8826c254f
Add ci step to validate incorerct replacement fork
...
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
2021-05-13 01:37:50 +02:00
519651b653
change --disable-apiserver flag
...
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
2021-05-13 00:25:49 +02:00
cc825813b6
Merge pull request #3210 from MonzElmasry/fix_ci_1.19
...
[backport 1.19] Fix ci flakey tests and image pull registry
2021-04-16 23:09:56 +02:00
f14540cc4f
Wait longer for sonobuoy tests to start up
...
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-04-16 22:24:02 +02:00
98756c8c21
Clean up CI warnings/errors
...
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-04-16 22:24:01 +02:00
c2c742cf92
resolve conflicts
...
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
2021-04-16 22:23:37 +02:00
72e8196c9b
Merge pull request #3208 from MonzElmasry/v1.19.10-k3s1
...
Update to v1.19.10
2021-04-16 11:15:24 +02:00
4ac7d61696
Update to v1.19.10
...
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
2021-04-15 22:17:28 +02:00
52c3f32cc4
Update to v1.19.10
...
Signed-off-by: MonzElmasry <menna.elmasry@rancher.com>
2021-04-15 21:12:54 +02:00
f761529953
Merge pull request #3198 from briandowns/backport_3197_1.19
...
[Backport 1.19] - Resolve local retention issue when S3 in use.
2021-04-14 13:42:19 -07:00
0f3fe02eff
Resolve local retention issue when S3 in use.
...
Remove early return preventing local retention policy to be enforced
resulting in N number of snapshots being stored.
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-04-14 12:09:45 -07:00
dc1d86e684
Merge pull request #3177 from briandowns/backport_pr_3155
...
[Backport 1.19] Hidden Flags Bug Fix
2021-04-14 09:00:55 -07:00
f9450c84e7
Merge pull request #3182 from briandowns/backport_3180
...
[Backport 1.19] - add etcd s3 secret and access key flags to secret data
2021-04-13 10:01:42 -07:00
e48d4b5425
add etcd s3 secret and access key flags and env vars to secret data
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-04-12 15:48:53 -07:00
a3dcc9de36
replace unused variable name with bool literal
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-04-12 12:25:01 -07:00
7807d8117a
delete nocluster file and remove build tag
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-04-12 11:07:02 -07:00
b6623b916e
remove hidden attribute from cluster flags and related code
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-04-12 11:06:41 -07:00
524681fca6
Merge pull request #3080 from briandowns/backport_add_etcd_backup_restore_s3
...
[release-1.19] Backport add etcd backup restore s3
2021-04-02 14:34:59 -07:00
24670c7897
update Go version and parameterize Dockerfile
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-03-31 11:51:04 -07:00
5ba818d788
update dependencies
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-03-31 09:48:43 -07:00
2b6f5eb228
Merge branch 'release-1.19' into backport_add_etcd_backup_restore_s3
2021-03-31 09:12:45 -07:00
7854da1ade
update go.sum
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-03-31 09:10:04 -07:00
6d6354a137
Fix bootstrap save
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-03-31 08:58:37 -07:00
ce7b0d3f5d
update capitalization of usage string
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-03-30 14:50:12 -07:00
ab54af2883
update go mods
...
Signed-off-by: Brian Downs <brian.downs@gmail.com>
2021-03-30 14:50:12 -07:00
ac73524a77
Update to Kubernetes v1.19.9 ( #3095 )
...
* Update to Kubernetes v1.19.9
Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2021-03-30 14:50:12 -07:00
Malte Starostik