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: Do not interpolate when parsing sysctl config files #3224

Merged
merged 1 commit into from
Mar 25, 2021

Conversation

gdemonet
Copy link
Contributor

Fixes: #3223

@gdemonet gdemonet added kind:bug Something isn't working complexity:easy Something that requires less than a day to fix topic:salt Everything related to SaltStack in our product labels Mar 23, 2021
@gdemonet gdemonet added this to the MetalK8s 2.8.1 milestone Mar 23, 2021
@gdemonet gdemonet requested a review from a team March 23, 2021 17:48
@bert-e

This comment has been minimized.

@bert-e

This comment has been minimized.

@gdemonet gdemonet force-pushed the bugfix/3223-no-interpolation-in-sysctl-conf branch from be646f0 to 82ee169 Compare March 23, 2021 17:50
@gdemonet gdemonet changed the base branch from development/2.9 to development/2.8 March 23, 2021 17:50
@bert-e

This comment has been minimized.

@gdemonet
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Mar 23, 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:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 24, 2021

Build failed

The build for commit did not succeed in branch w/2.9/bugfix/3223-no-interpolation-in-sysctl-conf.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Mar 25, 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.8

  • ✔️ development/2.9

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

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 Mar 25, 2021

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

  • ✔️ development/2.8

  • ✔️ development/2.9

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7

Please check the status of the associated issue None.

Goodbye gdemonet.

@bert-e bert-e merged commit 82ee169 into development/2.8 Mar 25, 2021
@bert-e bert-e deleted the bugfix/3223-no-interpolation-in-sysctl-conf branch March 25, 2021 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
complexity:easy Something that requires less than a day to fix kind:bug Something isn't working topic:salt Everything related to SaltStack in our product
Projects
None yet
Development

Successfully merging this pull request may close these issues.

metalk8s_sysctl.has_precedence incorrectly attempts to interpolate %-prefixed sequences
3 participants