[snapshot] Add --publish so upload works from outside the cluster network - #462
Open
kkozoriz wants to merge 4 commits into
Open
[snapshot] Add --publish so upload works from outside the cluster network#462kkozoriz wants to merge 4 commits into
kkozoriz wants to merge 4 commits into
Conversation
… client Add ValidateHTTPSURL (transport) and NewSafeClientForConfig (safe client) as the foundational pieces needed to build an HTTPS client against a published (ingress) DataImport endpoint. Signed-off-by: Konstantin Kozoriz <konstantin.kozoriz@flant.com>
Add spec.publish to the DataImport built by d8 snapshot upload, align it alongside spec.ttl on reuse, wait on status.publicURL when publish is enabled, and switch to a merged TLS trust pool with 401/403 diagnostics on that path. Signed-off-by: Konstantin Kozoriz <konstantin.kozoriz@flant.com>
Wire the flag through to the DataImport importer, auto-detecting the upload mode when unset, and document the bearer-token requirement for the published path. Signed-off-by: Konstantin Kozoriz <konstantin.kozoriz@flant.com>
SetTLSCAData merged a trust pool but never reset the caller's inherited insecure-skip-tls-verify/tls-server-name, so Go skipped certificate verification entirely on that path — any endpoint could receive the real Kubernetes bearer token. Force verification on unconditionally, in both the rest.Config and the cloned transport, since client-go may already have baked the insecure flag into a base transport before this wrapper runs. Signed-off-by: Konstantin Kozoriz <konstantin.kozoriz@flant.com>
kkozoriz
changed the title
This was referenced Aug 30, 2026
kkozoriz
marked this pull request as ready for review
August 31, 2026 18:10
kkozoriz
added a commit
that referenced
this pull request
Aug 31, 2026
…463 The team merges with "Squash and merge", which drops the #462 -> #463 -> #464 ancestry. Git then falls back to origin/main as the merge base and sees #462's changes -- already present here -- as competing additions, producing two conflicts that a plain merge chain never hits: CONFLICT (content): internal/snapshot/transport/http.go CONFLICT (add/add): pkg/libsaferequest/client/http_test.go Both were purely structural, so reshape them instead of changing behaviour: - http_test.go is created by #462 too, so an add/add conflicts unless both sides match byte for byte. Restore it to #462's exact content and move the 7 SetTLSCAData tests and their 3 helpers to a new http_tls_test.go, which exists on neither side of main and merges as a clean single-side add. - The "keep in sync" note sat at the end of a doc comment block #462 had just added, so the two additions were adjacent and conflicted. Move it just inside SetTLSCAData, a region #462 does not touch. No production code changes: pkg/libsaferequest/client/http.go is untouched and internal/snapshot/transport/http.go now matches #463 apart from the relocated comment. All 8 tests are preserved and still pass under -race. Verified from origin/main: squash #462, squash #463, merge #464, merge #465 -- all four clean, then build, vet and go test -race clean over ./internal/snapshot/... and ./pkg/libsaferequest/... Signed-off-by: Konstantin Kozoriz <konstantin.kozoriz@flant.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
d8 snapshot uploadcould only stream volume bytes to the importer pod's in-cluster service, so it needed direct network access to the cluster's internal service network. From a machine that only has the cluster's public API URL there was no way to upload a snapshot back into the cluster.Fix
--publishond8 snapshot upload: stream volume bytes through the storage-foundation-published Ingress endpoint (status.publicURL) instead of the importer's in-cluster service.--publish=falsekeeps the old path.insecure-skip-tls-verifyfrom kubeconfig cannot silently disable it (internal/snapshot/transport). The same bug in the sharedpkg/libsaferequesttwin is fixed in [snapshot] Stop the safe HTTP client from skipping TLS verification #464.Before / After
d8 snapshot upload -n restored -i ./out --publish=truestatus.ca)status.publicURL, public certificateValidation
Real run against a live test cluster: a 4-volume snapshot (2 block + 2 filesystem,
sds-replicated-thin-r3) uploaded with--publish=truefrom an external machine holding only a bearer-token kubeconfig and no route into the cluster network.DataImportobjects reachedCompletedTests
internal/snapshot/cmd/snapimport/import_test.go- flag default,Changedsemantics that autodetection relies oninternal/snapshot/transport/http_test.go- publish transport forces verification oninternal/snapshot/snapimport/volume_test.go,internal/snapshot/snapimport/fs_test.go- publish endpoint selection on the import path