Skip to content

Commit 784315d

Browse files
committed
Move makefile to root dir, upgrade chart version
1 parent 73a5022 commit 784315d

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed
Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Set helm args based on only file to show
22
HELM_NAME = kubeshuttle
3+
HELM_CHART = devnet
34
ifneq ($(FILE),)
45
HELM_ARGS += --show-only $(FILE)
56
endif
67

7-
KEYS_CONFIG = configs/keys.json
8+
KEYS_CONFIG = charts/$(HELM_CHART)/configs/keys.json
89

910
###############################################################################
1011
### Helm commands ###
@@ -13,19 +14,19 @@ KEYS_CONFIG = configs/keys.json
1314
all: delete install
1415

1516
debug:
16-
helm template --dry-run --debug --generate-name . $(HELM_ARGS)
17+
helm template --dry-run --debug --generate-name ./charts/$(HELM_CHART) $(HELM_ARGS)
1718

1819
install:
19-
helm install --replace --debug $(HELM_NAME) . $(HELM_ARGS)
20+
helm install --replace --debug $(HELM_NAME) ./charts/$(HELM_CHART) $(HELM_ARGS)
2021

2122
upgrade:
22-
helm upgrade --debug $(HELM_NAME) . $(HELM_ARGS)
23+
helm upgrade --debug $(HELM_NAME) ./charts/$(HELM_CHART) $(HELM_ARGS)
2324

2425
delete:
2526
helm delete --debug $(HELM_NAME)
2627

2728
###############################################################################
28-
### Local Setup ###
29+
### Local Kind Setup ###
2930
###############################################################################
3031

3132
KIND_CLUSTER=kubeshuttle
@@ -99,19 +100,21 @@ add-n-mnemonic:
99100
### Port forward ###
100101
###############################################################################
101102

102-
VALUES_FILE = values.yaml
103+
VALUES_FILE = "charts/$(HELM_CHART)/values.yaml"
103104

104105
.PHONY: port-forward port-forward-all
105106
.port-forward:
106107
kubectl port-forward pods/$(chain)-genesis-0 $(localrpc):26657 &
107108
kubectl port-forward pods/$(chain)-genesis-0 $(localrest):1317 &
108109

109110
port-forward-all:
111+
echo "Port forwarding all chains to localhost"
110112
for chain in $$(yq -r ".chains | keys[]" $(VALUES_FILE)); do \
111113
$(MAKE) .port-forward chain=$$chain \
112114
localrpc=$$(yq -r ".chains[\"$$chain\"].localPorts.rpc" $(VALUES_FILE)) \
113115
localrest=$$(yq -r ".chains[\"$$chain\"].localPorts.rest" $(VALUES_FILE)); \
114116
done
117+
echo "Port forwarding explorer to localhost"
115118
kubectl port-forward service/explorer 8080:8080 &
116119

117120
.PHONY: stop-forward

charts/devnet/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.0
18+
version: 0.1.1
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
2222
# follow Semantic Versioning. They should reflect the version the application is using.
2323
# It is recommended to use it with quotes.
24-
appVersion: "0.1.0"
24+
appVersion: "0.1.1"

0 commit comments

Comments
 (0)