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

Add missing source directory for podman cni config #7845

Merged
merged 1 commit into from
Apr 22, 2020

Conversation

afbjorklund
Copy link
Collaborator

For some reason this got lost with previous commit 46df921

Fixes #7840

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 22, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 22, 2020
@codecov-io
Copy link

codecov-io commented Apr 22, 2020

Codecov Report

Merging #7845 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #7845   +/-   ##
=======================================
  Coverage   35.57%   35.57%           
=======================================
  Files         148      148           
  Lines        9297     9297           
=======================================
  Hits         3307     3307           
  Misses       5593     5593           
  Partials      397      397           

@medyagh
Copy link
Member

medyagh commented Apr 22, 2020

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Apr 22, 2020
@afbjorklund
Copy link
Collaborator Author

Do we have any tests for this ?

@medyagh
Copy link
Member

medyagh commented Apr 22, 2020

once jenkins is finished u can test the locally with this ISO
https://storage.cloud.google.com/minikube-builds/7845/minikube.iso

@afbjorklund
Copy link
Collaborator Author

Of course I missed the copy/paste too, uploaded another fixed and rebased commit.

@minikube-pr-bot
Copy link

kvm2 Driver
docker Driver

@afbjorklund afbjorklund self-assigned this Apr 22, 2020
@medyagh
Copy link
Member

medyagh commented Apr 22, 2020

Of course I missed the copy/paste too, uploaded another fixed and rebased commit.

does it work locally ?

@afbjorklund
Copy link
Collaborator Author

does it work locally ?

Not tested

For some reason this got lost with previous commit
@afbjorklund
Copy link
Collaborator Author

This time the build passed (also verified locally).

>>> podman v1.8.2 Installing to target
/usr/bin/install -Dm755 /var/lib/jenkins/go/src/k8s.io/minikube/out/buildroot/output/build/podman-v1.8.2/bin/podman /var/lib/jenkins/go/src/k8s.io/minikube/out/buildroot/output/target/usr/bin/podman
/usr/bin/install -d -m 755 /var/lib/jenkins/go/src/k8s.io/minikube/out/buildroot/output/target/etc/cni/net.d/
/usr/bin/install -m 644 /var/lib/jenkins/go/src/k8s.io/minikube/out/buildroot/output/build/podman-v1.8.2/cni/87-podman-bridge.conflist /var/lib/jenkins/go/src/k8s.io/minikube/out/buildroot/output/target/etc/cni/net.d/87-podman-bridge.conflist

Copy link
Member

@medyagh medyagh left a comment

Choose a reason for hiding this comment

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

thanks for verifying locally. looks good to me.

@medyagh medyagh merged commit 4803589 into kubernetes:master Apr 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ISO build broken on head
5 participants