azure container registry runner #1107

cedrickring · 2018-10-07T18:44:38Z

Added an acr runner similar to az acr build to build and push images on acr.

googlebot · 2018-10-07T18:44:58Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here (e.g. I signed it!) and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

cedrickring · 2018-10-07T18:47:05Z

I signed it!

googlebot · 2018-10-07T18:47:12Z

CLAs look good, thanks!

codecov-io · 2018-10-07T19:21:00Z

Codecov Report

Merging #1107 into master will decrease coverage by 1.91%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master    #1107      +/-   ##
==========================================
- Coverage   44.09%   42.17%   -1.92%     
==========================================
  Files          84       89       +5     
  Lines        3667     3995     +328     
==========================================
+ Hits         1617     1685      +68     
- Misses       1895     2142     +247     
- Partials      155      168      +13

Impacted Files	Coverage Δ
pkg/skaffold/schema/versions.go	`56.75% <ø> (+3.63%)`	⬆️
pkg/skaffold/runner/runner.go	`49.59% <0%> (-0.62%)`	⬇️
pkg/skaffold/watch/changes.go	`79.62% <0%> (-18.25%)`	⬇️
pkg/skaffold/build/local/jib_gradle.go	`25% <0%> (-17.11%)`	⬇️
pkg/skaffold/build/local/local.go	`48.33% <0%> (-8.49%)`	⬇️
pkg/skaffold/build/local/jib_maven.go	`26.66% <0%> (-8.34%)`	⬇️
pkg/skaffold/kubernetes/wait.go	`24.44% <0%> (-4.97%)`	⬇️
pkg/skaffold/sync/sync.go	`90.32% <0%> (-4.68%)`	⬇️
cmd/skaffold/app/cmd/config.go	`0% <0%> (ø)`	⬆️
pkg/skaffold/jib/jib_gradle.go	`100% <0%> (ø)`	⬆️
... and 18 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a651b8f...2bf4e10. Read the comment docs.

pkg/skaffold/schema/latest/config.go

dgageot

Thanks for adding another managed cloud builder to Skaffold! I've added feedback on a few things that could be improved. Feel free to disagree!

dgageot · 2018-10-08T12:57:48Z

pkg/skaffold/build/acr/acr_build.go

+
+	buildRequest := cr.DockerBuildRequest{
+		ImageNames:     &[]string{imageTag},
+		IsPushEnabled:  &[]bool{true}[0], //who invented bool pointers


Nice trick! You can use util.BoolPtr(tue) instead.

dgageot · 2018-10-08T12:58:55Z

pkg/skaffold/build/acr/acr_build.go

+	}
+	client.Authorizer = authorizer
+
+	result, err := client.GetBuildSourceUploadURL(ctx, b.ResourceGroup, b.ContainerRegistry)


Does that give <> urls for two artifacts that are built in parallel?

Unfortunately not. When uploading to this URL, it saves the tar to a specific location result.RelativePath which has to be passed to the DockerBuildRequest as sourceLocation.

And it only returns a single URL.

dgageot · 2018-10-08T13:02:45Z

pkg/skaffold/build/acr/acr_build.go

