github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #41502 from luxas/kubeadm_bump_limit 

Automatic merge from submit-queue (batch tested with PRs 41104, 41245, 40722, 41439, 41502)

Bump the minimum kubeadm control plane version to v1.6.0-alpha.2

**What this PR does / why we need it**:

There went in quite a lot of useful features into v1.6.0-alpha.2 that kubeadm will use.
This bump the minimum limit so we can depend on those features.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```
@mikedanese @errordeveloper @pires @dmmcquay @dgoodwin
pull/6/head
Kubernetes Submit Queue 2017-02-15 16:28:12 -08:00 committed by GitHub
parent 92360ffc5f 62dcce6c39
commit c478d72827
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/defaults.go
View File

@ -60,7 +60,7 @@ func setInitDynamicDefaults(cfg *kubeadmapi.MasterConfiguration) error {
return fmt.Errorf("couldn't parse kubernetes version %q: %v", cfg.KubernetesVersion, err) return fmt.Errorf("couldn't parse kubernetes version %q: %v", cfg.KubernetesVersion, err)
} }
if k8sVersion.LT(minK8sVersion) { if k8sVersion.LT(minK8sVersion) {
return fmt.Errorf("this version of kubeadm only supports deploying clusters with the control plane version >= v1.6.0-alpha.1. Current version: %s", cfg.KubernetesVersion) return fmt.Errorf("this version of kubeadm only supports deploying clusters with the control plane version >= v%s. Current version: %s", kubeadmconstants.MinimumControlPlaneVersion, cfg.KubernetesVersion)
} }
fmt.Printf("[init] Using Kubernetes version: %s\n", cfg.KubernetesVersion) fmt.Printf("[init] Using Kubernetes version: %s\n", cfg.KubernetesVersion)

2
cmd/kubeadm/app/constants/constants.go
View File

@ -44,7 +44,7 @@ const (
AuthzModeWebhook = "Webhook" AuthzModeWebhook = "Webhook"
// Important: a "v"-prefix shouldn't exist here; semver doesn't allow that // Important: a "v"-prefix shouldn't exist here; semver doesn't allow that
MinimumControlPlaneVersion = "1.6.0-alpha.1" MinimumControlPlaneVersion = "1.6.0-alpha.2"
// Constants for what we name our ServiceAccounts with limited access to the cluster in case of RBAC // Constants for what we name our ServiceAccounts with limited access to the cluster in case of RBAC
KubeDNSServiceAccountName = "kube-dns" KubeDNSServiceAccountName = "kube-dns"