Skip to content

Commit 6df7c65

Browse files
authored
Fix/tilt fixup (#7)
* Updated to make tilt work again. * Removed repo name in cmdline from readme. * Fixed use of context.
1 parent 24e3cde commit 6df7c65

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ pkg/mocks/mock%.go: $(shell find ./pkg/cloud -type f -name "*test*" -prune -o -p
179179

180180
.PHONY: tilt-up
181181
tilt-up: cluster-api kind-cluster cluster-api/tilt-settings.json manifests cloud-config # Setup and run tilt for development.
182-
export CLOUDSTACK_B64ENCODED_SECRET=$(base64 -i cloud-config) && cd cluster-api && tilt up
182+
export CLOUDSTACK_B64ENCODED_SECRET=$$(base64 -i cloud-config) && cd cluster-api && tilt up
183183

184184
.PHONY: kind-cluster
185185
kind-cluster: cluster-api cluster-api/hack/kind-install-for-capd.sh # Create a kind cluster with a local Docker repository.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ KUBECONFIG=capc-cluster.kubeconfig kubectl logs test-thing
187187
### kubectl/clusterctl Reference:
188188
- Pods in capc-cluster -- cluster running in cloudstack
189189
```
190-
cluster-api-provider-cloudstack-staging % KUBECONFIG=capc-cluster.kubeconfig kubectl get pods -A
190+
% KUBECONFIG=capc-cluster.kubeconfig kubectl get pods -A
191191
NAMESPACE NAME READY STATUS RESTARTS AGE
192192
default test-thing 0/1 Completed 0 2m43s
193193
kube-system cilium-jxw68 1/1 Running 0 6m
@@ -205,7 +205,7 @@ kube-system kube-scheduler-capc-cluster-control-plane-tknwx 1/1
205205
206206
- Pods in original kind cluster (also called bootstrap cluster, management cluster)
207207
```
208-
cluster-api-provider-cloudstack-staging % kubectl get pods -A
208+
% kubectl get pods -A
209209
NAMESPACE NAME READY STATUS RESTARTS AGE
210210
capc-system capc-controller-manager-55798f8594-lp2xs 1/1 Running 0 30m
211211
capi-kubeadm-bootstrap-system capi-kubeadm-bootstrap-controller-manager-7857cd7bb8-rldnw 1/1 Running 0 30m
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1+
namespace: capc-system
12
bases:
2-
- ../../default
3+
- default
34
patchesStrategicMerge:
45
- insecure_manager.yaml

tilt-provider.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "cloudstack",
33
"config": {
4-
"context": "config/dev",
4+
"context": ".",
55
"image": "public.ecr.aws/a4z9h2b1/cluster-api-provider-capc",
66
"live_reload_deps": [
77
"main.go",

0 commit comments

Comments
 (0)