Skip to content

Pick watch fix for DatastoreMigration#4627

Merged
caseydavenport merged 2 commits intotigera:release-v1.42from
caseydavenport:casey-pick-watch-fix
Apr 2, 2026
Merged

Pick watch fix for DatastoreMigration#4627
caseydavenport merged 2 commits intotigera:release-v1.42from
caseydavenport:casey-pick-watch-fix

Conversation

@caseydavenport
Copy link
Copy Markdown
Member

Description

Pick #4619

Release Note

TBD

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

  • Milestone set according to targeted release.
  • Appropriate labels:
    • kind/bug if this is a bugfix.
    • kind/enhancement if this is a a new feature.
    • enterprise if this PR applies to Calico Enterprise only.

The tests hardcoded "calico-master" and "enterprise-master" as ImageSet
names, but on the release branch the expected names use the actual
release version (e.g., calico-release-v3.32). Use components.CalicoRelease
and components.EnterpriseRelease so the names are always correct.
@caseydavenport caseydavenport merged commit abba074 into tigera:release-v1.42 Apr 2, 2026
3 checks passed
@caseydavenport caseydavenport deleted the casey-pick-watch-fix branch April 2, 2026 23:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants