Skip to content

update docs, and remove some unused code related to "compose on kubernetes" deprecation - #3440

Merged
thaJeztah merged 9 commits into
docker:masterfrom
thaJeztah:drop_kube_follow_up
Feb 24, 2022
Merged

update docs, and remove some unused code related to "compose on kubernetes" deprecation#3440
thaJeztah merged 9 commits into
docker:masterfrom
thaJeztah:drop_kube_follow_up

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

Comment on lines 64 to 70
* mode (`--filter mode=replicated`, or `--filter mode=global`)
* Swarm: not supported
* Kubernetes: supported
* name (`--filter name=myapp_web`)
* Swarm: supported
* Kubernetes: supported
* node (`--filter node=mynode`)
* Swarm: not supported
* Kubernetes: supported
* service (`--filter service=web`)
* Swarm: not supported

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Some follow-up needed after this; need to check if these options are indeed no longer supported (as they're marked as "not supported" by swarm)

"Description": "Local Docker Engine + Azure AKS endpoint",
"StackOrchestrator": "kubernetes"
"Description": "Local Docker Engine",
"StackOrchestrator": "swarm"

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Need to check how this is used, but possibly we could/should reset this field and hide it

@codecov-commenter

codecov-commenter commented Feb 24, 2022

Copy link
Copy Markdown

Codecov Report

Merging #3440 (b7d0f5c) into master (aa75635) will decrease coverage by 0.00%.
The diff coverage is 20.00%.

@@ Coverage Diff @@## master #3440 +/- ##
==========================================
- Coverage 58.29% 58.28% -0.01% 
==========================================
Files 287 285 -2 Lines 24142 24134 -8 ==========================================
- Hits 14073 14067 -6 + Misses 9210 9207 -3 - Partials 859 860 +1 

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Hm... looks like this one has become flaky indeed; I opened a ticket for tracking: #3441

--- FAIL: TestInitTtySizeErrors (0.10s)
tty_test.go:29: assertion failed: --- expectedError
+++ →
@@ -1,2 +1 @@
-failed to resize tty, using default size

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

oh; let me make one more change in the first commit

Removes the --kubeconfig flag, and the corresponding ExportOptions.Kubeconfig,
as well as special handling for kubeconfig export, as it's no longer used.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
It was now an alias for getStackFilter, so no longer needed
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Removes the flags that have been deprecated or removed;
- --default-stack-orchestrator
- --kubernetes
- --kubeconfig
- --namespace
- --orchestrator
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Remove mentions of which options are supported by Kubernetes.
Note that there's some filters remaining that were marked as "not supported
by swarm": those filters need to be checked if this is accurate (and if so,
those filters must be removed).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Explicitly mention flags and environment variables that were removed, to
make the deprecation more discoverable.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

oh; let me make one more change in the first commit

ok 👍 updated

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

oh, of course, found one more thing; there's stackOrchestrator option in ~/.docker/config.json; let me mark that as deprecated as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Thanks for reviewing; let me get this one in

@thaJeztah
thaJeztah merged commit 60283c6 into docker:masterFeb 24, 2022
@thaJeztah
thaJeztah deleted the drop_kube_follow_up branch February 24, 2022 16:52
@thaJeztahthaJeztah added this to the 22.06.0 milestone May 13, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah@codecov-commenter@ndeloof