Skip to content

K
k3s
Commit 83249d37 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43999 from mikedanese/vers-fail

Automatic merge from submit-queue kubeadm: fail explicitly when using (stable,latest) in airgapped env This is unintuitive and unnecessary behavior
parents e28cb427 3c77465a
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 15 deletions
cmd/kubeadm/app/apis/kubeadm/v1alpha1/defaults.go
View file @ 83249d37
...@@ -26,14 +26,12 @@ import ( ...@@ -26,14 +26,12 @@ import (
const ( const (
DefaultServiceDNSDomain = "cluster.local" DefaultServiceDNSDomain = "cluster.local"
DefaultServicesSubnet = "10.96.0.0/12" DefaultServicesSubnet = "10.96.0.0/12"
DefaultKubernetesVersion = "latest-1.6" DefaultKubernetesVersion = "stable"
// This is only for clusters without internet, were the latest stable version can't be determined DefaultAPIBindPort = 6443
DefaultKubernetesFallbackVersion = "v1.6.0" DefaultDiscoveryBindPort = 9898
DefaultAPIBindPort = 6443 DefaultAuthorizationMode = "RBAC"
DefaultDiscoveryBindPort = 9898 DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"
DefaultAuthorizationMode = "RBAC" DefaultCertificatesDir = "/etc/kubernetes/pki"
DefaultCACertPath = "/etc/kubernetes/pki/ca.crt"
DefaultCertificatesDir = "/etc/kubernetes/pki"
) )
func addDefaultingFuncs(scheme *runtime.Scheme) error { func addDefaultingFuncs(scheme *runtime.Scheme) error {
...@@ -46,7 +44,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error { ...@@ -46,7 +44,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
func SetDefaults_MasterConfiguration(obj *MasterConfiguration) { func SetDefaults_MasterConfiguration(obj *MasterConfiguration) {
if obj.KubernetesVersion == "" { if obj.KubernetesVersion == "" {
obj.KubernetesVersion = DefaultKubernetesFallbackVersion obj.KubernetesVersion = DefaultKubernetesVersion
} }
if obj.API.BindPort == 0 { if obj.API.BindPort == 0 {
......
cmd/kubeadm/app/cmd/defaults.go
View file @ 83249d37
...@@ -22,7 +22,6 @@ import ( ...@@ -22,7 +22,6 @@ import (
netutil "k8s.io/apimachinery/pkg/util/net" netutil "k8s.io/apimachinery/pkg/util/net"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1"
kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants"
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
tokenutil "k8s.io/kubernetes/cmd/kubeadm/app/util/token" tokenutil "k8s.io/kubernetes/cmd/kubeadm/app/util/token"
...@@ -45,11 +44,7 @@ func setInitDynamicDefaults(cfg *kubeadmapi.MasterConfiguration) error { ...@@ -45,11 +44,7 @@ func setInitDynamicDefaults(cfg *kubeadmapi.MasterConfiguration) error {
// Validate version argument // Validate version argument
ver, err := kubeadmutil.KubernetesReleaseVersion(cfg.KubernetesVersion) ver, err := kubeadmutil.KubernetesReleaseVersion(cfg.KubernetesVersion)
if err != nil { if err != nil {
if cfg.KubernetesVersion != kubeadmapiext.DefaultKubernetesVersion { return err
return err
} else {
ver = kubeadmapiext.DefaultKubernetesFallbackVersion
}
} }
cfg.KubernetesVersion = ver cfg.KubernetesVersion = ver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment