Fix typo containerd proxy configuration #2201

alexandre-allard · 2020-01-22T09:05:14Z

Component: salt

Context: containerd http proxy configuration is not working

Summary:

fix typo in containerd proxy configuration
split environment variables on multiple lines

Acceptance criteria: Ability to deploy & expand using an HTTP proxy

Closes: #2052

Refs: #2052

bert-e · 2020-01-22T09:05:18Z

Hello alexandre-allard-scality,

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 · 2020-01-22T09:05:25Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/2052-fix-typo-containerd-proxy into
development/2.4
w/2.5/bugfix/2052-fix-typo-containerd-proxy will be merged into development/2.5

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

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-01-22T09:05:28Z

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:

For the sake of clarity, we set 1 env variable per line, instead of all the variables on a single `Environment` entry in the containerd unit file Refs: #2052

bert-e · 2020-01-22T10:31:42Z

History mismatch

Merge commit #9f308e48357706c98b46caebc84a6aef8207f95a on the integration branch
w/2.5/bugfix/2052-fix-typo-containerd-proxy is merging a branch which is neither the current
branch bugfix/2052-fix-typo-containerd-proxy nor the development branch
development/2.5.

It is likely due to a rebase of the branch bugfix/2052-fix-typo-containerd-proxy and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

alexandre-allard · 2020-01-22T10:32:25Z

/reset

bert-e · 2020-01-22T10:32:32Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2020-01-22T10:32:42Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/2052-fix-typo-containerd-proxy into
development/2.4
w/2.5/bugfix/2052-fix-typo-containerd-proxy will be merged into development/2.5

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

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2020-01-22T10:32:44Z

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:

alexandre-allard · 2020-01-22T10:38:48Z

/approve

bert-e · 2020-01-22T10:38:54Z

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 · 2020-01-22T11:30:48Z

Build failed

The build for commit did not succeed in branch w/2.5/bugfix/2052-fix-typo-containerd-proxy.

The following options are set: approve

bert-e · 2020-01-22T17:54:38Z

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.4
✔️ development/2.5

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

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 · 2020-01-23T08:46:40Z

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

✔️ development/2.4
✔️ development/2.5

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

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

salt: fix typo in containerd proxy setup

fcddd41

Refs: #2052

alexandre-allard requested a review from a team as a code owner January 22, 2020 09:05

gdemonet previously approved these changes Jan 22, 2020

View reviewed changes

salt: set 1 env var per line in containerd unit

0f55466

For the sake of clarity, we set 1 env variable per line, instead of all the variables on a single `Environment` entry in the containerd unit file Refs: #2052

alexandre-allard dismissed gdemonet’s stale review via 0f55466 January 22, 2020 10:31

alexandre-allard force-pushed the bugfix/2052-fix-typo-containerd-proxy branch from 9f308e4 to 0f55466 Compare January 22, 2020 10:31

gdemonet approved these changes Jan 22, 2020

View reviewed changes

bert-e merged commit 0f55466 into development/2.4 Jan 23, 2020

bert-e deleted the bugfix/2052-fix-typo-containerd-proxy branch January 23, 2020 08:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix typo containerd proxy configuration #2201

Fix typo containerd proxy configuration #2201

alexandre-allard commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

alexandre-allard commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

alexandre-allard commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 22, 2020

bert-e commented Jan 23, 2020

Fix typo containerd proxy configuration #2201

Fix typo containerd proxy configuration #2201

Conversation

alexandre-allard commented Jan 22, 2020

bert-e commented Jan 22, 2020

Hello alexandre-allard-scality,

bert-e commented Jan 22, 2020

Integration data created

bert-e commented Jan 22, 2020

Waiting for approval

bert-e commented Jan 22, 2020

History mismatch

alexandre-allard commented Jan 22, 2020

bert-e commented Jan 22, 2020

Reset complete

bert-e commented Jan 22, 2020

Integration data created

bert-e commented Jan 22, 2020

Waiting for approval

alexandre-allard commented Jan 22, 2020

bert-e commented Jan 22, 2020

Waiting for approval

bert-e commented Jan 22, 2020

Build failed

bert-e commented Jan 22, 2020

In the queue

bert-e commented Jan 23, 2020