Skip to content

Add an AKS migration e2e run #11521

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
lwr20 merged 1 commit into from
Dec 12, 2025
Merged

Add an AKS migration e2e run #11521

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
16 changes: 16 additions & 0 deletions .semaphore/end-to-end/pipelines/iptables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,22 @@ blocks:
value: --ginkgo.focus=(\[sig-calico\]|\[Conformance\]|Feature:NetworkPolicy) --ginkgo.skip=(Slow|Disruptive|calient|allow.ingress.access.from.updated.pod|Dataplane:LB|outside.the.cluster|MTU|ExternalNode|external.to.nodeport|StrictAffinity|Feature:SCTP)
- name: CLUSTER_MODE
value: "private"

- name: AKS migrate from vendored Calico CNI to Calico CNI
execution_time_limit:
hours: 7
commands:
- ~/calico/.semaphore/end-to-end/scripts/body_standard.sh
env_vars:
- name: INSTALLER
value: operator
Comment on lines +171 to +172
Copy link

Copilot AI Dec 10, 2025

Choose a reason for hiding this comment

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

The INSTALLER environment variable is set to "operator" at the job level (line 171-172) but is also defined as "helmerator" at the task level (line 185-186). While the job-level value will take precedence, this duplication could cause confusion. Consider removing the job-level definition if the task-level default is incorrect, or document why both are needed.

Suggested change
- name: INSTALLER
value: operator

Copilot uses AI. Check for mistakes.
- name: USE_VENDORED_CNI # This sets up the cluster with AKS vendored CNI
value: "true"
- name: CNI_PLUGIN
value: Calico # This (together with USE_VENDORED_CNI) sets up the cluster with AKS vendored Calico
- name: DESIRED_POLICY
value: Calico # This converts the cluster to unmanaged-Calico policy

env_vars:
- name: K8S_E2E_FLAGS
value: --ginkgo.focus=(\[sig-calico\]|\[Conformance\]) --ginkgo.skip=(\[Slow\]|\[Disruptive\])
Expand Down
7 changes: 7 additions & 0 deletions .semaphore/end-to-end/scripts/body_standard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ if [[ -n "$OPERATOR_MIGRATE" ]]; then
${HOME}/${SEMAPHORE_GIT_DIR}/.semaphore/end-to-end/scripts/test_scripts/operator_migrate.sh
fi

# Perform the AKS migration following the instructions here:
# https://docs.tigera.io/calico/latest/getting-started/kubernetes/managed-public-cloud/aks-migrate
if [[ -n "$DESIRED_POLICY" ]]; then
Copy link

Copilot AI Dec 10, 2025

Choose a reason for hiding this comment

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

The variable name DESIRED_POLICY is ambiguous for triggering AKS migration. The condition only checks if the variable is non-empty (-n), making it function as a boolean flag, but the name suggests it's a configuration value. Consider using a more explicit name like AKS_MIGRATE to match the pattern of OPERATOR_MIGRATE on line 46, or if the value matters, document why and ensure the bz addons run aks-migrate:setup command uses it.

Suggested change
if [[ -n "$DESIRED_POLICY" ]]; then
if [[ -n "$AKS_MIGRATE" ]]; then

Copilot uses AI. Check for mistakes.
echo "[INFO] starting AKS migration..."
bz addons run aks-migrate:setup
fi

if [[ -n "$UPLEVEL_RELEASE_STREAM" ]]; then
echo "[INFO] starting bz upgrade..."
bz upgrade $VERBOSE | tee >(gzip --stdout > ${BZ_LOGS_DIR}/upgrade.log.gz)
Expand Down