kubernetes/cmd
Kubernetes Submit Queue cd06fd4ad7
Merge pull request #67131 from rosti/kube-proxy-manifest-fix2
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: Deduplicate kube-proxy image logic

**What this PR does / why we need it**:

Until now, kube-proxy image was handled in two separate places:
    
- In images.go along with the pre-pull code and without having the image override capabilities (via UnifiedControlPlaneImage)

- In the kube-proxy manifest, where image override was possible.

This duplicates the kube-proxy image logic and makes it prone to errors.
Therefore, this change aims to deduplicate it and make it more straightforward.
This is achieved in the following ways:

- GetKubeControlPlaneImage is used for kube-proxy image fetching, thus allowing for the image to be overriden by UnifiedControlPlaneImage.

- Remove duplicated logic from the manifest and use GetKubeControlPlaneImage to generate the image for the manifest.

This PR also removes GetKubeControlPlaneImageNoOverride as it's no longer needed.

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
None

**Special notes for your reviewer**:

/cc @kubernetes/sig-cluster-lifecycle-pr-reviews
/area kubeadm
/assign @luxas
/assign @timothysc

**Release note**:

```release-note
kubeadm: make sure pre-pulled kube-proxy image and the one specified in its daemon set manifest are the same
```
2018-08-10 03:56:19 -07:00
..
clicheck wire config flags through factory 2018-05-04 17:02:20 -04:00
cloud-controller-manager add debug handler capability for individual controllers 2018-07-26 13:24:36 -04:00
controller-manager add debug handler capability for individual controllers 2018-07-26 13:24:36 -04:00
gendocs wire config flags through factory 2018-05-04 17:02:20 -04:00
genkubedocs Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
genman Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
genswaggertypedocs Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
genutils Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
genyaml wire config flags through factory 2018-05-04 17:02:20 -04:00
hyperkube Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
importverifier fix message output for import verifier 2018-05-10 12:50:28 -04:00
kube-apiserver Merge pull request #66888 from yue9944882/refactor/promote-informers-into-master-cfg 2018-08-08 07:00:08 -07:00
kube-controller-manager Mark --horizontal-pod-autoscaler-upscale-delay deprecated 2018-08-01 17:59:51 +02:00
kube-proxy nodes: improve handling of erroneous host names 2018-08-01 14:57:25 +08:00
kube-scheduler Rename the KubeConfigFile field to Kubeconfig in ClientConnectionConfiguration 2018-08-08 22:25:55 +03:00
kubeadm Merge pull request #67131 from rosti/kube-proxy-manifest-fix2 2018-08-10 03:56:19 -07:00
kubectl Run hack/update-bazel.sh 2018-06-22 16:22:57 -07:00
kubelet nodes: improve handling of erroneous host names 2018-08-01 14:57:25 +08:00
kubemark Make proxier params configurable in kubemark 2018-07-06 16:07:15 +02:00
linkcheck Autogenerated: hack/update-bazel.sh 2018-02-16 13:43:01 -08:00
BUILD gke-certificates-controller: rm -rf 2018-02-15 12:01:00 -08:00
OWNERS Updated top level owners file to match new format 2017-01-19 11:29:16 -08:00