mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
kubeadm: Update versions for 1.21
This commit is contained in:
parent
546b0a704d
commit
fe91902d08
@ -54,7 +54,7 @@ func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, er
|
|||||||
},
|
},
|
||||||
CertificatesDir: certDir,
|
CertificatesDir: certDir,
|
||||||
ClusterName: clusterName,
|
ClusterName: clusterName,
|
||||||
KubernetesVersion: "v1.19.0",
|
KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(),
|
||||||
}
|
}
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
|
@ -330,7 +330,7 @@ func TestRunGenCSR(t *testing.T) {
|
|||||||
ServiceSubnet: "192.0.2.0/24",
|
ServiceSubnet: "192.0.2.0/24",
|
||||||
},
|
},
|
||||||
CertificatesDir: certDir,
|
CertificatesDir: certDir,
|
||||||
KubernetesVersion: "v1.19.0",
|
KubernetesVersion: kubeadmconstants.MinimumControlPlaneVersion.String(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -378,7 +378,7 @@ func TestGenCSRConfig(t *testing.T) {
|
|||||||
|
|
||||||
// A minimal kubeadm config with just enough values to avoid triggering
|
// A minimal kubeadm config with just enough values to avoid triggering
|
||||||
// auto-detection of config values at runtime.
|
// auto-detection of config values at runtime.
|
||||||
const kubeadmConfig = `
|
var kubeadmConfig = `
|
||||||
apiVersion: kubeadm.k8s.io/v1beta2
|
apiVersion: kubeadm.k8s.io/v1beta2
|
||||||
kind: InitConfiguration
|
kind: InitConfiguration
|
||||||
localAPIEndpoint:
|
localAPIEndpoint:
|
||||||
@ -389,8 +389,7 @@ nodeRegistration:
|
|||||||
apiVersion: kubeadm.k8s.io/v1beta2
|
apiVersion: kubeadm.k8s.io/v1beta2
|
||||||
kind: ClusterConfiguration
|
kind: ClusterConfiguration
|
||||||
certificatesDir: /custom/config/certificates-dir
|
certificatesDir: /custom/config/certificates-dir
|
||||||
kubernetesVersion: v1.19.0
|
kubernetesVersion: ` + kubeadmconstants.MinimumControlPlaneVersion.String()
|
||||||
`
|
|
||||||
|
|
||||||
tmpDir := testutil.SetupTempDir(t)
|
tmpDir := testutil.SetupTempDir(t)
|
||||||
defer os.RemoveAll(tmpDir)
|
defer os.RemoveAll(tmpDir)
|
||||||
|
Loading…
Reference in New Issue
Block a user