From bf7442fb9ce848e289bbbd554f22ca1db38ffb81 Mon Sep 17 00:00:00 2001 From: Shinya Hayashi Date: Fri, 14 Jun 2024 06:00:02 +0000 Subject: [PATCH] hoge --- .../deploy-rook-ceph-on-two-k8s-clusters.yaml | 2 +- test/e2e/Makefile | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml b/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml index 82f6cd14..b3c54f61 100644 --- a/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml +++ b/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml @@ -69,5 +69,5 @@ jobs: - name: "Deploy secondary Rook/Ceph cluster" run: |- ./test/e2e/bin/kubectl config use-context profile2 - make -C test/e2e launch-single-rook-ceph PROFILE=profile1 + make -C test/e2e launch-single-rook-ceph PROFILE=profile2 make -C test/e2e setup-single-components diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 12a14c4d..bb470612 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -91,6 +91,8 @@ launch-minikube: --extra-config=kubeadm.node-name=$(NODE_NAME) \ --extra-config=kubelet.hostname-override=$(NODE_NAME) \ -p $(PROFILE) +# To prevent rook installation timeout, pull the image in advance. + $(MINIKUBE) -p $(PROFILE) ssh -- docker pull quay.io/ceph/ceph:v17.2.6 # $(SUDO) chown -R $$USER $$HOME/.kube $(MINIKUBE_HOME)/.minikube # $(SUDO) chmod -R a+r $$HOME/.kube $(MINIKUBE_HOME)/.minikube # $(SUDO) find $(MINIKUBE_HOME)/.minikube -name id_rsa -exec chmod 600 {} ';' @@ -168,7 +170,7 @@ launch-rook-ceph: create-loop-dev .PHONY: launch-single-rook-ceph launch-single-rook-ceph: create-loop-dev - $(HELM) upgrade --install --version $(ROOK_CHART_VERSION) --repo https://charts.rook.io/release \ + $(HELM) upgrade --install --timeout 10m --version $(ROOK_CHART_VERSION) --repo https://charts.rook.io/release \ --create-namespace --namespace $(CEPH_CLUSTER1_NAMESPACE) -f testdata/values.yaml --wait \ rook-ceph rook-ceph sed \ @@ -178,7 +180,7 @@ launch-single-rook-ceph: create-loop-dev testdata/persistentvolumes-template.yaml \ > testdata/persistentvolumes.yaml $(KUBECTL) apply -f testdata/persistentvolumes.yaml - $(HELM) upgrade --install --version $(ROOK_CHART_VERSION) --repo https://charts.rook.io/release \ + $(HELM) upgrade --install --timeout 10m --version $(ROOK_CHART_VERSION) --repo https://charts.rook.io/release \ --namespace $(CEPH_CLUSTER1_NAMESPACE) -f testdata/values-cluster.yaml --wait rook-ceph-cluster rook-ceph-cluster free -h df -h @@ -211,19 +213,18 @@ setup-components: # ref. https://github.com/kubernetes/minikube/issues/17785 docker save controller:latest | $(SUDO) ctr -n k8s.io images import - - $(HELM) upgrade --install mantle-cluster-wide ../../charts/mantle-cluster-wide/ --wait - $(HELM) upgrade --install --namespace=$(CEPH_CLUSTER1_NAMESPACE) mantle ../../charts/mantle/ --wait - $(HELM) upgrade --install --namespace=$(CEPH_CLUSTER2_NAMESPACE) mantle2 ../../charts/mantle/ --wait + $(HELM) upgrade --install --timeout 10m mantle-cluster-wide ../../charts/mantle-cluster-wide/ --wait + $(HELM) upgrade --install --timeout 10m --namespace=$(CEPH_CLUSTER1_NAMESPACE) mantle ../../charts/mantle/ --wait + $(HELM) upgrade --install --timeout 10m --namespace=$(CEPH_CLUSTER2_NAMESPACE) mantle2 ../../charts/mantle/ --wait .PHONY: setup-single-components setup-single-components: - $(MAKE) -C ../.. docker-build # We can't use `minikube image load` due to a minikube's problem. # ref. https://github.com/kubernetes/minikube/issues/17785 docker save controller:latest | $(SUDO) ctr -n k8s.io images import - - $(HELM) upgrade --install mantle-cluster-wide ../../charts/mantle-cluster-wide/ --wait - $(HELM) upgrade --install --namespace=$(CEPH_CLUSTER1_NAMESPACE) mantle ../../charts/mantle/ --wait + $(HELM) upgrade --install --timeout 10m mantle-cluster-wide ../../charts/mantle-cluster-wide/ --wait + $(HELM) upgrade --install --timeout 10m --namespace=$(CEPH_CLUSTER1_NAMESPACE) mantle ../../charts/mantle/ --wait .PHONY: delete-components delete-components: