Add linuxkit run azure #1933

radu-matei · 2017-05-30T14:41:26Z

- What I did
Add linuxkit run azure functionality

- How I did it
Integrate with the Azure Go SDK

GordonTheTurtle · 2017-05-30T14:41:28Z

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 "run-azure" git@github.com:radu-matei/linuxkit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354307328
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.

justincormack · 2017-05-30T16:28:29Z

src/cmd/linuxkit/push_azure.go

+		fmt.Printf("USAGE: %s run azure [options] [name]\n\n", invoked)
+		fmt.Printf("'name' specifies either the name of an already uploaded\n")
+		fmt.Printf("VHD image or the full path to a image file which will be\n")
+		fmt.Printf("uploaded before it is run.\n\n")


thats a bit odd. push should always take a local file and upload it.

justincormack · 2017-05-30T16:28:59Z

src/cmd/linuxkit/push_azure.go

+
+	resourceGroupName := flags.String("resourceGroupName", "", "Name of resource group to be used for VM")
+	accountName := flags.String("accountName", "linuxkitstorage", "Name of the storage account")
+	imagePath := flags.String("imagePath", "", "Local path of the VHD file to be used as OS image")


this should just be the last argument on the command line, not a flag - see the other push examples.

justincormack · 2017-05-30T16:29:36Z

src/cmd/linuxkit/run_azure.go

+		fmt.Printf("'name' specifies either the name of an already uploaded\n")
+		fmt.Printf("Azure VM VHD or the full path to a image file which will be\n")
+		fmt.Printf("uploaded before it is run.\n\n")
+		fmt.Printf("Options:\n\n")


yes this is the same help text as above, I think it should be different

justincormack · 2017-05-31T13:01:47Z

docs/azure.md

-> This is a preliminary example image with SSHD and Docker services. In the future, there will be an `azure.yml` file in the `examples` directory
-
-Create a new `dev.yml` file [based on the Azure example](../examples/azure.yml), generate a new SSH key and add it in the `yml`, then `moby build dev.yml`.
+Create a new `azure.yml` file [based on the Azure example](../examples/azure.yml), generate a new SSH key and add it in the `yml`, then `moby build azure.yml`.


you can use the source functionality in the files section to get an ssh key from a file, rather than hard coding it now. (unfortunately this is not yet used by the other examples).

Azure has a metadata service for keys though? Should we add support for this to the metadata package?

justincormack · 2017-05-31T13:03:01Z

src/cmd/linuxkit/azure.go

@@ -127,16 +137,14 @@ func createStorageAccount(accountName, location string, resourceGroup resources.
 func uploadVMImage(resourceGroupName string, accountName string, imagePath string) {
 	accountKeys, err := accountsClient.ListKeys(resourceGroupName, accountName)
 	if err != nil {
-		fmt.Println(err.Error())
-		log.Fatalf("Unable to retrieve storage account key")
+		log.Fatalf("Unable to retrieve storage account key: %s", err.Error())


you can just use "blah : %v", err which will do the same thing more simply (its what we use elsewhere)

justincormack · 2017-05-31T13:05:19Z

src/cmd/linuxkit/azure.go

-				AdminPassword: to.StringPtr("DummyPassword!123"),
+				ComputerName:  to.StringPtr(defaultComputerName),
+				AdminUsername: to.StringPtr(unusedAdminUsername),
+				AdminPassword: to.StringPtr(unusedPassword),


Still somewhat concerned about these - where are these documented? What exactly are they passwords for?

User creation, SSH and passwords are managed by the Azure Linux Agent, which is not present in the images we create at the moment.

The only purpose for those values right now is for deployment validation. I am still thinking of a better way to achieve this.

Ah yes, ok. I think it is better to make the username and password "unused" and "unused" for now, if they can't be empty.

Or at least put a comment.

Yeah, the password requirements are below (3/4 are mandatory):

Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\W_])

Will add a comment.

ugh, yes a comment would be best then

justincormack · 2017-05-31T13:06:11Z

src/cmd/linuxkit/push_azure.go

 		fmt.Printf("'name' specifies the path (absolute or relative) of a\n")
 		fmt.Printf("VHD image be uploaded to an existing Azure Storage Account\n")
 		fmt.Printf("Options:\n\n")
 		flags.PrintDefaults()
 	}

 	resourceGroupName := flags.String("resourceGroupName", "", "Name of resource group to be used for VM")
-	accountName := flags.String("accountName", "linuxkitstorage", "Name of the storage account")
+	accountName := flags.String("accountName", "", "Name of the storage account")


this doesn't seem consistent with run below

radu-matei · 2017-05-31T13:29:28Z

