• 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
..
clicheck Loading commit data...
cloud-controller-manager Loading commit data...
controller-manager Loading commit data...
gendocs Loading commit data...
genkubedocs Loading commit data...
genman Loading commit data...
genswaggertypedocs Loading commit data...
genutils Loading commit data...
genyaml Loading commit data...
hyperkube Loading commit data...
importverifier Loading commit data...
kube-apiserver Loading commit data...
kube-controller-manager Loading commit data...
kube-proxy Loading commit data...
kube-scheduler Loading commit data...
kubeadm Loading commit data...
kubectl Loading commit data...
kubelet Loading commit data...
kubemark Loading commit data...
linkcheck Loading commit data...
BUILD Loading commit data...
OWNERS Loading commit data...