Skip to content

Commit af4f31c

Browse files
committed
chore: remove dead v3 prototype code from embedded-cluster v2
The v3 prototype has been abandoned and moved to a separate repository. This cleanup removes all dead v3-specific code, environment variable gates (ENABLE_V3), and v3-only features from the v2 production codebase. Deleted files: - cmd/installer/cli/install_v3.go and tests - cmd/installer/cli/headless/install/* (entire directory) - tests/dryrun/v3_*_test.go (4 files) - .github/workflows/v3-e2e.yaml - e2e/kots-release-install-v3/* and upgrade-v3/* - e2e/licenses/ci-v3.yaml - pkg-new/k0s/mock.go, pkg-new/upgrade/mock.go Key changes: - Remove ENABLE_V3 env var gates from install, upgrade, version commands - Simplify KotsadmNamespace to always return 'kotsadm' - Simplify EmbeddedClusterLogsPath to use static v2 path - Remove headless install orchestrator and v3 install flow - Remove dead code from pkg-new/* packages - Update Makefile to always use v2 release directories - Update tests to match v2-only behavior - dagger: remove InstallHeadless, E2eRunHeadless helpers Build and tests pass.
1 parent 8bc2caf commit af4f31c

63 files changed

Lines changed: 68 additions & 10138 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/v3-e2e.yaml

Lines changed: 0 additions & 284 deletions
This file was deleted.

Makefile

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -181,23 +181,17 @@ output/bin/embedded-cluster-release-builder:
181181
mkdir -p output/bin
182182
CGO_ENABLED=0 go build -o output/bin/embedded-cluster-release-builder e2e/embedded-cluster-release-builder/main.go
183183

184-
.PHONY: e2e-v3-initial-release
185-
e2e-v3-initial-release: export ARCH = amd64
186-
e2e-v3-initial-release: export UPLOAD_BINARIES = 1
187-
e2e-v3-initial-release: export ENABLE_V3 = 1
188-
e2e-v3-initial-release: initial-release
189-
190184
.PHONY: initial-release
191185
initial-release: RANDOM_STRING = $(call random-string)
192186
initial-release: export EC_VERSION ?= $(VERSION)-$(RANDOM_STRING)
193187
initial-release: export APP_VERSION ?= appver-dev-$(RANDOM_STRING)
194-
initial-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-install-v3,e2e/kots-release-install)
188+
initial-release: export RELEASE_YAML_DIR = e2e/kots-release-install
195189
initial-release: check-env-EC_VERSION check-env-APP_VERSION
196190
UPLOAD_BINARIES=$(if $(UPLOAD_BINARIES),$(UPLOAD_BINARIES),0) \
197191
./scripts/build-and-release.sh
198192

199193
.PHONY: rebuild-release
200-
rebuild-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-install-v3,e2e/kots-release-install)
194+
rebuild-release: export RELEASE_YAML_DIR = e2e/kots-release-install
201195
rebuild-release: check-env-EC_VERSION check-env-APP_VERSION
202196
UPLOAD_BINARIES=$(if $(UPLOAD_BINARIES),$(UPLOAD_BINARIES),0) \
203197
SKIP_RELEASE=1 \
@@ -207,7 +201,7 @@ rebuild-release: check-env-EC_VERSION check-env-APP_VERSION
207201
upgrade-release: RANDOM_STRING = $(call random-string)
208202
upgrade-release: export EC_VERSION ?= $(VERSION)-upgrade-$(RANDOM_STRING)
209203
upgrade-release: export APP_VERSION ?= appver-dev-upgrade-$(RANDOM_STRING)
210-
upgrade-release: export RELEASE_YAML_DIR = $(if $(filter 1,$(ENABLE_V3)),e2e/kots-release-upgrade-v3,e2e/kots-release-upgrade)
204+
upgrade-release: export RELEASE_YAML_DIR = e2e/kots-release-upgrade
211205
upgrade-release: check-env-EC_VERSION check-env-APP_VERSION
212206
UPLOAD_BINARIES=$(if $(UPLOAD_BINARIES),$(UPLOAD_BINARIES),1) \
213207
./scripts/build-and-release.sh
@@ -349,31 +343,20 @@ create-node%: DISTRO = debian-bookworm
349343
create-node%: NODE_PORT = 30000
350344
create-node%: MANAGER_NODE_PORT = 30080
351345
create-node%: K0S_DATA_DIR = /var/lib/embedded-cluster/k0s
352-
create-node%: K0S_DATA_DIR_V3 = $(shell \
353-
if [ -n "$(REPLICATED_APP)" ]; then \
354-
echo "/var/lib/$(shell echo '$(REPLICATED_APP)' | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9-]/-/g')/k0s"; \
355-
else \
356-
echo "/var/lib/embedded-cluster-smoke-test-staging-app/k0s"; \
357-
fi)
358-
create-node%: ENABLE_V3 = 0
359346
create-node%:
360-
@echo "Mounting data directories:"
361-
@echo " v2: $(K0S_DATA_DIR)"
362-
@echo " v3: $(K0S_DATA_DIR_V3)"
347+
@echo "Mounting data directory: $(K0S_DATA_DIR)"
363348
@docker run -d \
364349
--name node$* \
365350
--hostname node$* \
366351
--privileged \
367352
--restart=unless-stopped \
368353
-v $(K0S_DATA_DIR) \
369-
-v $(K0S_DATA_DIR_V3) \
370354
-v $(shell pwd):/replicatedhq/embedded-cluster \
371355
-v $(shell dirname $(shell pwd))/kots:/replicatedhq/kots \
372356
$(if $(filter node0,node$*),-p $(NODE_PORT):$(NODE_PORT)) \
373357
$(if $(filter node0,node$*),-p $(MANAGER_NODE_PORT):$(MANAGER_NODE_PORT)) \
374358
$(if $(filter node0,node$*),-p 30003:30003) \
375359
-e EC_PUBLIC_ADDRESS=localhost \
376-
-e ENABLE_V3=$(ENABLE_V3) \
377360
replicated/ec-distro:$(DISTRO)
378361

379362
@$(MAKE) ssh-node$*

0 commit comments

Comments
 (0)