Set ManilaShareV1 annotation via OpenStackVersion#1876
Set ManilaShareV1 annotation via OpenStackVersion#1876fmount wants to merge 1 commit intoopenstack-k8s-operators:mainfrom
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: fmount The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
OpenStackControlPlane CRD Size Report
Threshold reference
|
| manila.SetAnnotations(make(map[string]string)) | ||
| } | ||
| if version.Status.ServiceDefaults.ManilaSharev1 != nil && *version.Status.ServiceDefaults.ManilaSharev1 == "true" { | ||
| manila.GetAnnotations()[manilav1.ManilaShareV1Label] = "true" |
There was a problem hiding this comment.
Just want to make sure: the map here functions as by-reference and not by-value, right? I just feel like I recall some places where we've had to get the map, set a value, then inject the map back into the parent object.
There was a problem hiding this comment.
Yeah, I see your concern, but when we do manila.GetAnnotations()[manilav1.ManilaShareV1Label] = "true" we're writing directly into the annotations map.
With SetAnnotations on L220 we can make sure the map is initialized (so we do not panic), but then we get the reference to it [1], so we don't need to extract, write the value, inject it back to the parent object. I recall we had this problem for other objects (e.g. the glanceAPI map for example), but this doesn't apply to the annotations that are realized through a native map (which is a pointer by definition) :D
[1] https://github.com/kubernetes/apimachinery/blob/master/pkg/apis/meta/v1/types.go
This patch adds support for ManilaShareV1 configuration in OpenStack operator. It ensures that the annotation "manila.openstack.org/sharev1" is set to "true" by default, so we can easily invert the logic for RHOSO 19, where share service and v1 endpoints are removed. Signed-off-by: Francesco Pantano <fpantano@redhat.com>
|
/test openstack-operator-build-deploy-kuttl-4-18 |
|
@fmount: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/test openstack-operator-build-deploy-kuttl-4-18 |
2 participants
This patch adds support for
ManilaShareV1configuration inopenstack-operator. It ensures that the annotationmanila.openstack.org/sharev1is set totrueby default, so we can easily invert the logic forRHOSO 19, whereshareservice andv1 endpointsare removed [1].Jira: OSPRH-27947
[1] https://review.opendev.org/q/topic:%22remove-v1%22+and+project:openstack/manila