Skip to content

Commit dd2bdde

Browse files
committed
make base64 encode works for both macos and linux
1 parent 90af4a9 commit dd2bdde

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

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

179179
.PHONY: tilt-up
180180
tilt-up: cluster-api kind-cluster cluster-api/tilt-settings.json manifests cloud-config # Setup and run tilt for development.
181-
export CLOUDSTACK_B64ENCODED_SECRET=$$(base64 -i cloud-config) && cd cluster-api && tilt up
181+
export CLOUDSTACK_B64ENCODED_SECRET=$(base64 -w0 -i cloud-config 2>/dev/null || base64 -b 0 -i cloud-config) && cd cluster-api && tilt up
182182

183183
.PHONY: kind-cluster
184184
kind-cluster: cluster-api # Create a kind cluster with a local Docker repository.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Another container networking choice is to use [kindnet](https://github.com/aojea
7878
2. Run the following command to save the above cloudstack connection info into an environment variable, to be used by `./config/default/credentials.yaml` and ultimately the generated `infrastructure-components.yaml`, where it gets passed to CAPC:
7979
8080
```
81-
export CLOUDSTACK_B64ENCODED_SECRET=$(base64 -i cloud-config)
81+
export CLOUDSTACK_B64ENCODED_SECRET=$(base64 -w0 -i cloud-config 2>/dev/null || base64 -b 0 -i cloud-config)
8282
```
8383
6. Set the IMG environment variable so that the Makefile knows where to push docker image (if building your own)
8484
1. `export IMG=localhost:5000/cluster-api-provider-capc`
@@ -142,7 +142,7 @@ Another container networking choice is to use [kindnet](https://github.com/aojea
142142
143143
3. Generate the CAPC cluster spec yaml file
144144
```
145-
clusterctl generate cluster \
145+
clusterctl generate cluster capc-cluster \
146146
--from ~/.cluster-api/overrides/infrastructure-cloudstack/<VERSION>/cluster-template.yaml \
147147
> capc-cluster-spec.yaml
148148
@@ -171,7 +171,7 @@ Another container networking choice is to use [kindnet](https://github.com/aojea
171171
2. Run `KUBECONFIG=capc-cluster.kubeconfig cilium status` to confirm cilium status
172172
173173
8. Verify the K8s cluster is fully up
174-
1. Run `KUBECONFIG=capc-cluster.kubeconfig get nodes`, and observe the following output
174+
1. Run `KUBECONFIG=capc-cluster.kubeconfig kubectl get nodes`, and observe the following output
175175
```
176176
NAME STATUS ROLES AGE VERSION
177177
capc-cluster-control-plane-xsnxt Ready control-plane,master 2m56s v1.20.10

0 commit comments

Comments
 (0)