Skip to content

Commit 7f29e17

Browse files
(chore) : nice folder structure for the outputs directory
Signed-off-by: Archisman <[email protected]>
1 parent 547f444 commit 7f29e17

File tree

2 files changed

+18
-26
lines changed

2 files changed

+18
-26
lines changed

Makefile

+12-20
Original file line numberDiff line numberDiff line change
@@ -49,85 +49,77 @@ sample-config-generate-aws-dev:
4949
devenv-create-aws-dev:
5050
@go run ./cmd/ devenv create aws \
5151
--debug \
52-
--config ./outputs/kubeaid-bootstrap-script.aws.config.yaml
52+
--config ./outputs/configs/aws.yaml
5353

5454
.PHONY: devenv-create-azure-dev
5555
devenv-create-azure-dev:
5656
@go run ./cmd/ devenv create azure \
5757
--debug \
58-
--config ./outputs/kubeaid-bootstrap-script.azure.config.yaml
58+
--config ./outputs/configs/azure.yaml
5959

6060
.PHONY: bootstrap-cluster-aws-dev
6161
bootstrap-cluster-aws-dev:
6262
@go run ./cmd/ cluster bootstrap aws \
6363
--debug \
64-
--config ./outputs/kubeaid-bootstrap-script.aws.config.yaml
64+
--config ./outputs/configs/aws.yaml
6565
# --skip-kube-prometheus-build
6666
# --skip-clusterctl-move
6767

6868
.PHONY: bootstrap-cluster-azure-dev
6969
bootstrap-cluster-azure-dev:
7070
@go run ./cmd/ cluster bootstrap azure \
7171
--debug \
72-
--config ./outputs/kubeaid-bootstrap-script.azure.config.yaml
72+
--config ./outputs/configs/azure.yaml
7373
# --skip-kube-prometheus-build
7474
# --skip-clusterctl-move
7575

7676
.PHONY: bootstrap-cluster-hetzner-dev
7777
bootstrap-cluster-hetzner-dev:
7878
@go run ./cmd/ cluster bootstrap hetzner \
7979
--debug \
80-
--config ./outputs/kubeaid-bootstrap-script.hetzner.config.yaml \
80+
--config ./outputs/configs/hetzner/hcloud.yaml \
8181
--skip-kube-prometheus-build
8282
# --skip-clusterctl-move
8383

8484
.PHONY: upgrade-cluster-aws-dev
8585
upgrade-cluster-aws-dev:
8686
@go run ./cmd/ cluster upgrade aws \
8787
--debug \
88-
--config ./outputs/kubeaid-bootstrap-script.aws.config.yaml \
88+
--config ./outputs/configs/aws.yaml \
8989
--k8s-version "v1.32.0" --ami-id "ami-042e8a22a289729b1"
9090

9191
.PHONY: upgrade-cluster-azure-dev
9292
upgrade-cluster-azure-dev:
9393
@go run ./cmd/ cluster upgrade azure \
9494
--debug \
95-
--config ./outputs/kubeaid-bootstrap-script.azure.config.yaml \
95+
--config ./outputs/configs/azure.yaml \
9696
--k8s-version "v1.32.0"
9797

9898
.PHONY: delete-provisioned-cluster-aws-dev
9999
delete-provisioned-cluster-aws-dev:
100100
@go run ./cmd/ cluster delete \
101-
--config ./outputs/kubeaid-bootstrap-script.aws.config.yaml
101+
--config ./outputs/configs/aws.yaml
102102

103103
.PHONY: delete-provisioned-cluster-azure-dev
104104
delete-provisioned-cluster-azure-dev:
105105
@go run ./cmd/ cluster delete \
106-
--config ./outputs/kubeaid-bootstrap-script.azure.config.yaml
106+
--config ./outputs/./outputs/configs/azure.yaml
107107

108108
.PHONY: delete-provisioned-cluster-hetzner-dev
109109
delete-provisioned-cluster-hetzner-dev:
110110
@go run ./cmd/ cluster delete \
111-
--config ./outputs/kubeaid-bootstrap-script.hetzner.config.yaml
111+
--config ./outputs/configs/hetzner/hcloud.yaml
112112

113113
.PHONY: bootstrap-cluster-local-dev
114114
bootstrap-cluster-local-dev:
115115
@go run ./cmd/ cluster bootstrap local \
116116
--debug \
117-
--config ./outputs/kubeaid-bootstrap-script.local.config.yaml \
117+
--config ./outputs/configs/local.yaml \
118118
--skip-monitoring-setup \
119119
--skip-kube-prometheus-build \
120120
--skip-pr-flow
121121

122-
.PHONY: use-management-cluster
123-
use-management-cluster:
124-
export KUBECONFIG=./outputs/management-cluster.container.kubeconfig.yaml
125-
126-
.PHONY: use-provisioned-cluster
127-
use-provisioned-cluster:
128-
export KUBECONFIG=./outputs/provisioned-cluster.kubeconfig.yaml
129-
130122
.PHONY: management-cluster-delete
131123
management-cluster-delete:
132-
KUBECONFIG=./outputs/management-cluster.container.kubeconfig.yaml \
124+
KUBECONFIG=./outputs/kubeconfigs/clusters/management/container.yaml \
133125
k3d cluster delete management-cluster

pkg/constants/constants.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@ const (
6464
var (
6565
OutputDirectory = "./outputs"
6666

67-
OutputPathGeneratedConfig = path.Join(OutputDirectory, "kubeaid-bootstrap-script.config.yaml")
67+
OutputPathGeneratedConfig = path.Join(OutputDirectory, "config.yaml")
6868

6969
OutputPathLogFile = path.Join(OutputDirectory, ".log")
7070

71-
OutputPathManagementClusterK3DConfig = path.Join(OutputDirectory, "management-cluster.config.yaml")
71+
OutputPathManagementClusterK3DConfig = path.Join(OutputDirectory, "k3d.config.yaml")
7272

73-
OutputPathManagementClusterHostKubeconfig = path.Join(OutputDirectory, "management-cluster.host.kubeconfig.yaml")
74-
OutputPathManagementClusterContainerKubeconfig = path.Join(OutputDirectory, "management-cluster.container.kubeconfig.yaml")
73+
OutputPathManagementClusterHostKubeconfig = path.Join(OutputDirectory, "kubeconfigs/clusters/management/host.yaml")
74+
OutputPathManagementClusterContainerKubeconfig = path.Join(OutputDirectory, "kubeconfigs/clusters/management/container.yaml")
7575

76-
OutputPathMainClusterKubeconfig = path.Join(OutputDirectory, "main-cluster.kubeconfig.yaml")
76+
OutputPathMainClusterKubeconfig = path.Join(OutputDirectory, "kubeconfigs/clusters/main.yaml")
7777

78-
OutputPathJWKSDocument = path.Join(OutputDirectory, "jwks.json")
78+
OutputPathJWKSDocument = path.Join(OutputDirectory, "workload-identity/openid-provider/jwks.json")
7979
)
8080

8181
// ArgoCD.

0 commit comments

Comments
 (0)