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

kubeadm: Default to v1.6.0 stable in offline scenarios in beforehand #43161

Merged
merged 1 commit into from
Mar 19, 2017
Merged

kubeadm: Default to v1.6.0 stable in offline scenarios in beforehand #43161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const (
DefaultServicesSubnet = "10.96.0.0/12"
DefaultKubernetesVersion = "latest-1.6"
// This is only for clusters without internet, were the latest stable version can't be determined
DefaultKubernetesFallbackVersion = "v1.6.0-beta.1"
DefaultKubernetesFallbackVersion = "v1.6.0"
DefaultAPIBindPort = 6443
DefaultDiscoveryBindPort = 9898
DefaultAuthorizationMode = "RBAC"
Expand All @@ -46,7 +46,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {

func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
if obj.KubernetesVersion == "" {
obj.KubernetesVersion = DefaultKubernetesVersion
obj.KubernetesVersion = DefaultKubernetesFallbackVersion
}

if obj.API.BindPort == 0 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cob
┌──────────────────────────────────────────────────────────┐
│ On the second machine │
├──────────────────────────────────────────────────────────┤
│ node# kubeadm join --token=<token> <ip-of-master> │
│ node# kubeadm join --token=<token> <ip-of-master>:<port> │
└──────────────────────────────────────────────────────────┘

You can then repeat the second step on as many other machines as you like.
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const (
SchedulerKubeConfigFileName = "scheduler.conf"

// Important: a "v"-prefix shouldn't exist here; semver doesn't allow that
MinimumControlPlaneVersion = "1.6.0-beta.1"
MinimumControlPlaneVersion = "1.6.0-beta.3"

// Some well-known users and groups in the core Kubernetes authorization system

Expand Down