-
Notifications
You must be signed in to change notification settings - Fork 39.1k
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
Add support for Azure Container Registry, update Azure dependencies #37783
Conversation
Work in progress, needs unit tests, and integration with the kubelet binary. |
I can spot some compile-time errors, will hold off reviewing more until you push more changes. |
@brendandburns It's really late to be adding this to 1.5. cc @saad-ali |
@bgrant0607 it's totally modular and low risk (off everywhere except Azure) |
@brendandburns This is the exception process for non-bugfix changes: |
Like Brian said, we are past feature freeze and are only accepting bug fixes for 1.5.0 at the moment. I'm going to remove the 1.5 label for now. This can be considered for a 1.5.x patch release once 1.5.0 is out |
@colemickens test added, code fixed. Refactor is a todo? @saad-ali I'll propose a cherry-pick it into the 1.5.1 release. |
Jenkins kops AWS e2e failed for commit 6ba2883. Full PR test history. The magic incantation to run this job again is |
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.
few small comments, otherwise looks good
) | ||
|
||
// init registers the various means by which credentials may | ||
// be resolved on GCP. |
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.
s/GCP/azure/
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.
oops copy/paste...
) | ||
|
||
var ( | ||
flagConfigFile = pflag.String("azure-container-registry-config", "", |
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.
Do these wind up exposed on kubelet then?
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.
Yes (switched to pointers so it will actually work...)
a.config.AADClientSecret, | ||
a.environment.ServiceManagementEndpoint) | ||
if err != nil { | ||
glog.Errorf("Failed to load azure credential file: %v", err) |
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.
Error message looks copy/pasted from above, should probably mention "failed to get service principal oauth token" or something similar.
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.
done.
return cfg | ||
} | ||
for ix := range *res.Value { | ||
// TODO: I don't think this will work for national clouds |
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.
related: Azure/go-autorest#102
cc71e44
to
aa18243
Compare
Comments addressed, rebased, please take another look. |
var ( | ||
flagConfigFile = pflag.String("azure-container-registry-config", "", | ||
"Path to the file container Azure container registry configuration information.") | ||
flagConfigEmail = pflag.String("azure-container-registry-email", "", |
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.
Maybe consider a default value? I don't think ACR uses it at all (currently?) and even Docker moved away from it. I imagine we'd just put a dummy value here most of the time anyway.
One other nit comment. /lgtm |
Jenkins unit/integration failed for commit 0420d1d8e6e86b874a3e6798500385d5893313f2. Full PR test history. The magic incantation to run this job again is |
Jenkins GCE etcd3 e2e failed for commit 91f19e3. Full PR test history. The magic incantation to run this job again is |
re-lgtm on cole's LGTM above. |
Automatic merge from submit-queue |
This broke the cross-build, due to that we're vendoring an old version of We could of course try to vendor a newer version of I would suggest we revert this ASAP and try merging a new version of this PR again later this week. cc @kubernetes/sig-testing @k8s-oncall |
@luxas I'm a bit confused. This PR bumps |
@colemickens This PR does indeed bump That makes the crossbuild fail: https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-cross-build/211 The vendored package Can we revert this temporarily to unblock the crossbuild? We really need the cross-build to be healthy, especially tomorrow when kubeadm is gonna be released. |
Sorry, I see it now. I guess if it's blocking a kubeadm release it would make sense to revert to unblock since this is currently targeting Though, I'm wondering, does it build if you revert just the bump to |
@colemickens I can test tomorrow, hopefully that will fix the issue. If it doesn't work, I have to revert unfortunately. Until v1.6, kubeadm releases are dependent on the cross-build for getting the official binary builds, so this is important in that sense to get v1.5 out of the door. (Due to the split-out kubeadm from the monorepo process, etc.) In the future, we should build some automation that automatically runs the crossbuild ci on presubmit for PRs that touch |
Or wait, it might make sense to just revert, otherwise it won't be able to get cherrypicked safely into v1.5. WDYT @colemickens about that? cc @saad-ali |
Automatic merge from submit-queue Revert to version 70b2c90b of the vendored package github.com/Azure/go-ansiterm Fixes the problem described in #37783 (comment) Fixes #38073 @ixdy @gmarek @colemickens @brendandburns
@brendandburns Did you already initiate the cherry pick process for this? |
If it's gonna be cherrypicked, make sure you include the revert commit in PR as well |
Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked. |
@colemickens