Skip to content

Commit 3512059

Browse files
Load in minikube image and check if dbus starts before installing
Signed-off-by: Kate Goldenring <[email protected]>
1 parent cfae831 commit 3512059

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.github/workflows/helm-chart-smoketest.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,11 @@ jobs:
109109
- name: Create minikube cluster
110110
if: matrix.config.type == 'minikube'
111111
run: |
112-
docker build -t minikube-custom:v0.0.46-fixed -f ./images/test/Dockerfile.minikube-custom .
112+
curl -LO https://github.com/kubernetes/minikube/releases/latest/v1.36.0/minikube-linux-amd64
113+
install minikube-linux-amd64 /usr/local/bin/minikube && rm minikube-linux-amd64
114+
docker build -t minikube-custom:v0.0.46-fixed -f ./images/test/Dockerfile.minikube-custom . --load
113115
minikube start -p minikube --driver=docker --container-runtime=containerd --base-image="minikube-custom:v0.0.46-fixed" --kubernetes-version=${{ env.K8S_VERSION }}
116+
kubectl wait pod --all --for=condition=Ready --namespace=kube-system --timeout=180s
114117
115118
- name: Create microk8s cluster
116119
if: matrix.config.type == 'microk8s'

internal/containerd/install_dbus.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
// and starts the service.
1010
// NOTE: this limits support to systems using systemctl to manage systemd.
1111
func InstallDbus() error {
12-
cmd := nsenterCmd("systemctl", "is-active", "dbus", "--quiet")
12+
cmd := nsenterCmd("systemctl", "start", "dbus", "--quiet")
1313
if err := cmd.Run(); err == nil {
1414
slog.Info("D-Bus is already installed and running")
1515
return nil

0 commit comments

Comments
 (0)