Skip to content

Commit 67aed8f

Browse files
authored
Merge pull request #9700 from k8s-infra-cherrypick-robot/cherry-pick-9698-to-release-1.4
[release-1.4] 🐛 Allow dropping patches KubeadmControlPlane KubeadmConfig
2 parents 0457d29 + fc4c4a2 commit 67aed8f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,12 @@ func (in *KubeadmControlPlane) ValidateUpdate(old runtime.Object) error {
156156
{spec, kubeadmConfigSpec, initConfiguration, nodeRegistration},
157157
{spec, kubeadmConfigSpec, initConfiguration, nodeRegistration, "*"},
158158
{spec, kubeadmConfigSpec, initConfiguration, patches, directory},
159+
{spec, kubeadmConfigSpec, initConfiguration, patches},
159160
{spec, kubeadmConfigSpec, initConfiguration, skipPhases},
160161
{spec, kubeadmConfigSpec, joinConfiguration, nodeRegistration},
161162
{spec, kubeadmConfigSpec, joinConfiguration, nodeRegistration, "*"},
162163
{spec, kubeadmConfigSpec, joinConfiguration, patches, directory},
164+
{spec, kubeadmConfigSpec, joinConfiguration, patches},
163165
{spec, kubeadmConfigSpec, joinConfiguration, skipPhases},
164166
{spec, kubeadmConfigSpec, preKubeadmCommands},
165167
{spec, kubeadmConfigSpec, postKubeadmCommands},

0 commit comments

Comments
 (0)