• Kubernetes Submit Queue's avatar
    Merge pull request #67131 from rosti/kube-proxy-manifest-fix2 · cd06fd4a
    Kubernetes Submit Queue authored
    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
    ```
    cd06fd4a
Name
Last commit
Last update
.github Loading commit data...
Godeps Loading commit data...
api Loading commit data...
build Loading commit data...
cluster Loading commit data...
cmd Loading commit data...
docs Loading commit data...
hack Loading commit data...
logo Loading commit data...
pkg Loading commit data...
plugin Loading commit data...
staging Loading commit data...
test Loading commit data...
third_party Loading commit data...
translations Loading commit data...
vendor Loading commit data...
.bazelrc Loading commit data...
.generated_files Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.kazelcfg.json Loading commit data...
BUILD.bazel Loading commit data...
CHANGELOG-1.10.md Loading commit data...
CHANGELOG-1.11.md Loading commit data...
CHANGELOG-1.12.md Loading commit data...
CHANGELOG-1.2.md Loading commit data...
CHANGELOG-1.3.md Loading commit data...
CHANGELOG-1.4.md Loading commit data...
CHANGELOG-1.5.md Loading commit data...
CHANGELOG-1.6.md Loading commit data...
CHANGELOG-1.7.md Loading commit data...
CHANGELOG-1.8.md Loading commit data...
CHANGELOG-1.9.md Loading commit data...
CHANGELOG.md Loading commit data...
CONTRIBUTING.md Loading commit data...
LICENSE Loading commit data...
Makefile Loading commit data...
Makefile.generated_files Loading commit data...
OWNERS Loading commit data...
OWNERS_ALIASES Loading commit data...
README.md Loading commit data...
SECURITY_CONTACTS Loading commit data...
SUPPORT.md Loading commit data...
WORKSPACE Loading commit data...
code-of-conduct.md Loading commit data...