Skip to content
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

Update GCP metadata provider #3349

Merged
merged 2 commits into from Dec 19, 2019
Merged

Update GCP metadata provider #3349

merged 2 commits into from Dec 19, 2019

Conversation

ptone
Copy link
Contributor

@ptone ptone commented May 15, 2019

Updates the userdata key to the more common and documented user-data instead of userdata.

https://cloud.google.com/container-optimized-os/docs/how-to/create-configure-instance#using_cloud-init

Checks to see if the /run/config/ssh directory exists; this allows new ssh keys to be fetched on reboot.

Signed-off-by: Preston Holmes preston@ptone.com

Signed-off-by: Preston Holmes <preston@ptone.com>
@justincormack
Copy link
Member

@GordonTheTurtle
Copy link
Collaborator

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "gcp-fixes" git@github.com:ptone/linuxkit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842356988776
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Signed-off-by: Preston Holmes <preston@ptone.com>
@rn
Copy link
Member

rn commented May 25, 2019

I've build/push/signed the updated metadata package. In a separate commit, could you update the YAMLs to use the new version. Something like:

./scripts/update-component-sha.sh --image linuxkit/metadata:1b80de92a781d6884c26c8375a18698c3eb65111

should do the trick

Copy link
Member

@rn rn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ping. could you update the YAML files as suggested?

@rn
Copy link
Member

rn commented Dec 19, 2019

will merge and then update the packages shortly

@rn rn merged commit 547521d into linuxkit:master Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants