Skip to content
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

Jump to bottom

tests/e2e: allow to superseed images in operator.sh #341

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

tests/e2e: allow to superseed images in operator.sh #341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d827098
tests/e2e: allow to install non-local built images
wainersm Jan 26, 2024
4d94a22
tests/e2e: allow to supersede the kata-payload
wainersm Jan 26, 2024
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
39 changes: 31 additions & 8 deletions tests/e2e/operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,20 @@ source "${script_dir}/lib.sh"
readonly ccruntime_overlay_basedir="${project_dir}/config/samples/ccruntime"
# The operator namespace.
readonly op_ns="confidential-containers-system"
# There should be a registry running locally on port 5000.
export IMG=localhost:5000/cc-operator:latest
export PRE_INSTALL_IMG=localhost:5000/reqs-payload
# If $IMG nor $PRE_INSTALL_IMG aren't exported then there should be a registry
# running locally on port 5000.
export IMG=${IMG:-localhost:5000/cc-operator:latest}
export PRE_INSTALL_IMG=${PRE_INSTALL_IMG:-localhost:5000/reqs-payload}
# If $KATA_PAYLOAD_IMG isn't exported then use the image set on the
# configuration files.
export KATA_PAYLOAD_IMG=${KATA_PAYLOAD_IMG:-}

# Build the operator and push images to a local registry.
#
build_operator () {
start_local_registry
if [[ "$IMG" =~ localhost ]];then
start_local_registry
fi

# Note: git config --global --add safe.directory will always
# append the target to .gitconfig without checking the
Expand All @@ -47,7 +53,9 @@ build_operator () {
# Build the reqs-payload and push images to a local registry.
#
build_pre_install_img() {
start_local_registry
if [[ "$PRE_INSTALL_IMG" =~ localhost ]];then
start_local_registry
fi

pushd "${project_dir}/install/pre-install-payload" >/dev/null
make reqs-image registry="${PRE_INSTALL_IMG}" \
Expand Down Expand Up @@ -83,8 +91,10 @@ handle_older_containerd() {
# Install the operator.
#
install_operator() {
start_local_registry

if [[ "$IMG" =~ localhost || \
"$PRE_INSTALL_IMG" =~ localhost ]];then
start_local_registry
fi
# The node should be 'worker' labeled
local label="node.kubernetes.io/worker"
if ! kubectl get node "$SAFE_HOST_NAME" -o jsonpath='{.metadata.labels}' \
Expand Down Expand Up @@ -126,6 +136,12 @@ install_ccruntime() {
"quay.io/confidential-containers/reqs-payload" \
"${PRE_INSTALL_IMG}"

if [ -n "$KATA_PAYLOAD_IMG" ];then
kustomization_set_image "${ccruntime_overlay_basedir}/default" \
"quay.io/kata-containers/kata-deploy" \
"$KATA_PAYLOAD_IMG"
fi

pushd "$overlay_dir" >/dev/null
kubectl create -k .
popd >/dev/null
Expand Down Expand Up @@ -154,7 +170,10 @@ install_ccruntime() {
return 1
fi
# To keep operator running, we should resume registry stopped during containerd restart.
start_local_registry
if [[ "$IMG" =~ localhost || \
"$PRE_INSTALL_IMG" =~ localhost ]];then
start_local_registry
fi
}

# Uninstall the CC runtime.
Expand Down Expand Up @@ -303,6 +322,10 @@ usage() {
"install": install only,
"wait_for_stabilization": wait for CoCo pods to be stable
"uninstall": uninstall the operator.
environment variables :
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really like this section, could you please (in a separate commit) add the RUNTIMECLASS, which is already supported to be set?

IMG: the controller image (current: $IMG)
PRE_INSTALL_IMG: the pre-reqs image (current: $PRE_INSTALL_IMG)
KATA_PAYLOAD_IMG: the kata-payload image (current: the one set in configs)
EOF
}

Expand Down
Loading