salt: Convert datetime from managedFields from storage classes in pillar
#3566
Conversation
Hello teddyandrieux,My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/2.11/bugfix/datetime-in-pillar-storage-class origin/development/2.11
$ git merge origin/bugfix/datetime-in-pillar-storage-class
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/2.11/bugfix/datetime-in-pillar-storage-class |
We store volumes and storage classes in the salt pillar that contains some `datetime` python objects and `datetime` objects cannot be rendered to json using "classic" `json.dump`. This means that salt-ssh command that relies on the pillar (like salt states) crash if some volume is deployed on the target node Fixes: #3564
TeddyAndrieux
force-pushed
the
bugfix/datetime-in-pillar-storage-class
branch
from
ecab156
to
d8835b6
Compare
We rely on salt-ssh to run some step post installation, like bootstrap restore, so make sure that salt-ssh work on non-bootstrap node after installation NOTE: We do not check bootstrap node as this one is not installed using SSH so we do not have SSH information
TeddyAndrieux
force-pushed
the
bugfix/datetime-in-pillar-storage-class
branch
from
d8835b6
to
451b7ae
Compare
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
Peer approvals must include at least 1 approval from the following list:
|
| @@ -84,6 +84,9 @@ def get_storage_classes(kubeconfig=None): | |||
| storageclass["metadata"]["deletion_timestamp"] = iso_timestamp_converter( | |||
| storageclass["metadata"]["deletion_timestamp"] | |||
| ) | |||
| for managed_field in storageclass["metadata"]["managed_fields"]: | |||
There was a problem hiding this comment.
IMO, we don't care about those when dumping "embedded" objects, but 🤷
There was a problem hiding this comment.
Yes I agree but since anyway this "convert" is needed only for 2.10 and we already have those in the previous 2.10 ... I kept them
|
/approve |
In the queueThe changeset has received all authorizations and has been added to the The changeset will be merged in:
The following branches will NOT be impacted:
There is no action required on your side. You will be notified here once IMPORTANT Please do not attempt to modify this pull request.
If you need this pull request to be removed from the queue, please contact a The following options are set: approve |
|
I have successfully merged the changeset of this pull request
The following branches have NOT changed:
Please check the status of the associated issue None. Goodbye teddyandrieux. |
Component:
'salt'
Context:
#3564
Summary:
We store volumes and storage classes in the salt pillar that contains
some
datetimepython objects anddatetimeobjects cannot be renderedto json using "classic"
json.dump.This means that salt-ssh command that relies on the pillar (like salt
states) crash if some volume is deployed on the target node
Fixes: #3564