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.

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

salt: Convert datetime from managedFields from storage classes in pillar #3566

Merged
merged 2 commits into from
Oct 14, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'salt'

Context:

#3564

Summary:

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 TeddyAndrieux requested a review from a team October 12, 2021 14:30
@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2021

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/bugfix/datetime-in-pillar-storage-class with contents from bugfix/datetime-in-pillar-storage-class
and development/2.11.

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

CHANGELOG.md Outdated Show resolved Hide resolved
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 TeddyAndrieux force-pushed the bugfix/datetime-in-pillar-storage-class branch from ecab156 to d8835b6 Compare October 12, 2021 14:33
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
@bert-e
Copy link
Contributor

bert-e commented Oct 12, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

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"]:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, we don't care about those when dumping "embedded" objects, but 🤷

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 13, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.10

  • ✔️ development/2.11

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 14, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.10

  • ✔️ development/2.11

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 451b7ae into development/2.10 Oct 14, 2021
@bert-e bert-e deleted the bugfix/datetime-in-pillar-storage-class branch October 14, 2021 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants