Skip to content

[WIP] Drop support for (archived) Compose-on-Kubernetes - #3389

Closed
thaJeztah wants to merge 2 commits into
docker:masterfrom
thaJeztah:drop_kubernetes_support
Closed

[WIP] Drop support for (archived) Compose-on-Kubernetes#3389
thaJeztah wants to merge 2 commits into
docker:masterfrom
thaJeztah:drop_kubernetes_support

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Dec 10, 2021

Copy link
Copy Markdown
Member

carries #3139
closes#3139

closes#2967
(https://docker.atlassian.net/browse/IL-257 for internal tracker)

- What I did
Removed support for Kubernetes orchestrator, as required compose-on-kubernetes backend is archived

- How I did it
Code removal

- How to verify it
isn't this what CI is for ? :P

- Description for the changelog
Removed support for deprecated Compose-on-Kubernetes

- A picture of a cute animal (not mandatory but encouraged)
image

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Ok, at least some linting errors;

#17 66.46 cli/command/system/version.go:143:31: SA4017: HasKubernetes is a pure function but its return value is ignored (staticcheck)
#17 66.46 if orchestrator.HasKubernetes() {
#17 66.46 ^

And various (e2e) tests failing due to the kubernetes fields no longer being there;

=== FAIL: e2e/context TestContextImportTLS (0.05s)
context_test.go:62: assertion failed: --- expected
+++ actual
@@ -1,4 +1,4 @@
-NAME DESCRIPTION DOCKER ENDPOINT KUBERNETES ENDPOINT ORCHESTRATOR
-default * Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm
-test unix:///var/run/docker.sock https://kubernetes.docker.internal:6443 (default) swarm
+NAME DESCRIPTION DOCKER ENDPOINT ORCHESTRATOR
+default * Current DOCKER_HOST based configuration unix:///var/run/docker.sock swarm
+test unix:///var/run/docker.sock swarm
You can run 'go test . -test.update-golden' to automatically update testdata/context-ls-tls.golden to the new expected value.'

@thaJeztah
thaJeztahforce-pushed the drop_kubernetes_support branch 3 times, most recently from 2462c8e to 02c94c2CompareDecember 10, 2021 12:50
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Some failures remaining (and probably docs and completion scripts to be updated as well), but getting closer

--- FAIL: TestCreateInvalids (0.00s)
--- FAIL: TestCreateInvalids/orchestrator-all-no-endpoint (0.00s)
create_test.go:120: assertion failed: expected an error, got nil
--- FAIL: TestExportImportWithFile (0.00s)
export-import_test.go:23: assertion failed: error is not nil: context "test" does not exist
--- FAIL: TestExportImportPipe (0.00s)
export-import_test.go:49: assertion failed: error is not nil: context "test" does not exist
FAIL

ndeloofand others added 2 commits February 15, 2022 17:04
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed the drop_kubernetes_support branch from 02c94c2 to be80af9CompareFebruary 15, 2022 16:06
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

need to squash the commits, as the first commit doesn't build (removes github.com/docker/cli/cli/context/kubernetes, but it's still used in some places in that commit)

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Did a rebase;
These still fail, so need fixing;

 === FAIL: cli/command/context TestCreateInvalids/orchestrator-all-no-endpoint (0.00s)
create_test.go:120: assertion failed: expected an error, got nil
--- FAIL: TestCreateInvalids/orchestrator-all-no-endpoint (0.00s)
=== FAIL: cli/command/context TestCreateInvalids (0.00s)
=== FAIL: cli/command/context TestExportImportWithFile (0.00s)
export-import_test.go:23: assertion failed: error is not nil: context "test" does not exist
=== FAIL: cli/command/context TestExportImportPipe (0.00s)
export-import_test.go:49: assertion failed: error is not nil: context "test" does not exist

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.

Drop Kubernetes support (compose-on-kubernetes is now unmaintained & archived)

2 participants

@thaJeztah@ndeloof