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

Omit error message if 100-crio-bridge.conf has already been disabled #9505

Merged
merged 1 commit into from
Oct 22, 2020

Conversation

tstromberg
Copy link
Contributor

@tstromberg tstromberg commented Oct 21, 2020

Fixes #9481

If you restart a flannel cluster, you get an annoying error message displayed to stderr:

E1017 11:05:17.891097   21588 flannel.go:656] unable to disable /etc/cni/net.d/100-crio-bridge.conf: sudo mv /etc/cni/net.d/100-crio-bridge.conf \etc\cni\net.d\DISABLED-100-crio-bridge.conf: Process exited with status 1
stdout:

stderr:
mv: cannot stat '/etc/cni/net.d/100-crio-bridge.conf': No such file or directory

This PR silences this spurious error message by checking first if the file exists. Tested using:

  1. minikube start --network-plugin=cni --cni=flannel --driver=docker
  2. minikube stop
  3. minikube start

This PR is not a behavioral change other than removing the stderr message.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 21, 2020
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 21, 2020
@tstromberg
Copy link
Contributor Author

/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 Oct 21, 2020
@codecov-io
Copy link

Codecov Report

Merging #9505 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #9505      +/-   ##
==========================================
- Coverage   29.08%   29.05%   -0.03%     
==========================================
  Files         171      171              
  Lines       10443    10443              
==========================================
- Hits         3037     3034       -3     
- Misses       6983     6987       +4     
+ Partials      423      422       -1     
Impacted Files Coverage Δ
cmd/minikube/cmd/start_flags.go 47.16% <0.00%> (-0.60%) ⬇️
cmd/minikube/cmd/start.go 9.38% <0.00%> (-0.15%) ⬇️

@minikube-pr-bot
Copy link

kvm2 Driver
error collecting results for kvm2 driver: timing run 0 with Minikube (PR 9505): timing cmd: [/home/performance-monitor/.minikube/minikube-binaries/9505/minikube start --driver=kvm2]: starting cmd: fork/exec /home/performance-monitor/.minikube/minikube-binaries/9505/minikube: exec format error
docker Driver
error collecting results for docker driver: timing run 0 with Minikube (PR 9505): timing cmd: [/home/performance-monitor/.minikube/minikube-binaries/9505/minikube start --driver=docker]: starting cmd: fork/exec /home/performance-monitor/.minikube/minikube-binaries/9505/minikube: exec format error

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: medyagh, tstromberg

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

@medyagh medyagh merged commit 9248335 into kubernetes:master Oct 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
5 participants