-
Notifications
You must be signed in to change notification settings - Fork 41
Conversation
pkg/script/kubeadm-config.go
Outdated
@@ -13,10 +13,12 @@ apiServerExtraArgs: | |||
controllerManagerExtraArgs: | |||
kubernetesVersion: {{.KubernetesVersion}} | |||
schedulerExtraArgs: | |||
unifiedControlPlaneImage: 10.22.0.1:5000/hyperkube-amd64:{{.HyperkubeTag}} |
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.
TODO: unifiedControlPlaneImage should only be set with --dev
7243238
to
e4ca2ab
Compare
5fe34f6
to
ef7982a
Compare
Description updated. PR ready for review. |
ef7982a
to
bfd70e1
Compare
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.
Tested, and can confirm that this PR fixes the version mismatch issue of dev workflow.
Thanks!
doc/dev-workflow.md
Outdated
|
||
### Limitations | ||
|
||
The kyperkube image contains the api server, the controller manager and the scheduler but not `kubeadm`. |
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/kyperkube/hyperkube
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.
fixed
doc/dev-workflow.md
Outdated
|
||
This article describes a step-by-step example of workflow that a Kubernetes developer might follow when patching Kubernetes. | ||
|
||
For the purpose of the article, we will write a new [admission controler](https://kubernetes.io/docs/admin/admission-controllers/) named `DenyAttach` that inconditionally deny all attaching to a container. The end result will be: |
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/deny/denies?
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.
fixed
really cool 👍 |
Add --hyperkube-tag (or -t) on kube-spawn create to specify which hyperkube Docker image to use. This is useful to compile different versions of Kubernetes and test them in parallel. doc/dev-workflow.md explains in more details how to use it. kube-spawn will start a registry container and push the hyperkube image there under the name 10.22.0.1:5000/hyperkube-amd64:$TAG. Then, kubeadm will pick that image. Use the unifiedControlPlaneImage option in the kubeadm configuration file (>= 1.8) in addition to the old environment variable $KUBE_HYPERKUBE_IMAGE (< 1.8). This means --dev cannot be used anymore on 1.7 branches, but the 1.7 releases still work so it should not be a problem. The dev workflow is now documented in doc/dev-workflow.md Fixes #188
bfd70e1
to
a050ccf
Compare
Thanks for the reviews. I merged it. To improve further the documentation, we could do the following:
|
Add
--hyperkube-tag
(or-t
) onkube-spawn create
to specify which hyperkube Docker image to use. This is useful to compile different versions of Kubernetes and test them in parallel.doc/dev-workflow.md
explains in more details how to use it.kube-spawn will start a
registry
container and push the hyperkube image there under the name10.22.0.1:5000/hyperkube-amd64:$TAG
. Then, kubeadm will pick that image.Use the
unifiedControlPlaneImage
option in the kubeadm configuration file (>= 1.8) in addition to the old environment variable$KUBE_HYPERKUBE_IMAGE
(< 1.8). This means--dev
cannot be used anymore on 1.7 branches, but the 1.7 releases still work so it should not be a problem.The dev workflow is now documented in doc/dev-workflow.md
Fixes #188
TODO
unifiedControlPlaneImage
with--dev
/cc @blixtra