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.

Sign up for GitHub

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

Jump to bottom

feat(swarm): removed workaround support for mock staging/unstaging #746

Merged
merged 2 commits into from
Oct 18, 2024
Merged

feat(swarm): removed workaround support for mock staging/unstaging #746

merged 2 commits into from
Oct 18, 2024

Conversation

lukasmetzner
Copy link
Contributor

With the merge of moby/swarmkit#3116 the mock staging/unstaging is not needed anymore. It was introduced in our csi-driver in this commit: 619fa5c. Which is part of a large PR (squashed commit) that included experimental support for Docker swarm.

See:

chore: Removed intermediate features for mock staging/unstaging in Do…
34f5ac9 
…cker swarm

With the merge of moby/swarmkit#3116 the mock staging/unstaging is not needed anymore. It was introduced in our csi-driver in this commit: 619fa5c. Which is part of a large PR (squashed commit) that included experimental support for Docker swarm.
@lukasmetzner lukasmetzner requested a review from a team as a code owner October 10, 2024 06:21
@lukasmetzner lukasmetzner linked an issue Oct 10, 2024 that may be closed by this pull request
Docker Swarm support: Remove mock staging/unstaging once possible #382
Closed
@codecov Codecov
Copy link

codecov bot commented Oct 10, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 84.61538% with 2 lines in your changes missing coverage. Please review.

Project coverage is 34.67%. Comparing base (a132c79) to head (3bb844f).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
internal/driver/node.go 84.61% 2 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #746      +/-   ##
==========================================
+ Coverage   34.54%   34.67%   +0.13%     
==========================================
  Files          19       19              
  Lines        1621     1612       -9     
==========================================
- Hits          560      559       -1     
+ Misses       1027     1020       -7     
+ Partials       34       33       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jooola
Copy link
Member

jooola commented Oct 10, 2024

Is this change backward compatible for previous docker versions?

Do we state somewhere that the docker swarm support is experimental? I could only find a statement that we do not provide official support for it.

@jooola jooola changed the title chore(swarm): Removed intermediate features for mock staging/unstaging refactor(swarm): removed intermediate features for mock staging/unstaging Oct 10, 2024
@jooola jooola changed the title refactor(swarm): removed intermediate features for mock staging/unstaging feat(swarm): removed intermediate features for mock staging/unstaging Oct 10, 2024
@jooola
Copy link
Member

jooola commented Oct 10, 2024

Changed the scope to feat as we have some user facing changes.

@lukasmetzner lukasmetzner marked this pull request as draft October 11, 2024 11:20
@lukasmetzner lukasmetzner self-assigned this Oct 14, 2024
apricote
apricote requested changes Oct 16, 2024
View reviewed changes
Copy link
Member

@apricote apricote left a comment

Choose a reason for hiding this comment

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

Could you also remove the environment variable from the docker-swarm config.json?

csi-driver/deploy/docker-swarm/pkg/config.json

Lines 30 to 35 in f908f5d

{
"name": "FORCE_STAGING_SUPPORT",
"description": "workaround: force staging support to make Docker 23.0.0 work without https://github.com/moby/swarmkit/pull/3116",
"settable": ["value"],
"value": "true"
}

@apricote
Copy link
Member

Is this change backward compatible for previous docker versions?

This is only compatible with docker-swarm versions that have the fix from moby/swarmkit#3116. Not sure which versions of docker-swarm include that.

Do we state somewhere that the docker swarm support is experimental? I could only find a statement that we do not provide official support for it.

In the docker swarm docs it is mentioned that the support is in beta, though I would say that "beta" is not defined for us. We do not test it and do not publish a version compatibility for docker swarm.

@apricote apricote changed the title feat(swarm): removed intermediate features for mock staging/unstaging feat(swarm): removed workaround support for mock staging/unstaging Oct 18, 2024
apricote
apricote approved these changes Oct 18, 2024
View reviewed changes
Copy link
Member

@apricote apricote left a comment

Choose a reason for hiding this comment

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

Nice cleanup :)

@lukasmetzner lukasmetzner marked this pull request as ready for review October 18, 2024 09:25
@lukasmetzner lukasmetzner merged commit 465ec21 into main Oct 18, 2024
8 checks passed
@lukasmetzner lukasmetzner deleted the 382-docker-swarm-support-remove-mock-stagingunstaging-once-possible branch October 18, 2024 09:28
@hcloud-bot hcloud-bot mentioned this pull request Oct 18, 2024
Merged
lukasmetzner pushed a commit that referenced this pull request Oct 29, 2024
@hcloud-bot
chore(main): release 2.10.0 (#723)
7bf5096 
🤖 I have created a release *beep* *boop*
---


##
[2.10.0](v2.9.0...v2.10.0)
(2024-10-29)


### Features

* add support & tests for Kubernetes 1.31
([#721](#721))
([85035b9](85035b9))
* allow arbitrary length API tokens
([#724](#724))
([61c3a0e](61c3a0e))
* allow passing mkfs format options via storage class parameters
([#747](#747))
([4b9aa4e](4b9aa4e))
* change XFS default options to support older kernels
([#747](#747))
([4b9aa4e](4b9aa4e))
* drop tests for Kubernetes 1.27
([#722](#722))
([d46a54b](d46a54b))
* force pods with volumes to be scheduled on Cloud servers
([#743](#743))
([702fe01](702fe01))
* fstype is directly passed to mkfs: mkfs.<fstype>
([#749](#749))
([173bf2f](173bf2f))
* support for SELinux mount
([#756](#756))
([719247e](719247e)),
closes [#582](#582)
* Support SINGLE_NODE_MULTI_WRITER capability
([#725](#725))
([cd53c23](cd53c23)),
closes [#327](#327)
* **swarm:** removed workaround support for mock staging/unstaging
([#746](#746))
([465ec21](465ec21))


### Bug Fixes

* do not log sensitive mount options
([#755](#755))
([0b6e860](0b6e860))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
lukasmetzner pushed a commit that referenced this pull request Nov 11, 2024
@hcloud-bot @lukasmetzner
chore(main): release 2.10.0 (#723)
1951756 
🤖 I have created a release *beep* *boop*
---


##
[2.10.0](v2.9.0...v2.10.0)
(2024-10-29)


### Features

* add support & tests for Kubernetes 1.31
([#721](#721))
([85035b9](85035b9))
* allow arbitrary length API tokens
([#724](#724))
([61c3a0e](61c3a0e))
* allow passing mkfs format options via storage class parameters
([#747](#747))
([4b9aa4e](4b9aa4e))
* change XFS default options to support older kernels
([#747](#747))
([4b9aa4e](4b9aa4e))
* drop tests for Kubernetes 1.27
([#722](#722))
([d46a54b](d46a54b))
* force pods with volumes to be scheduled on Cloud servers
([#743](#743))
([702fe01](702fe01))
* fstype is directly passed to mkfs: mkfs.<fstype>
([#749](#749))
([173bf2f](173bf2f))
* support for SELinux mount
([#756](#756))
([719247e](719247e)),
closes [#582](#582)
* Support SINGLE_NODE_MULTI_WRITER capability
([#725](#725))
([cd53c23](cd53c23)),
closes [#327](#327)
* **swarm:** removed workaround support for mock staging/unstaging
([#746](#746))
([465ec21](465ec21))


### Bug Fixes

* do not log sensitive mount options
([#755](#755))
([0b6e860](0b6e860))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apricote apricote apricote approved these changes

Assignees

@lukasmetzner lukasmetzner

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Docker Swarm support: Remove mock staging/unstaging once possible
3 participants
@lukasmetzner @jooola @apricote