-
Notifications
You must be signed in to change notification settings - Fork 55
Relocate reconcilers from wksctl to CAPEI (cluster-api-provider-existinginfra) #286
Conversation
It strikes me as unlikely we want to move Similarly Code like Similarly
|
Yes most of the code is currently misplaced, I've started by moving |
b8bf241
to
5912743
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking better.
assert.EqualError(t, err, "invalid version \"bad version\": Invalid character(s) found in major number \"bad version\"") | ||
assert.False(t, matches) | ||
} | ||
|
||
func TestVersionLessthanWithBothVs(t *testing.T) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why did we lose these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
version.LessThan
(and some other version
functions as well) are used by the machine controller, and have thus been moved to capi-existinginfra
along with these tests. See capi-existinginfra/pkg/utilities/version.
go.mod
Outdated
require github.com/twelho/capi-existinginfra v0.0.0 | ||
|
||
replace ( | ||
github.com/twelho/capi-existinginfra => ../capi-existinginfra |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this looks like it should have been removed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be removed soon when I get the repo published and import paths updated.
Update: Now removed.
Signed-off-by: Dennis Marttinen <dennis@weave.works>
3b43c6b
to
0a3b8be
Compare
All tasks are now completed and tests pass 🎉 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Amazing work @twelho 💯 🥇 🚀!
Only one small nit 😉
@@ -130,6 +130,8 @@ jobs: | |||
FOOTLOOSE_CHECKSUM: 0e4e49e81940c5876eafa26607154acd788d9979e9f4a4215f17532a3ea5429a | |||
KUBECTL_URL: https://dl.k8s.io/v1.18.5/kubernetes-client-linux-amd64.tar.gz | |||
KUBECTL_CHECKSUM: f6051fa7f715c68d56998d9b4c9be4f08552f3a8427b2c6b9e2e5339dd2929b6 | |||
CAPEI_URL: https://github.com/weaveworks/cluster-api-provider-existinginfra/archive/v0.0.2.tar.gz | |||
CAPEI_CHECKSUM: a2d5d2a0f43a2c0872bcc96265d753868a4f0867f555743a5e280cff73f95cdc |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note for @bboreham @jrryjcksn @palemtnrider: need to update this whenever CAPEI comes with new releases 😄
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or, build automation around getting the latest release
go.mod
Outdated
@@ -26,6 +22,7 @@ require ( | |||
github.com/spf13/pflag v1.0.5 | |||
github.com/stretchr/testify v1.6.1 | |||
github.com/thanhpk/randstr v1.0.4 | |||
github.com/weaveworks/cluster-api-provider-existinginfra v0.0.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bump this to v0.0.2 now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, updated.
Nice work @twelho !
This was a huge amount of work thank you for tackling it! |
Hi @palemtnrider, thanks for your comments!
|
012e73e
to
7c73276
Compare
Signed-off-by: Dennis Marttinen <dennis@weave.works>
Signed-off-by: Dennis Marttinen <dennis@weave.works>
Signed-off-by: Dennis Marttinen <dennis@weave.works>
Signed-off-by: Dennis Marttinen <dennis@weave.works>
Signed-off-by: Dennis Marttinen <dennis@weave.works>
7c73276
to
60e1ca4
Compare
With the latest push the large diff of |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great work, thanks!
This PR extracts the
Cluster
andMachine
controllers from wksctl out to a separate repo nicknamed CAPEI (cluster-api-provider-existinginfra). The needed controller-related functionality is then vendored in.Status:
go.mod
hacks removed)cc @luxas @bboreham