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.

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

Use correct binary path for snapshot/restore, adapt Tilt config #987

Conversation

Danil-Grigorev
Copy link
Contributor

@Danil-Grigorev Danil-Grigorev commented Jan 7, 2025

What this PR does / why we need it:

Tilt uses own process for building docker images, which does involve overriding built image CMD. This overlaps with the model etcd snapshot restore is currently following, where the image is the part of the regular turtles image, running under different CMD.

This discrepancy causes e2e to fail, and Tiltfile based build to work without issues.

Current change ensures that both tilt up and GINKGO_LABEL_FILTER=local make test-e2e work without issues.


  RESOURCE NAME                                                                     CONTAINER •  UPDATE STATUS  •    AS OF 
▶ ● (Tiltfile) ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ N/A             • <45s ago 
  ● turtles_controller ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ Running • OK       (7.1s) • <30s ago 
  ● turtles-etcdsnapshotrestore_controller ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ Running • OK       (7.2s) • <30s ago 
  ● turtles-clusterclass-operations_controller ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ Running • OK       (1.2s) • <30s ago 
    HISTORY: FIRST BUILD                                                                        OK       (1.2s) • <30s ago 
    K8S POD: rancher-turtles-clusterclass-controller-manager-59f5fcc9bb6lj8h                          1 restart •  AGE 45m 
  ● turtles_binary ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ OK       (2.8s) • <45s ago 
  ● turtles-etcdsnapshotrestore_binary ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ OK       (2.9s) • <45s ago 
  ● turtles-clusterclass-operations_binary ╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌ OK       (0.5s) • <30s ago

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #974

Special notes for your reviewer:

Checklist:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@Danil-Grigorev Danil-Grigorev requested a review from a team as a code owner January 7, 2025 17:24
@Danil-Grigorev Danil-Grigorev added the kind/bug Something isn't working label Jan 7, 2025
@Danil-Grigorev Danil-Grigorev force-pushed the fix-etcd-snapshot-restore-binary-path branch from cb3b787 to 4d0f0f5 Compare January 7, 2025 17:33
Signed-off-by: Danil-Grigorev <danil.grigorev@suse.com>
@Danil-Grigorev Danil-Grigorev force-pushed the fix-etcd-snapshot-restore-binary-path branch from 4d0f0f5 to a9e378c Compare January 7, 2025 17:51
@Danil-Grigorev Danil-Grigorev enabled auto-merge (squash) January 8, 2025 10:19
@Danil-Grigorev Danil-Grigorev merged commit f5b2bb7 into rancher:main Jan 8, 2025
9 checks passed
@furkatgofurov7
Copy link
Contributor

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ETCD-snapshot-restore] E2E test failing
4 participants