Skip to content

Commit

Permalink
Fix/tilt fixup (kubernetes-sigs#7)
Browse files Browse the repository at this point in the history
* Updated to make tilt work again.

* Removed repo name in cmdline from readme.

* Fixed use of context.
  • Loading branch information
rejoshed authored Jan 19, 2022
1 parent 24e3cde commit 98e0dca
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ pkg/mocks/mock%.go: $(shell find ./pkg/cloud -type f -name "*test*" -prune -o -p

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

.PHONY: kind-cluster
kind-cluster: cluster-api cluster-api/hack/kind-install-for-capd.sh # Create a kind cluster with a local Docker repository.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ KUBECONFIG=capc-cluster.kubeconfig kubectl logs test-thing
### kubectl/clusterctl Reference:
- Pods in capc-cluster -- cluster running in cloudstack
```
cluster-api-provider-cloudstack-staging % KUBECONFIG=capc-cluster.kubeconfig kubectl get pods -A
% KUBECONFIG=capc-cluster.kubeconfig kubectl get pods -A
NAMESPACE NAME READY STATUS RESTARTS AGE
default test-thing 0/1 Completed 0 2m43s
kube-system cilium-jxw68 1/1 Running 0 6m
Expand All @@ -205,7 +205,7 @@ kube-system kube-scheduler-capc-cluster-control-plane-tknwx 1/1
- Pods in original kind cluster (also called bootstrap cluster, management cluster)
```
cluster-api-provider-cloudstack-staging % kubectl get pods -A
% kubectl get pods -A
NAMESPACE NAME READY STATUS RESTARTS AGE
capc-system capc-controller-manager-55798f8594-lp2xs 1/1 Running 0 30m
capi-kubeadm-bootstrap-system capi-kubeadm-bootstrap-controller-manager-7857cd7bb8-rldnw 1/1 Running 0 30m
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace: capc-system
bases:
- ../../default
- default
patchesStrategicMerge:
- insecure_manager.yaml
2 changes: 1 addition & 1 deletion tilt-provider.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cloudstack",
"config": {
"context": "config/dev",
"context": ".",
"image": "public.ecr.aws/a4z9h2b1/cluster-api-provider-capc",
"live_reload_deps": [
"main.go",
Expand Down

0 comments on commit 98e0dca

Please sign in to comment.