Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-4.12] fix(cpo): Delete multus validatingwebhookconfiguration on CNO init #2251

Merged
merged 1 commit into from
Mar 6, 2023
Merged

[release-4.12] fix(cpo): Delete multus validatingwebhookconfiguration on CNO init #2251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions control-plane-operator/controllers/hostedcontrolplane/cno/clusternetworkoperator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,30 @@ kubectl --kubeconfig $kc config use-context default`,
},
}

if semver.MustParse(params.ReleaseVersion).Minor == uint64(12) {
dep.Spec.Template.Spec.InitContainers = append(dep.Spec.Template.Spec.InitContainers, corev1.Container{
Command: []string{"/bin/bash"},
Args: []string{
"-c",
`
set -xeuo pipefail
kc=/etc/hosted-kubernetes/kubeconfig
sc=$(kubectl --kubeconfig $kc get --ignore-not-found validatingwebhookconfiguration multus.openshift.io -o jsonpath='{.webhooks[?(@.name == "multus-validating-config.k8s.io")].clientConfig.service}')
if [[ -n $sc ]]; then kubectl --kubeconfig $kc delete --ignore-not-found validatingwebhookconfiguration multus.openshift.io; fi`,
},
Name: "remove-old-multus-validating-webhook-configuration",
Image: params.Images.CLI,
Resources: corev1.ResourceRequirements{Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("10m"),
corev1.ResourceMemory: resource.MustParse("50Mi"),
}},
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
VolumeMounts: []corev1.VolumeMount{
{Name: "hosted-etc-kube", MountPath: "/etc/hosted-kubernetes"},
},
})
}

dep.Spec.Template.Spec.ServiceAccountName = manifests.ClusterNetworkOperatorServiceAccount("").Name
dep.Spec.Template.Spec.Containers = []corev1.Container{{
Command: []string{"/usr/bin/cluster-network-operator"},
Expand Down