-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Complete support for Flatcar #7545
Conversation
Hi @mazzy89. Thanks for your PR. I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Is there a way to test this safely? |
Following these two resources to test the changes locally
and make sure in this iteration that Flatcar is properly supported. I'll get back here once I'll have it properly tested. |
/ok-to-test Thanks @mazzy89 - this lgtm. I'm going to mark as lgtm, but we can wait until you give the word before marking as approved (which would cause it to merge) It's also fine to merge this now if you'd prefer, as it is fairly obviously correct - anything that references DistributionCoreOS should probably also reference FlatCar :-) /lgtm |
@justinsb in order to test this locally, the only way to put this commit in the |
I've figured out and starting to test it. fingers crossed |
has the parseKubernetesVersion logic changed?
naturally the |
343cb85
to
9d23fae
Compare
/retest |
@mazzy89 docs on how to do local development are here: docs/development/adding_a_feature.md nodeup changes do require you to upload your own nodeup, but they should work! |
@justinsb yeah I saw them. thank you. there is just an issue in handling the kubernetes version. when the |
And the heuristics that pull a kubernetes version out of a URL expect it to contain But in any case, I think we can merge this PR now? |
Yes exactly. it expects
should I also upload the kbuernetes official build there? I havne't fully tested this so not sure if this time it will work. |
I think if you just specify the kubernetes version as 1.15.0 and it'll use the normal locations for kubernetes. If you want to mirror kubernetes to a private S3 bucket, you will have to copy the docker_tag files as well - and it's probably easiest just to copy everything! But ... I don't think you need to mirror kubernetes to test this change? |
If I just specify a version like I've followed this and indeed uploaded to my bucket https://github.com/kubernetes/kops/blob/master/docs/development/adding_a_feature.md#testing |
Hmm ... thanks for pointing it out - the real instructions are a bit buried... The trick is the KOPS_BASE_URL env var, so it's this bit of the instructions that are most relevant:
Not sure if I should try to create another document about this or clean up the existing docs - any thoughts? Also, the |
but it's not the same setting up the I've set up |
@mazzy89 ah no, they are different. KOPS_BASE_URL is the base url for the kops artifacts (nodeup, protokube). KubernetesVersion determines the base url for the kubernetes artifacts (kubelet, apiserver, kube-controller-manager, kube-scheduler, kube-proxy etc). KubernetesVersion can either be a full url (used when testing kubernetes) or a semver version (in which case we use the official distribution buckets for kubernetes). |
Oh now it makes sense. I was confused and I thought they were the same. Do we have |
Currently KOPS_BASE_URL can only be set by env-var. I don't really think of it as a cluster property (e.g. we don't have the kops version in the cluster config), but I could see that maybe we should support setting it in the configuration file |
Signed-off-by: Salvatore Mazzarino <[email protected]>
Signed-off-by: Salvatore Mazzarino <[email protected]>
I've made the changes because I felt that would add less complexity and would help to move faster (hopefully) this PR. So this PR will rely on the changes here #7978 |
Signed-off-by: Salvatore Mazzarino <[email protected]>
Hi @mazzy89, yep that sounds good. Thank you for the contribution! /lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: KashifSaadat, mazzy89 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
why not include it to v1.16alpha and v1.17alpha? |
@linecolumn I've cherry-picked those changes and put into release-1.15 and release -1.17. |
@mazzy89 just out of curiosity, why did you skip 1.16 with the cherry-picks? |
Oh right forgot it.I was convinced i did but actually forgot it. thank you @hakman going to do that |
…origin-release-1.17 Automated cherry pick of #7545: Complete support for Flatcar
…origin-release-1.15 Automated cherry pick of #7545: Complete support for Flatcar
@hakman PR cherry-picked to 1.15/1.16/1.17 release branches. yours I saw it too. now hope to see a release pretty soon but considering the holidays I think the next release will be for Jan. |
Hehe. Nice to see that it all worked out well. |
…origin-release-1.16 Automated cherry pick of #7545: Complete support for Flatcar
Signed-off-by: Salvatore Mazzarino [email protected]
Another tiny change that fixes the support for Flatcar (still broken, unfortunately)
As tested in the release 1.15.1-alpha.1
core@ip-172-20-65-153 ~ $ sudo journalctl -u coreos-cloudinit-350015389.service -- Logs begin at Mon 2019-09-09 20:19:38 UTC, end at Mon 2019-09-09 20:26:45 UTC. -- Sep 09 20:19:59 ip-172-20-65-153.ec2.internal systemd[1]: Started Unit generated and executed by coreos-cloudinit on behalf of user. Sep 09 20:19:59 ip-172-20-65-153.ec2.internal bash[1454]: == nodeup node config starting == Sep 09 20:19:59 ip-172-20-65-153.ec2.internal bash[1454]: Downloading nodeup (https://github.com/kubernetes/kops/releases/download/1.15.0-alpha.1/linux-am> Sep 09 20:19:59 ip-172-20-65-153.ec2.internal bash[1454]: % Total % Received % Xferd Average Speed Time Time Time Current Sep 09 20:19:59 ip-172-20-65-153.ec2.internal bash[1454]: Dload Upload Total Spent Left Speed Sep 09 20:19:59 ip-172-20-65-153.ec2.internal bash[1454]: [158B blob data] Sep 09 20:20:00 ip-172-20-65-153.ec2.internal bash[1454]: [158B blob data] Sep 09 20:20:00 ip-172-20-65-153.ec2.internal bash[1454]: == Downloaded https://github.com/kubernetes/kops/releases/download/1.15.0-alpha.1/linux-amd64-no> Sep 09 20:20:00 ip-172-20-65-153.ec2.internal bash[1454]: Running nodeup Sep 09 20:20:00 ip-172-20-65-153.ec2.internal bash[1454]: nodeup version 1.15.0-alpha.1 (git-7c84c4848) Sep 09 20:20:00 ip-172-20-65-153.ec2.internal bash[1454]: F0909 20:20:00.545365 1481 distribution.go:96] unknown distribution: flatcar Sep 09 20:20:00 ip-172-20-65-153.ec2.internal systemd[1]: coreos-cloudinit-350015389.service: Main process exited, code=exited, status=1/FAILURE Sep 09 20:20:00 ip-172-20-65-153.ec2.internal systemd[1]: coreos-cloudinit-350015389.service: Failed with result 'exit-code'.