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

Fix bugs that prevented previously-enabled addons from starting up #6471

Merged
merged 7 commits into from
Feb 4, 2020

Conversation

tstromberg
Copy link
Contributor

If a cluster is stopped, and then started, we were not enabling previously enabled addons due to two bugs:

  • We were not reading the existing addons config
  • Even if we were, the necessary directory (/etc/kubernetes/addons) was not being recreated at startup.

Fixes #6456

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 3, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 3, 2020
@medyagh
Copy link
Member

medyagh commented Feb 3, 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 Feb 3, 2020
@minikube-pr-bot
Copy link

Error: running mkcmp: exit status 1

@minikube-pr-bot
Copy link

All Times minikube: [ 101.919553 95.012687 102.323714]
All Times Minikube (PR 6471): [ 100.270500 96.253887 97.864844]

Average minikube: 99.751984
Average Minikube (PR 6471): 98.129744

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6471) |
+----------------------+-----------+--------------------+
| minikube v           |  0.331211 |           0.327189 |
| Creating kvm2        | 20.373761 |          20.924098 |
| Preparing Kubernetes | 50.258178 |          49.512817 |
| Pulling images       |  4.155255 |           3.854587 |
| Launching Kubernetes | 21.297202 |          19.879988 |
| Waiting for cluster  |  1.070253 |           1.086055 |
+----------------------+-----------+--------------------+

@codecov-io
Copy link

codecov-io commented Feb 3, 2020

Codecov Report

Merging #6471 into master will decrease coverage by 0.12%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6471      +/-   ##
==========================================
- Coverage   37.99%   37.87%   -0.13%     
==========================================
  Files         128      128              
  Lines        8729     8757      +28     
==========================================
  Hits         3317     3317              
- Misses       4986     5014      +28     
  Partials      426      426
Impacted Files Coverage Δ
cmd/minikube/cmd/delete.go 25.12% <0%> (-1.55%) ⬇️
cmd/minikube/cmd/stop.go 0% <0%> (ø) ⬆️
cmd/minikube/cmd/status.go 23.14% <0%> (-3.17%) ⬇️

@minikube-pr-bot
Copy link

All Times minikube: [ 99.983179 96.674863 102.425099]
All Times Minikube (PR 6471): [ 98.018484 101.017347 100.470089]

Average minikube: 99.694380
Average Minikube (PR 6471): 99.835307

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6471) |
+----------------------+-----------+--------------------+
| minikube v           |  0.453406 |           0.300249 |
| Creating kvm2        | 21.037232 |          20.459426 |
| Preparing Kubernetes | 50.891924 |          50.925354 |
| Pulling images       |  3.692811 |           3.435675 |
| Launching Kubernetes | 20.059037 |          21.251220 |
| Waiting for cluster  |  1.392061 |           1.068302 |
+----------------------+-----------+--------------------+

@minikube-pr-bot
Copy link

All Times minikube: [ 95.919006 97.562193 97.807202]
All Times Minikube (PR 6471): [ 96.293574 96.471989 97.442563]

Average minikube: 97.096134
Average Minikube (PR 6471): 96.736042

Averages Time Per Log

+----------------------+-----------+--------------------+
|         LOG          | MINIKUBE  | MINIKUBE (PR 6471) |
+----------------------+-----------+--------------------+
| minikube v           |  0.313105 |           0.306181 |
| Creating kvm2        | 20.206672 |          20.202842 |
| Preparing Kubernetes | 49.396775 |          49.961816 |
| Pulling images       |  4.324972 |           3.748858 |
| Launching Kubernetes | 19.205640 |          19.532199 |
| Waiting for cluster  |  1.054114 |           1.079803 |
+----------------------+-----------+--------------------+

@tstromberg tstromberg merged commit 62f6566 into kubernetes:master Feb 4, 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

stop+start breaks addons: /etc/kubernetes/addons not recreated
5 participants