Skip to content

Commit

Permalink
Merge pull request tinkerbell#192 from jacobweinstock/bump-versions
Browse files Browse the repository at this point in the history
Bump versions:

## Description

<!--- Please describe what this PR is going to change -->
Bump versions across CAPT and the Stack playgrounds.

## Why is this needed

<!--- Link to issue you have raised -->

Fixes: #

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->
Manually tested all playgrounds.


## How are existing users impacted? What migration steps/scripts do we need?

<!--- Fixes a bug, unblocks installation, removes a component of the stack etc -->
<!--- Requires a DB migration script, etc. -->


## Checklist:

I have:

- [ ] updated the documentation and/or roadmap (if required)
- [ ] added unit or e2e tests
- [ ] provided instructions on how to upgrade
  • Loading branch information
jacobweinstock authored Aug 15, 2024
2 parents 5396e97 + 86707de commit 14beec9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions capt/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ namespace: "tink"
counts:
controlPlanes: 1
workers: 1
spares: 3
spares: 1
versions:
capt: 0.5.3
chart: 0.4.5
kube: v1.28.3
kube: v1.29.4
os: 20.04
kubevip: 0.8.0
kubevip: 0.8.2
os:
registry: ghcr.io/jacobweinstock/capi-images
registry: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell
distro: ubuntu
sshKey: ""
vm:
Expand Down
9 changes: 4 additions & 5 deletions stack/vagrant/.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ MACHINE1_IP=192.168.56.43
MACHINE1_MAC=08:00:27:9e:f5:3a

# https://github.com/tinkerbell/charts/pkgs/container/charts%2Fstack
HELM_CHART_VERSION=0.4.4
KUBECTL_VERSION=1.27.12
# K3D version v5.6.3 doesn't work with host networking. https://github.com/k3d-io/k3d/issues/964
K3D_VERSION=v5.6.0
HELM_VERSION=v3.14.4
HELM_CHART_VERSION=0.4.5
KUBECTL_VERSION=1.30.4
K3D_VERSION=v5.7.3
HELM_VERSION=v3.15.4
5 changes: 3 additions & 2 deletions stack/vagrant/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ install_k3d() {
}

start_k3d() {
k3d cluster create --network host --no-lb --k3s-arg "--disable=traefik,servicelb,metrics-server,local-storage"
# K3D_FIX_DNS=false is needed because host network mode won't work without it.
K3D_FIX_DNS=false k3d cluster create --network host --no-lb --k3s-arg "--disable=traefik,servicelb,metrics-server,local-storage"

mkdir -p ~/.kube/
k3d kubeconfig get -a >~/.kube/config
Expand Down Expand Up @@ -122,10 +123,10 @@ run_helm() {

install_k3d "$k3d_version"
start_k3d
kubectl_for_vagrant_user
install_helm "$helm_version"
helm_install_tink_stack "$namespace" "$helm_chart_version" "$loadbalancer_interface" "$loadbalancer_ip"
apply_manifests "$worker_ip" "$worker_mac" "$manifests_dir" "$loadbalancer_ip" "$namespace"
kubectl_for_vagrant_user
}

main() {
Expand Down

0 comments on commit 14beec9

Please sign in to comment.