Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
b451e08e
Unverified
Commit
b451e08e
authored
Mar 15, 2017
by
Lucas Käldström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: Default to v1.6.0 stable in offline scenarios in beforehand
parent
08e351ac
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
defaults.go
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
+2
-2
cmd.go
cmd/kubeadm/app/cmd/cmd.go
+1
-1
constants.go
cmd/kubeadm/app/constants/constants.go
+1
-1
No files found.
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View file @
b451e08e
...
...
@@ -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"
...
...
@@ -46,7 +46,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
func
SetDefaults_MasterConfiguration
(
obj
*
MasterConfiguration
)
{
if
obj
.
KubernetesVersion
==
""
{
obj
.
KubernetesVersion
=
DefaultKubernetesVersion
obj
.
KubernetesVersion
=
DefaultKubernetes
Fallback
Version
}
if
obj
.
API
.
BindPort
==
0
{
...
...
cmd/kubeadm/app/cmd/cmd.go
View file @
b451e08e
...
...
@@ -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.
...
...
cmd/kubeadm/app/constants/constants.go
View file @
b451e08e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment