diff --git a/Makefile b/Makefile index e6fa128ae..6eb634e10 100644 --- a/Makefile +++ b/Makefile @@ -172,6 +172,16 @@ skopeo: fakechroot: if ! which fakechroot; then if [ -f /etc/redhat-release ]; then dnf -y install fakechroot; elif [ -f /etc/lsb-release ]; then sudo apt-get -y update; sudo apt-get -y install fakechroot; fi; fi +$(BIN_DIR)/get_helm.sh: + mkdir -p $(BIN_DIR) + curl -fsSL -o $(BIN_DIR)/get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 + chmod 700 $(BIN_DIR)/get_helm.sh + +$(BIN_DIR)/helm: $(BIN_DIR)/get_helm.sh + HELM_INSTALL_DIR=$(BIN_DIR) $(BIN_DIR)/get_helm.sh + +helm: $(BIN_DIR)/helm + deploy-setup: export ADMISSION_CONTROLLERS_ENABLED?=false deploy-setup: skopeo install hack/deploy-setup.sh $(NAMESPACE) diff --git a/hack/run-e2e-conformance-virtual-cluster.sh b/hack/run-e2e-conformance-virtual-cluster.sh index ab6d6e9af..986c7e4e0 100755 --- a/hack/run-e2e-conformance-virtual-cluster.sh +++ b/hack/run-e2e-conformance-virtual-cluster.sh @@ -361,6 +361,8 @@ do done +source hack/env.sh + export ADMISSION_CONTROLLERS_ENABLED=true export ADMISSION_CONTROLLERS_CERTIFICATES_CERT_MANAGER_ENABLED=true export SKIP_VAR_SET="" @@ -368,12 +370,26 @@ export NAMESPACE="sriov-network-operator" export OPERATOR_NAMESPACE="sriov-network-operator" export CNI_BIN_PATH=/opt/cni/bin export OPERATOR_EXEC=kubectl -export CLUSTER_TYPE=kubernetes -export DEV_MODE=TRUE export CLUSTER_HAS_EMULATED_PF=TRUE -echo "## deploy namespace" -envsubst< $root/deploy/namespace.yaml | ${OPERATOR_EXEC} apply -f - + +HELM_VALUES_OPTS="\ + --set images.operator=${SRIOV_NETWORK_OPERATOR_IMAGE} \ + --set images.sriovConfigDaemon=${SRIOV_NETWORK_CONFIG_DAEMON_IMAGE} \ + --set images.sriovCni=${SRIOV_CNI_IMAGE} \ + --set images.sriovDevicePlugin=${SRIOV_DEVICE_PLUGIN_IMAGE} \ + --set images.resourcesInjector=${NETWORK_RESOURCES_INJECTOR_IMAGE} \ + --set images.webhook=${SRIOV_NETWORK_WEBHOOK_IMAGE} \ + --set operator.admissionControllers.enabled=${ADMISSION_CONTROLLERS_ENABLED} \ + --set operator.admissionControllers.certificates.certManager.enabled=${ADMISSION_CONTROLLERS_CERTIFICATES_CERT_MANAGER_ENABLED} \ + --set sriovOperatorConfig.deploy=true" + +PATH=$PATH:${root}/bin +make helm +helm install -n ${NAMESPACE} --create-namespace \ + $HELM_VALUES_OPTS \ + --wait sriov-network-operator ./deployment/sriov-network-operator + echo "## create certificates for webhook" cat <