forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 3
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#67944 from fabriziopandini/kubeadm-conf…
…ig-configMap Automatic merge from submit-queue (batch tested with PRs 63011, 68089, 67944, 68132). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Kubeadm upload and fetch of kubeam config v1alpha3 **What this PR does / why we need it**: This PR implements upload and fetch of kubeam config v1alpha3 from cluster. More in detail: In upload, `kubeadm-config` gets - `ClusterConfiguration` (without components config which are already stored in separated ConfigMaps) - `ClusterStatus`(initialised or updated with the API endpoint of the current node) During fetch `InitConfiguration` is composed with: - `ClusterConfiguration` from `kubeadm-config` - The `APIEndpoint` of the current node from `ClusterStatus` in `kubeadm-config` - Component configs from corresponding ConfigMaps **Which issue(s) this PR fixes** : refs kubernetes/kubeadm#911, refs kubernetes/kubeadm#963 **Special notes for your reviewer**: In order to implement this it was necessary to extend current component config management with a new GetFromConfigMap operation. This is implemented in a separated commit " implement component configs GetFromConfigMap". The real change build on this (commi "upload and fetch kubeadm v1alpha3") **Release note**: ```release-note NONE ``` /cc @kubernetes/sig-cluster-lifecycle-pr-reviews /sig cluster-lifecycle /area kubeadm /kind enhancement /assign @luxas /assign @timothysc /cc @chuckha @rosti @neolit123 @liztio
- Loading branch information
Showing
24 changed files
with
1,360 additions
and
242 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| 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 componentconfigs | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| clientset "k8s.io/client-go/kubernetes" | ||
| kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" | ||
| kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" | ||
| kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" | ||
| "k8s.io/kubernetes/pkg/util/version" | ||
| ) | ||
|
|
||
| // GetFromKubeletConfigMap returns the pointer to the ComponentConfig API object read from the kubelet-config-version | ||
| // ConfigMap map stored in the cluster | ||
| func GetFromKubeletConfigMap(client clientset.Interface, version *version.Version) (runtime.Object, error) { | ||
|
|
||
| // Read the ConfigMap from the cluster based on what version the kubelet is | ||
| configMapName := kubeadmconstants.GetKubeletConfigMapName(version) | ||
| kubeletCfg, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(configMapName, metav1.GetOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| kubeletConfigData, ok := kubeletCfg.Data[kubeadmconstants.KubeletBaseConfigurationConfigMapKey] | ||
| if !ok { | ||
| return nil, fmt.Errorf("unexpected error when reading %s ConfigMap: %s key value pair missing", configMapName, kubeadmconstants.KubeletBaseConfigurationConfigMapKey) | ||
| } | ||
|
|
||
| // Decodes the kubeletConfigData into the internal component config | ||
| obj := &kubeletconfig.KubeletConfiguration{} | ||
| err = unmarshalObject(obj, []byte(kubeletConfigData)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return obj, nil | ||
| } | ||
|
|
||
| // GetFromKubeProxyConfigMap returns the pointer to the ComponentConfig API object read from the kube-proxy | ||
| // ConfigMap map stored in the cluster | ||
| func GetFromKubeProxyConfigMap(client clientset.Interface, version *version.Version) (runtime.Object, error) { | ||
|
|
||
| // Read the ConfigMap from the cluster | ||
| kubeproxyCfg, err := client.CoreV1().ConfigMaps(metav1.NamespaceSystem).Get(kubeadmconstants.KubeProxyConfigMap, metav1.GetOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| kubeproxyConfigData, ok := kubeproxyCfg.Data[kubeadmconstants.KubeProxyConfigMapKey] | ||
| if !ok { | ||
| return nil, fmt.Errorf("unexpected error when reading %s ConfigMap: %s key value pair missing", kubeadmconstants.KubeProxyConfigMap, kubeadmconstants.KubeProxyConfigMapKey) | ||
| } | ||
|
|
||
| // Decodes the Config map dat into the internal component config | ||
| obj := &kubeproxyconfig.KubeProxyConfiguration{} | ||
| err = unmarshalObject(obj, []byte(kubeproxyConfigData)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return obj, nil | ||
| } |
Oops, something went wrong.