forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#65940 from luxas/kubeadm_internal_compo…
…nentconfigs Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: Start using internal versions for ComponentConfigs in the internal API **What this PR does / why we need it**: This PR changes kubeadm to store the internal API versions of the ComponentConfig APIs, in order to in the future be able to read multiple external versions with conversion. It also moves all the ComponentConfigs to a common struct instead of splitting them out in many. This makes it possible to more easily host more ComponentConfigs in the future. In v1alpha3, the ComponentConfigs will later be removed from the external version of the API (see: kubernetes#65787), but for this PR no changes to the external API are made. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: ref: kubernetes/kubeadm#911 Depends on: - [x] kubernetes#65776 - [x] kubernetes#65628 - [x] kubernetes#65629 - [x] kubernetes#65631 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` @kubernetes/sig-cluster-lifecycle-pr-reviews
- Loading branch information
Showing
27 changed files
with
567 additions
and
533 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package v1alpha2 | ||
|
|
||
| import ( | ||
| "k8s.io/apimachinery/pkg/conversion" | ||
| "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" | ||
| "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" | ||
| kubeletconfigscheme "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/scheme" | ||
| kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig/v1beta1" | ||
| "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig" | ||
| kubeproxyconfigscheme "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/scheme" | ||
| kubeproxyconfigv1alpha1 "k8s.io/kubernetes/pkg/proxy/apis/kubeproxyconfig/v1alpha1" | ||
| ) | ||
|
|
||
| func Convert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration(in *MasterConfiguration, out *kubeadm.MasterConfiguration, s conversion.Scope) error { | ||
| if err := autoConvert_v1alpha2_MasterConfiguration_To_kubeadm_MasterConfiguration(in, out, s); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if in.KubeProxy.Config != nil { | ||
| if out.ComponentConfigs.KubeProxy == nil { | ||
| out.ComponentConfigs.KubeProxy = &kubeproxyconfig.KubeProxyConfiguration{} | ||
| } | ||
|
|
||
| if err := kubeproxyconfigscheme.Scheme.Convert(in.KubeProxy.Config, out.ComponentConfigs.KubeProxy, nil); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| if in.KubeletConfiguration.BaseConfig != nil { | ||
| if out.ComponentConfigs.Kubelet == nil { | ||
| out.ComponentConfigs.Kubelet = &kubeletconfig.KubeletConfiguration{} | ||
| } | ||
|
|
||
| scheme, _, err := kubeletconfigscheme.NewSchemeAndCodecs() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := scheme.Convert(in.KubeletConfiguration.BaseConfig, out.ComponentConfigs.Kubelet, nil); err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func Convert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration(in *kubeadm.MasterConfiguration, out *MasterConfiguration, s conversion.Scope) error { | ||
| if err := autoConvert_kubeadm_MasterConfiguration_To_v1alpha2_MasterConfiguration(in, out, s); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if in.ComponentConfigs.KubeProxy != nil { | ||
| if out.KubeProxy.Config == nil { | ||
| out.KubeProxy.Config = &kubeproxyconfigv1alpha1.KubeProxyConfiguration{} | ||
| } | ||
|
|
||
| if err := kubeproxyconfigscheme.Scheme.Convert(in.ComponentConfigs.KubeProxy, out.KubeProxy.Config, nil); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| if in.ComponentConfigs.Kubelet != nil { | ||
| if out.KubeletConfiguration.BaseConfig == nil { | ||
| out.KubeletConfiguration.BaseConfig = &kubeletconfigv1beta1.KubeletConfiguration{} | ||
| } | ||
|
|
||
| scheme, _, err := kubeletconfigscheme.NewSchemeAndCodecs() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if err := scheme.Convert(in.ComponentConfigs.Kubelet, out.KubeletConfiguration.BaseConfig, nil); err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.