src/cmd/linuxkit/azure.go

+	storageAccountKeyArg := fmt.Sprintf("STORAGE_ACCOUNT_KEY=%s", *keys[0].Value)
+	vhdPath := fmt.Sprintf("VHD_PATH=/vhds/%s", image)
+
+	output, err := exec.Command("docker", "run", "-v", dockerMount, "-e", vhdPath, "-e", storageAccountNameArg, "-e", storageAccountKeyArg, "radumatei/azure-vhd-upload:alpine").CombinedOutput()


@justincormack The question still remains on the docker dependency.

Is this an urgent matter that I should address right now, or can I tackle other issues related to Azure (like opening ports on the VM, for example)?

Well I think it needs to be resolved before we merge probably...

Removed the dependency on docker here

rn · 2017-05-31T13:45:08Z

There shouldn't be an additional commit with the fixes to the previous commit

rn · 2017-05-31T13:50:45Z

examples/azure.yml

@@ -0,0 +1,101 @@
+kernel:


can you base this on the most recent examples? A lot of the lines are no longer necessary. Also, most of the images used here are outdated.

Updated example to sshd.yml (for now)

rn · 2017-05-31T14:01:24Z

src/cmd/linuxkit/run_azure.go

+	flags := flag.NewFlagSet("azure", flag.ExitOnError)
+	invoked := filepath.Base(os.Args[0])
+	flags.Usage = func() {
+		fmt.Printf("USAGE: %s run azure [options] imagePath\n\n", invoked)


it's called imagePath here, but name for push

radu-matei · 2017-05-31T14:54:53Z

@rneugeba Can't I just squash the commits just before we merge?

There is still some work to be done here, I would rather commit as I go and squash at the end. Is this ok?

rn · 2017-05-31T14:56:41Z

sure

justincormack · 2017-06-01T09:56:40Z

Needs to be rebased (use git fetch upstream; git rebase upstream/master not git merge and then it will be easier to squash and so on later...)

ddebroy · 2017-06-01T22:18:49Z

@radu-matei Is it possible to just kick off https://hub.docker.com/r/docker4x/agent-azure/ from the VHD? As we discussed in another forum, it will take care of getting the WALinux Agent (so that the VM shows up with correct status in Portal) and set up SSHD as well. agent-azure is maintained by Docker.

radu-matei · 2017-06-02T06:43:23Z

@ddebroy Could you point me to an example where this image is used?

Still, this does not change the way we do linuxkit run azure or linukit push azure, but the way we create images for Azure. So it would affect the example, azure,yml.

Thanks!

radu-matei · 2017-06-02T06:46:10Z

And if we integrate that image (and it is indeed the WALinux Agent), then we can no longer set unused usernames and passwords when creating the VM

ddebroy · 2017-06-02T07:03:25Z

You can take a peek at /etc/init.d/azure in the Moby VHD for Docker4Azure on how we kick it off. Essentially we do something like this:

export DOCKER_FOR_IAAS_VERSION="17.04.0-ce-azure1"
...
docker run -d \
		--privileged \
		--name agent \
		--ipc host \
		--pid host \
		--net host \
		--uts host \
		--label com.docker.editions.system \
		--restart unless-stopped \
		-e DOCKER_FOR_IAAS_VERSION \
		-v /usr/bin/docker:/usr/local/bin/docker:ro \
		-v /mnt:/mnt \
		-v /etc:/etc \
		-v /var/etc/ssh:/etc/ssh \
		-v /var/etc/hostname:/etc/hostname \
		-v /var/home:/home \
		-v /var/run/docker.sock:/var/run/docker.sock \
		-v /var/log:/var/log \
		-v /lib/modules:/lib/modules \
		-v /lib/firmware:/lib/firmware \
		-v /var/lib/waagent:/var/lib/waagent \
		"docker4x/agent-azure:$DOCKER_FOR_IAAS_VERSION"

justincormack · 2017-06-02T09:03:24Z

@ddebroy I think it would make more sense to add the azure agent to this repo as a package here.

azure: React to change requests azure: Fix push and run message and update example azure: Remove docker dependency and upload VHD Modify %s to %v for Go errors Signed-off-by: radu-matei <matei.radu94@gmail.com>

azure: Add further vendor dependencies Signed-off-by: radu-matei <matei.radu94@gmail.com>

radu-matei · 2017-06-02T11:43:39Z

Rebased and squashed commits.

radu-matei · 2017-06-05T07:43:14Z

Is there anything else needed to merge a first version of this?

justincormack · 2017-06-05T08:20:03Z

vendor.conf

@@ -11,6 +11,12 @@ github.com/rneugeba/iso9660wrap 4606f848a055435cdef85305960b0e1bb788d506
 github.com/satori/go.uuid b061729afc07e77a8aa4fad0a2fd840958f1942a
 github.com/surma/gocpio fcb68777e7dc4ea43ffce871b552c0d073c17495
 github.com/vmware/govmomi 6f8ebd89d521d9f9af7a6c2219c4deee511020dd
+github.com/Azure/azure-sdk-for-go 26132835cbefa2669a306b777f34b929b56aa0a2
+github.com/radu-matei/azure-sdk-for-go 3b12823551999669c9a325a32472508e0af7978e


Why are you using both the official and a forked version?

This is the main reason.

Basically, the library used for uploading the VHD is based on an older version of the SDK (that is not backwards compatible), so I needed two versions in vendor.conf.

And since vndr does not accept two vendored dependencies with the same base repo, had to fork them and point a specific (older) commit as the dependency.

ok, lets go with this for now and improve later.

GordonTheTurtle added dco/no status/0-triage labels May 30, 2017

justincormack reviewed May 30, 2017

View reviewed changes

GordonTheTurtle removed the dco/no label May 31, 2017

justincormack mentioned this pull request May 31, 2017

Azure support #1939

Closed

GordonTheTurtle added the dco/no label May 31, 2017

justincormack reviewed May 31, 2017

View reviewed changes

GordonTheTurtle removed the dco/no label May 31, 2017

radu-matei commented May 31, 2017

View reviewed changes

rn reviewed May 31, 2017

View reviewed changes

radu-matei added 2 commits June 2, 2017 14:41

Add Azure push and run

0f2e41f

azure: React to change requests azure: Fix push and run message and update example azure: Remove docker dependency and upload VHD Modify %s to %v for Go errors Signed-off-by: radu-matei <matei.radu94@gmail.com>

Add vendoring for Azure

f1f1d93

azure: Add further vendor dependencies Signed-off-by: radu-matei <matei.radu94@gmail.com>

justincormack reviewed Jun 5, 2017

View reviewed changes

justincormack approved these changes Jun 5, 2017

View reviewed changes

justincormack merged commit 4b60965 into linuxkit:master Jun 5, 2017

radu-matei mentioned this pull request Jun 6, 2017

Add build support for Azure to moby build #1421

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add linuxkit run azure #1933

Add linuxkit run azure #1933

radu-matei commented May 30, 2017

GordonTheTurtle commented May 30, 2017

justincormack May 30, 2017

justincormack May 30, 2017

justincormack May 30, 2017

justincormack May 31, 2017

justincormack May 31, 2017 •

edited

Loading

justincormack May 31, 2017

radu-matei May 31, 2017

justincormack May 31, 2017

justincormack May 31, 2017

radu-matei May 31, 2017

justincormack May 31, 2017

justincormack May 31, 2017

radu-matei May 31, 2017

justincormack May 31, 2017

radu-matei May 31, 2017

rn commented May 31, 2017

rn May 31, 2017

radu-matei May 31, 2017

rn May 31, 2017

radu-matei commented May 31, 2017

rn commented May 31, 2017

justincormack commented Jun 1, 2017

ddebroy commented Jun 1, 2017 •

edited

Loading

radu-matei commented Jun 2, 2017 •

edited

Loading

radu-matei commented Jun 2, 2017

ddebroy commented Jun 2, 2017 •

edited

Loading

justincormack commented Jun 2, 2017

radu-matei commented Jun 2, 2017

radu-matei commented Jun 5, 2017

justincormack Jun 5, 2017

radu-matei Jun 5, 2017

radu-matei Jun 5, 2017 •

edited

Loading

justincormack Jun 5, 2017

Add linuxkit run azure #1933

Add linuxkit run azure #1933

Conversation

radu-matei commented May 30, 2017

GordonTheTurtle commented May 30, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justincormack May 31, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rn commented May 31, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

radu-matei commented May 31, 2017

rn commented May 31, 2017

justincormack commented Jun 1, 2017

ddebroy commented Jun 1, 2017 • edited Loading

radu-matei commented Jun 2, 2017 • edited Loading

radu-matei commented Jun 2, 2017

ddebroy commented Jun 2, 2017 • edited Loading

justincormack commented Jun 2, 2017

radu-matei commented Jun 2, 2017

radu-matei commented Jun 5, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

radu-matei Jun 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

justincormack May 31, 2017 •

edited

Loading

ddebroy commented Jun 1, 2017 •

edited

Loading

radu-matei commented Jun 2, 2017 •

edited

Loading

ddebroy commented Jun 2, 2017 •

edited

Loading

radu-matei Jun 5, 2017 •

edited

Loading