Skip to content

Commit

Permalink
Merge pull request #54 from SovereignCloudStack/tg/use-v2-for-make-ti…
Browse files Browse the repository at this point in the history
…lt-up

🌱 use v2 for `make tilt-up` and provide Docker socket
  • Loading branch information
guettli committed Jan 19, 2024
2 parents 7c5bfa7 + c3b0699 commit a04233f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion config/cso/cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
cidrBlocks: ["192.168.0.0/16"]
serviceDomain: "cluster.local"
topology:
class: docker-ferrol-1-27-v1
class: docker-ferrol-1-27-v2
controlPlane:
metadata: {}
replicas: 1
Expand Down
2 changes: 1 addition & 1 deletion config/cso/clusterstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ spec:
autoSubscribe: false
noProvider: true
versions:
- v1
- v2
2 changes: 1 addition & 1 deletion docs/develop/develop.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Operator development requires a lot of iteration, and the “build, tag, push, u
```shell
make tilt-up
```
> To access the Tilt UI please go to: `http://localhost:10350`
> To access the Tilt UI please go to: `http://localhost:10351`

You should make sure that everything in the UI looks green. If not, e.g. if the clusterstack has not been synced, you can trigger the Tilt workflow again. In case of the clusterstack button this might be necessary, as it cannot be applied right after startup of the cluster and fails. Tilt unfortunately does not include a waiting period.
Expand Down
3 changes: 3 additions & 0 deletions hack/kind-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ kindV1Alpha4Cluster:
nodes:
- role: control-plane
image: kindest/node:${CLUSTER_VERSION}
extraMounts:
- hostPath: /var/run/docker.sock
containerPath: /var/run/docker.sock
networking:
podSubnet: "10.244.0.0/16"
serviceSubnet: "10.96.0.0/12"
Expand Down

0 comments on commit a04233f

Please sign in to comment.