github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44731 from dmmcquay/kubeadm_manifest_cfg_usage

Browse Source 
Automatic merge from submit-queue

kubeadm: remove func arg that isn't being used

**What this PR does / why we need it**: Functions had args passed to them that weren't being used. See https://github.com/kubernetes/kubernetes/pull/44601 for more details. 

**Special notes for your reviewer**: @luxas

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-26 04:05:44 -07:00 committed by GitHub
commit 508041e9d8
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kubeadm/app/master/manifests.go
View File

@ -61,7 +61,7 @@ var (
// WriteStaticPodManifests builds manifest objects based on user provided configuration and then dumps it to disk // WriteStaticPodManifests builds manifest objects based on user provided configuration and then dumps it to disk
// where kubelet will pick and schedule them. // where kubelet will pick and schedule them.
func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error { func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
volumes := []api.Volume{k8sVolume(cfg)} volumes := []api.Volume{k8sVolume()}
volumeMounts := []api.VolumeMount{k8sVolumeMount()} volumeMounts := []api.VolumeMount{k8sVolumeMount()}
if isCertsVolumeMountNeeded() { if isCertsVolumeMountNeeded() {
@ -70,7 +70,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
} }
if isPkiVolumeMountNeeded() { if isPkiVolumeMountNeeded() {
volumes = append(volumes, pkiVolume(cfg)) volumes = append(volumes, pkiVolume())
volumeMounts = append(volumeMounts, pkiVolumeMount()) volumeMounts = append(volumeMounts, pkiVolumeMount())
} }
@ -112,7 +112,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
LivenessProbe: componentProbe(10251, "/healthz", api.URISchemeHTTP), LivenessProbe: componentProbe(10251, "/healthz", api.URISchemeHTTP),
Resources: componentResources("100m"), Resources: componentResources("100m"),
Env: getProxyEnvVars(), Env: getProxyEnvVars(),
}, k8sVolume(cfg)), }, k8sVolume()),
} }
// Add etcd static pod spec only if external etcd is not configured // Add etcd static pod spec only if external etcd is not configured
@ -123,7 +123,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
VolumeMounts: []api.VolumeMount{certsVolumeMount(), etcdVolumeMount(cfg.Etcd.DataDir), k8sVolumeMount()}, VolumeMounts: []api.VolumeMount{certsVolumeMount(), etcdVolumeMount(cfg.Etcd.DataDir), k8sVolumeMount()},
Image: images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage), Image: images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage),
LivenessProbe: componentProbe(2379, "/health", api.URISchemeHTTP), LivenessProbe: componentProbe(2379, "/health", api.URISchemeHTTP),
}, certsVolume(cfg), etcdVolume(cfg), k8sVolume(cfg)) }, certsVolume(cfg), etcdVolume(cfg), k8sVolume())
etcdPod.Spec.SecurityContext = &api.PodSecurityContext{ etcdPod.Spec.SecurityContext = &api.PodSecurityContext{
SELinuxOptions: &api.SELinuxOptions{ SELinuxOptions: &api.SELinuxOptions{
@ -218,7 +218,7 @@ func isPkiVolumeMountNeeded() bool {
return false return false
} }
func pkiVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume { func pkiVolume() api.Volume {
return api.Volume{ return api.Volume{
Name: "pki", Name: "pki",
VolumeSource: api.VolumeSource{ VolumeSource: api.VolumeSource{
@ -252,7 +252,7 @@ func flockVolumeMount() api.VolumeMount {
} }
} }
func k8sVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume { func k8sVolume() api.Volume {
return api.Volume{ return api.Volume{
Name: "k8s", Name: "k8s",
VolumeSource: api.VolumeSource{ VolumeSource: api.VolumeSource{

4
cmd/kubeadm/app/master/manifests_test.go
View File

@ -330,11 +330,9 @@ func TestCertsVolumeMount(t *testing.T) {
func TestK8sVolume(t *testing.T) { func TestK8sVolume(t *testing.T) {
var tests = []struct { var tests = []struct {
cfg *kubeadmapi.MasterConfiguration
expected api.Volume expected api.Volume
}{ }{
{ {
cfg: &kubeadmapi.MasterConfiguration{},
expected: api.Volume{ expected: api.Volume{
Name: "k8s", Name: "k8s",
VolumeSource: api.VolumeSource{ VolumeSource: api.VolumeSource{
@ -345,7 +343,7 @@ func TestK8sVolume(t *testing.T) {
} }
for _, rt := range tests { for _, rt := range tests {
actual := k8sVolume(rt.cfg) actual := k8sVolume()
if actual.Name != rt.expected.Name { if actual.Name != rt.expected.Name {
t.Errorf( t.Errorf(
"failed k8sVolume:\n\texpected: %s\n\t actual: %s", "failed k8sVolume:\n\texpected: %s\n\t actual: %s",

4
cmd/kubeadm/app/master/selfhosted.go
View File

@ -41,7 +41,7 @@ var (
) )
func CreateSelfHostedControlPlane(cfg *kubeadmapi.MasterConfiguration, client *clientset.Clientset) error { func CreateSelfHostedControlPlane(cfg *kubeadmapi.MasterConfiguration, client *clientset.Clientset) error {
volumes := []v1.Volume{k8sVolume(cfg)} volumes := []v1.Volume{k8sVolume()}
volumeMounts := []v1.VolumeMount{k8sVolumeMount()} volumeMounts := []v1.VolumeMount{k8sVolumeMount()}
if isCertsVolumeMountNeeded() { if isCertsVolumeMountNeeded() {
volumes = append(volumes, certsVolume(cfg)) volumes = append(volumes, certsVolume(cfg))
@ -49,7 +49,7 @@ func CreateSelfHostedControlPlane(cfg *kubeadmapi.MasterConfiguration, client *c
} }
if isPkiVolumeMountNeeded() { if isPkiVolumeMountNeeded() {
volumes = append(volumes, pkiVolume(cfg)) volumes = append(volumes, pkiVolume())
volumeMounts = append(volumeMounts, pkiVolumeMount()) volumeMounts = append(volumeMounts, pkiVolumeMount())
} }