diff --git a/devbox.json b/devbox.json index 8306ba97e..795bbe28a 100644 --- a/devbox.json +++ b/devbox.json @@ -6,7 +6,6 @@ "crane@latest", "envsubst@latest", "findutils@latest", - "fluxcd@latest", "ginkgo@latest", "git@latest", "github-cli@latest", diff --git a/devbox.lock b/devbox.lock index 77c27416d..78c81c48b 100644 --- a/devbox.lock +++ b/devbox.lock @@ -37,12 +37,6 @@ "source": "devbox-search", "version": "4.9.0" }, - "fluxcd@latest": { - "last_modified": "2023-08-25T03:28:31Z", - "resolved": "github:NixOS/nixpkgs/1e44a037bbf4fcaba041436e65e87be88f3f495b#fluxcd", - "source": "devbox-search", - "version": "2.1.0" - }, "ginkgo@latest": { "last_modified": "2023-09-04T16:24:30Z", "resolved": "github:NixOS/nixpkgs/3c15feef7770eb5500a4b8792623e2d6f598c9c1#ginkgo", diff --git a/make/all.mk b/make/all.mk index 8ae539bee..fed07d444 100644 --- a/make/all.mk +++ b/make/all.mk @@ -17,7 +17,6 @@ include $(INCLUDE_DIR)upx.mk include $(INCLUDE_DIR)addons.mk include $(INCLUDE_DIR)kind.mk include $(INCLUDE_DIR)clusterctl.mk -include $(INCLUDE_DIR)flux.mk include $(INCLUDE_DIR)dev.mk include $(INCLUDE_DIR)helm.mk include $(INCLUDE_DIR)examples.mk diff --git a/make/dev.mk b/make/dev.mk index a9f0b0271..321ebab69 100644 --- a/make/dev.mk +++ b/make/dev.mk @@ -5,7 +5,7 @@ ADDONS_PROVIDER := ClusterResourceSet .PHONY: dev.run-on-kind dev.run-on-kind: export KUBECONFIG := $(KIND_KUBECONFIG) -dev.run-on-kind: kind.create flux.install clusterctl.init +dev.run-on-kind: kind.create clusterctl.init ifndef SKIP_BUILD $(MAKE) release-snapshot endif diff --git a/make/flux.mk b/make/flux.mk deleted file mode 100644 index 188febe13..000000000 --- a/make/flux.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2023 D2iQ, Inc. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -.PHONY: flux.install -flux.install: - flux install --components=source-controller,helm-controller