Skip to content

Added integration with the image-builder kubevirt image #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 1 commit into from
Apr 27, 2022
Merged

Added integration with the image-builder kubevirt image #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ $(KUSTOMIZE): # Build kustomize from tools folder.
$(MAKE) -C $(ROOT) kustomize

# Define Docker related variables. Releases should modify and double check these vars.
REGISTRY ?= localhost:5000
REGISTRY ?= 127.0.0.1:5000
Comment thread
isaacdorfman marked this conversation as resolved.
IMAGE_NAME ?= capk-manager
CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
ARCH ?= amd64
Expand Down
4 changes: 2 additions & 2 deletions e2e/create-cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ var _ = Describe("CreateCluster", func() {
}
}
return nil
}, 5*time.Minute, 5*time.Second).Should(Succeed(), "kubevirt machines should have bootstrap succeeded condition")
}, 10*time.Minute, 5*time.Second).Should(Succeed(), "kubevirt machines should have bootstrap succeeded condition")

}

Expand Down Expand Up @@ -275,7 +275,7 @@ var _ = Describe("CreateCluster", func() {
}

return nil
}, 10*time.Minute, 5*time.Second).Should(Succeed(), "cluster should have control plane initialized")
}, 15*time.Minute, 5*time.Second).Should(Succeed(), "cluster should have control plane initialized")
}

injectKubevirtClusterExternallyManagedAnnotation := func(yamlStr string) string {
Expand Down
4 changes: 2 additions & 2 deletions hack/functest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ echo "Building and installing capk manager container"

echo "Running e2e test suite"
export KUBECONFIG=$(./kubevirtci kubeconfig)
export NODE_VM_IMAGE_TEMPLATE=quay.io/kubevirtci/fedora-kubeadm:35
export NODE_VM_IMAGE_TEMPLATE=quay.io/capk/ubuntu-container-disk:20.04
export IMAGE_REPO=k8s.gcr.io
export TENANT_CLUSTER_KUBERNETES_VERSION=v1.21.0
export CRI_PATH=/var/run/crio/crio.sock
export CRI_PATH=/var/run/containerd/containerd.sock
export ROOT_VOLUME_SIZE=23Gi
export STORAGE_CLASS_NAME=rook-ceph-block
make e2e-test
6 changes: 3 additions & 3 deletions kubevirtci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ function kubevirtci::down() {
}

function kubevirtci::build() {
export REGISTRY="localhost:$(cluster-up/cluster-up/cli.sh ports registry)"
export REGISTRY="127.0.0.1:$(cluster-up/cluster-up/cli.sh ports registry)"
make docker-build
make docker-push
}
Expand All @@ -104,9 +104,9 @@ function kubevirtci::generate_kubeconfig() {
}

function kubevirtci::create_cluster() {
export NODE_VM_IMAGE_TEMPLATE=quay.io/kubevirtci/fedora-kubeadm:35
export NODE_VM_IMAGE_TEMPLATE=quay.io/capk/ubuntu-container-disk:20.04
export IMAGE_REPO=k8s.gcr.io
export CRI_PATH="/var/run/crio/crio.sock"
export CRI_PATH="/var/run/containerd/containerd.sock"
Comment thread
isaacdorfman marked this conversation as resolved.
oc create secret generic external-infra-kubeconfig -n capk-system --from-file=kubeconfig=kubeconfig-e2e --from-literal=namespace=e2e-test
$CLUSTERCTL_PATH generate cluster kvcluster --kubernetes-version v1.21.0 --control-plane-machine-count=1 --worker-machine-count=1 --from templates/cluster-template-ext-infra.yaml | ${_kubectl} apply -f -
}
Expand Down