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.

Sign up for GitHub

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

Jump to bottom

fix cniAsset from env var #2897

Merged
merged 1 commit into from
Jul 13, 2017
Merged

fix cniAsset from env var #2897

merged 1 commit into from
Jul 13, 2017

Conversation

qqshfox
Copy link
Contributor

@qqshfox qqshfox commented Jul 10, 2017

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 10, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @qqshfox. 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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 10, 2017
justinsb
justinsb reviewed Jul 13, 2017
View reviewed changes
upup/pkg/fi/cloudup/apply_cluster.go Outdated
@@ -235,7 +235,11 @@ func (c *ApplyClusterCmd) Run() error {
return err
}

c.Assets = append(c.Assets, cniAssetHashString+"@"+cniAsset)
if cniAssetHashString == "" {
c.Assets = append(c.Assets, cniAsset)
Copy link
Member

Choose a reason for hiding this comment

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

Nit: might be a good idea to log a warning here

justinsb
justinsb approved these changes Jul 13, 2017
View reviewed changes
Copy link
Member

@justinsb justinsb left a comment

Choose a reason for hiding this comment

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

LGTM

@justinsb
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 13, 2017
@justinsb justinsb self-assigned this Jul 13, 2017
@qqshfox qqshfox force-pushed the cni_assets_from_env_var branch from cddfe68 to b54724a Compare July 13, 2017 06:44
@qqshfox
Copy link
Contributor Author

qqshfox commented Jul 13, 2017

Added a warning log to indicate using cniAsset directly when cniAssetHashString is empty.

@chrislovecnm chrislovecnm merged commit 87ad3ee into kubernetes:master Jul 13, 2017
@qqshfox qqshfox deleted the cni_assets_from_env_var branch July 15, 2017 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinsb justinsb justinsb approved these changes

Assignees

@justinsb justinsb

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@qqshfox @k8s-ci-robot @justinsb @chrislovecnm