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

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

Merged
merged 9 commits into from
Feb 24, 2022
Merged

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

merged 9 commits into from
Feb 24, 2022

Conversation

thaJeztah
Copy link
Member

thaJeztah
thaJeztah commented Feb 24, 2022
View reviewed changes
docs/reference/commandline/stack_services.md
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
Member Author

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)

thaJeztah
thaJeztah commented Feb 24, 2022
View reviewed changes
docs/reference/commandline/context_inspect.md
"Description": "Local Docker Engine + Azure AKS endpoint",
"StackOrchestrator": "kubernetes"
"Description": "Local Docker Engine",
"StackOrchestrator": "swarm"
Copy link
Member Author

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
Copy link

codecov-commenter commented Feb 24, 2022 •
edited
Loading

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
Member Author

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
Member Author

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

@thaJeztah
context export: remove docker context export --kubeconfig options
cff010c 
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 <[email protected]>
@thaJeztah
stack/swarm: remove unneeded getStackServiceFilter()
1924bc9 
It was now an alias for getStackFilter, so no longer needed

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
system/version: remove dead-code
16ece9b 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
docs: remove mention of DOCKER_STACK_ORCHESTRATOR env-var
869370a 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
docs: remove deprecated orchestrator flags
039018b 
Removes the flags that have been deprecated or removed;

- --default-stack-orchestrator
- --kubernetes
- --kubeconfig
- --namespace
- --orchestrator

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
docs: update list of supported filters for stack services
6dcfbe6 
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 <[email protected]>
@thaJeztah
docs: add more details to stack kubernetes deprecation
b7d0f5c 
Explicitly mention flags and environment variables that were removed, to
make the deprecation more discoverable.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

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

ok 👍 updated

@thaJeztah
Copy link
Member Author

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

@thaJeztah
Copy link
Member Author

Thanks for reviewing; let me get this one in

@thaJeztah thaJeztah merged commit 60283c6 into docker:master Feb 24, 2022
@thaJeztah thaJeztah deleted the drop_kube_follow_up branch February 24, 2022 16:52
@thaJeztah thaJeztah added this to the 22.06.0 milestone May 13, 2022
@thaJeztah thaJeztah mentioned this pull request Mar 31, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ndeloof ndeloof ndeloof approved these changes

@silvin-lubecki silvin-lubecki Awaiting requested review from silvin-lubecki silvin-lubecki is a code owner

Assignees
No one assigned
Labels
area/context area/kubernetes area/stack impact/deprecation impact/documentation kind/docs status/2-code-review
Projects
None yet
Milestone
23.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @codecov-commenter @ndeloof