+
+// ACR needs the image tag in the following format
+// <repository>:<tag>
+func getImageTagWithoutFQDN(imageTag string) (string, error) {


Could you add a few test for this piece of code? Could you replace the manual parsing a an image name with something like docker.ParseReference() in github.com/GoogleContainerTools/skaffold/pkg/skaffold/docker package?

docker.ParseReference() only provides the BaseName consisting of fqdn/repository, but Azure only needs the repository name. I could extend the function to extract the repository name from the BaseName.

pkg/skaffold/build/acr/azure_storage.go

dgageot · 2018-10-08T13:06:30Z

pkg/skaffold/schema/latest/config.go

+// on Azure Container Registry
+type AzureContainerBuild struct {
+	Credentials       AzureContainerBuildCredentials `yaml:"credentials,omitempty"`
+	ContainerRegistry string                         `yaml:"containerRegistry,omitempty"`


Could a few of those field have sensible default values or be, by default, derived from the image name. Like if I push an image called myregistry.azurecr.io/skaffold-example would it make sense to set containerRegistry to myregistry by default?

That's something we do on GCB to make sure the Skaffold config is as short as possible and contains as few duplication as required.

Yes, I can get the container registry name from the image name, but the resource group needs to be provided separately since it may differ from the registry name.

dgageot · 2018-10-08T13:07:55Z

Gopkg.lock

@@ -16,6 +16,17 @@
  revision = "050b16d2314d5fc3d4c9a51e4cd5c7468e77f162"
  version = "v0.17.0"

+[[projects]]
+  digest = "1:fd5f5c00789da5a6ae78b6c6050eccea46bcd4a519a4913ac82d22bafd7fd368"
+  name = "github.com/Azure/azure-sdk-for-go"


Should github.com/Azure/azure-sdk-for-go be added as a top level constraint in Gopkg.toml`?

I don't think that's necessary. I'm using a versioned import path for azure sdk. See here

dgageot · 2018-10-08T13:10:16Z

examples/acr/Dockerfile

@@ -0,0 +1,6 @@
+FROM gcr.io/google-appengine/golang


nit, you might want to use a smaller image to accelerate the build. (on GCR, we use gcr.io/* images because some of them are pre-pulled on the build node.)

dgageot · 2018-10-08T13:12:40Z

examples/acr/skaffold.yaml

+  acr:
+    containerRegistry: myregistry
+    resourceGroup: myresourcegroup
+    credentials:


Can the credentials be found automatically by Skaffold like it's done for GCB? With GCB, you don't have to configure anything in Skaffold if gcloud is properly authenticated to the right project.

I thing both scenario make sense :

One were you assume the user's machine is properly configured. In that case Skaffold can have the minimal configuration.

One were we prefer to configure Skaffold explicitly. We should add that mode to the GCP builder.

I could create an Authorizer which uses the bearer token from the azure cli config.

So the priority would be: try to use provided credentials, if they're not present try to authenticate with bearer from the config, if the bearer has expired throw an error. I could try to call the azure cli to refresh the bearer though...

So I managed to retrieve all required information from the Azure CLI and other methods, which makes the config basically as empty as:

acr: {}

You can still provide the credentials, but you don't have to specify the resourceGroup and registryName explicitly.

dgageot · 2018-10-08T13:15:03Z

examples/acr/README.adoc

@@ -0,0 +1,34 @@
+=== Example: Azure Container Registry


We are in a nasty chicken and egg situation were a sample config can't be put in examples folder until a release of Skaffold actually supports that config.

You should move the whole sample to integration/examples folder and it will be copied to top level examples next time a release is cut.

…explicitly

dgageot

LGTM

dgageot · 2018-10-12T18:03:40Z

@nkubala @priyawadhwa @r2d4 Could one of you TAL?
@cedrickring One thing that is missing is the ability to interrupt the build. It's also missing on the kaniko builder but was implemented in the GCB builder. I'm ok to add that in another PR though

cedrickring · 2018-10-12T18:37:38Z

@dgageot I'd like to do that in another PR. I'm not sure if it's possible to stop the build actually. But I'll dig into it later.

r2d4

Two small comments. Feel free to merge now and open an issue to fix them later, as I don't think they should matter too much.

r2d4 · 2018-10-12T18:38:42Z

pkg/skaffold/build/acr/acr_build.go

+	"github.com/pkg/errors"
+)
+
+const BuildStatusHeader = "x-ms-meta-Complete"


nit: I think you can leave this unexported

r2d4 · 2018-10-12T18:39:11Z

pkg/skaffold/build/acr/acr_build.go

+}
+
+func getImageTagWithoutFQDN(imageTag string) string {
+	return imageTag[strings.Index(imageTag, "/")+1:]


I think theres a better way to do this using the go-containerregistry. Can you look at an example of the other builders

Maybe add a test or two?

Thanks for the tip with go-containerregistry 👍

priyawadhwa · 2018-10-12T18:38:08Z

examples/annotated-skaffold.yaml

@@ -107,6 +107,19 @@ build:
  #   namespace: default
  #   timeout: 20m

+  # Docker artifacts can be built on an Azure Container Registry.


I think integration/examples/annotated-skaffold.yaml should be modified instead (or in addition to this one), so that when we copy over config changes we don't lose this.

cedrickring · 2018-10-15T14:16:35Z

Should be ready to merge imo

priyawadhwa · 2019-05-10T00:39:12Z

Hey @cedrickring -- we just released support for custom builders and skaffold. If you're still interested in using skaffold with Azure, this could be an option for you! Here's an example using a custom build script and associated docs. If you end up trying it out, please open an issue if you run into any trouble, and let us know if it works for you!

cedrickring · 2019-05-10T07:43:26Z

@priyawadhwa sounds really cool! I'd love to create a custom builder with Azure. Is there a way to specify a e.g. GitHub repo for the builder? So if I want to share my custom builder with others, they don't need to clone it everywhere they need it.

priyawadhwa · 2019-05-10T15:50:56Z

hey @cedrickring , not as of now, but I've updated it as a TODO in #2009

cedrickring added 21 commits October 3, 2018 15:47

Create new config version to support azure container registry builds

21079db

Added AzureContainerBuild to BuildType

ac5d24c

Added builder for azure container registry

e7f1398

Removed blank line

a5a5eac

Use buffer pointer instead of buffer in azure blob storage

cac520a

ensured all packages

7e08ed3

Using proper paths inside source tar

14d691e

Use sourceLocation from GetBuildSourceUploadURL

13e1155

Formatting image tags to match azures requirements

44f869e

Added build status polling

d14ee9f

Try again if log blob is not available yet

15c6b3c

Fix missing output

118938f

Check if response has data before checking for completion

0662bc4

always increment log lines

23e517e

Fix output

b289bd1

Fix build context

f815042

Fixed image tag formatting, now using <repository>:<tag>

a625bed

Fixed image tag regexp

adf3bcc

Renamed method to streamBuildLogs

e9b090a

Added example for Azure Container Registry builds

1e49214

Fixed merge conflicts

ffe32f3

cedrickring requested review from balopat, dgageot, nkubala and r2d4 as code owners October 7, 2018 18:44

cedrickring added 2 commits October 7, 2018 20:53

Added boilerplate to new files

8b60578

Changed variable names to conform golint

8528f48

cedrickring added 3 commits October 7, 2018 21:04

Sorted imports by goimports

5177b7f

Using raw string in regexp

783d7fb

Sorted imports with goimports

f60d6ab

dgageot suggested changes Oct 8, 2018

View reviewed changes

pkg/skaffold/schema/latest/config.go Outdated Show resolved Hide resolved

Use version v1alpha4 for config changes

9284d4c

dgageot suggested changes Oct 8, 2018

View reviewed changes

cedrickring added 10 commits October 8, 2018 18:16

Moved acr example to integration/examples

93a3e30

Using golang:alpine as baseimage for acr example

f49086a

Closing blob upload response now

88f8e32

Closing blob upload response after checking if an error has occurred

45dd7ef

Simplified removing FQDN from image tag

cd32955

Derive registry name from image tag

f952830

Merge remote-tracking branch 'upstream/master'

efc504d

Synced upstream

fce9621

Retrieve bearer token from azure cli if credentials are not provided …

622bbdf

…explicitly

Forgot the error message

12c32c7

dgageot approved these changes Oct 12, 2018

View reviewed changes

r2d4 approved these changes Oct 12, 2018

View reviewed changes

priyawadhwa reviewed Oct 12, 2018

View reviewed changes

cedrickring added 3 commits October 12, 2018 22:08

Using integration/examples for examples instead of examples/

9a5f2a4

Don't export build status header

d5dcbf5

Use go-containerregistry to get image tag for acr

2bf4e10

dgageot merged commit 9efeeac into GoogleContainerTools:master Oct 15, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

azure container registry runner #1107

azure container registry runner #1107

cedrickring commented Oct 7, 2018 •

edited

Loading

googlebot commented Oct 7, 2018

cedrickring commented Oct 7, 2018

googlebot commented Oct 7, 2018

codecov-io commented Oct 7, 2018 •

edited

Loading

dgageot left a comment

dgageot Oct 8, 2018

dgageot Oct 8, 2018

cedrickring Oct 8, 2018 •

edited

Loading

dgageot Oct 8, 2018

cedrickring Oct 8, 2018

dgageot Oct 8, 2018

cedrickring Oct 8, 2018 •

edited

Loading

dgageot Oct 8, 2018

cedrickring Oct 8, 2018 •

edited

Loading

dgageot Oct 8, 2018

dgageot Oct 8, 2018

cedrickring Oct 8, 2018

cedrickring Oct 11, 2018

dgageot Oct 8, 2018

dgageot left a comment

dgageot commented Oct 12, 2018

cedrickring commented Oct 12, 2018

r2d4 left a comment

r2d4 Oct 12, 2018

r2d4 Oct 12, 2018

r2d4 Oct 12, 2018

cedrickring Oct 12, 2018

priyawadhwa Oct 12, 2018

cedrickring commented Oct 15, 2018

priyawadhwa commented May 10, 2019

cedrickring commented May 10, 2019

priyawadhwa commented May 10, 2019

azure container registry runner #1107

azure container registry runner #1107

Conversation

cedrickring commented Oct 7, 2018 • edited Loading

googlebot commented Oct 7, 2018

What to do if you already signed the CLA

Individual signers

Corporate signers

cedrickring commented Oct 7, 2018

googlebot commented Oct 7, 2018

codecov-io commented Oct 7, 2018 • edited Loading

Codecov Report

dgageot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cedrickring Oct 8, 2018 • 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

cedrickring Oct 8, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cedrickring Oct 8, 2018 • 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

dgageot left a comment

Choose a reason for hiding this comment

dgageot commented Oct 12, 2018

cedrickring commented Oct 12, 2018

r2d4 left a 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

cedrickring commented Oct 15, 2018

priyawadhwa commented May 10, 2019

cedrickring commented May 10, 2019

priyawadhwa commented May 10, 2019

cedrickring commented Oct 7, 2018 •

edited

Loading

codecov-io commented Oct 7, 2018 •

edited

Loading

cedrickring Oct 8, 2018 •

edited

Loading

cedrickring Oct 8, 2018 •

edited

Loading

cedrickring Oct 8, 2018 •

edited

Loading