-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #792 from dprince/ovn_update_order_edpm
Enforce update order for OVN for Ctlplane/EDPM
- Loading branch information
Showing
30 changed files
with
591 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package openstack | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/openstack-k8s-operators/lib-common/modules/common/helper" | ||
| corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/apis/core/v1beta1" | ||
|
|
||
| dataplanev1 "github.com/openstack-k8s-operators/dataplane-operator/api/v1beta1" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| // GetDataplaneNodesets - returns the dataplanenodesets in the namespace of the controlplane | ||
| func GetDataplaneNodesets(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, helper *helper.Helper) (*dataplanev1.OpenStackDataPlaneNodeSetList, error) { | ||
| // Get the dataplane nodesets | ||
| dataplaneNodesets := &dataplanev1.OpenStackDataPlaneNodeSetList{} | ||
| opts := []client.ListOption{ | ||
| client.InNamespace(instance.Namespace), | ||
| } | ||
| err := helper.GetClient().List(ctx, dataplaneNodesets, opts...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return dataplaneNodesets, nil | ||
| } | ||
|
|
||
| func DataplaneNodesetsDeployedVersionIsSet(dataplaneNodesets *dataplanev1.OpenStackDataPlaneNodeSetList) bool { | ||
| for _, nodeset := range dataplaneNodesets.Items { | ||
| // FIXME: DeployedVersion on the DataplaneNodeset should be a string pointer to match how Controlplane implements this | ||
| if nodeset.Status.DeployedVersion == "" { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| // DataplaneNodesetsOVNControllerImagesMatch returns true if OVNControllers are deployed on all nodesets | ||
| func DataplaneNodesetsOVNControllerImagesMatch(version *corev1beta1.OpenStackVersion, dataplaneNodesets *dataplanev1.OpenStackDataPlaneNodeSetList) bool { | ||
| for _, nodeset := range dataplaneNodesets.Items { | ||
| if nodeset.Generation != nodeset.Status.ObservedGeneration { | ||
| return false | ||
| } | ||
| // we only check nodesets if they deploy OVN | ||
| if nodeset.Status.ContainerImages["OvnControllerImage"] != "" { | ||
| if !nodeset.IsReady() { | ||
| return false | ||
| } | ||
| if nodeset.Status.ContainerImages["OvnControllerImage"] != *version.Status.ContainerImages.OvnControllerImage { | ||
| return false | ||
| } | ||
| } | ||
| } | ||
| return true | ||
| } | ||
|
|
||
| // DataplaneNodesetsDeployed returns true if all nodesets are deployed with the latest version | ||
| func DataplaneNodesetsDeployed(version *corev1beta1.OpenStackVersion, dataplaneNodesets *dataplanev1.OpenStackDataPlaneNodeSetList) bool { | ||
| for _, nodeset := range dataplaneNodesets.Items { | ||
| if nodeset.Generation != nodeset.Status.ObservedGeneration { | ||
| return false | ||
| } | ||
| if !nodeset.IsReady() { | ||
| return false | ||
| } | ||
| if nodeset.Status.DeployedVersion != version.Spec.TargetVersion { | ||
| return false | ||
| } | ||
|
|
||
| } | ||
| return true | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.