Skip to content

chore: backport kubefleet/main to Azure/fleet#1332

Open
britaniar wants to merge 10 commits into
Azure:mainfrom
britaniar:britaniar-microsoft-backport-kubefleet-to-fleet
Open

chore: backport kubefleet/main to Azure/fleet#1332
britaniar wants to merge 10 commits into
Azure:mainfrom
britaniar:britaniar-microsoft-backport-kubefleet-to-fleet

Conversation

@britaniar

Copy link
Copy Markdown
Contributor

Description of your changes

Backports latest changes from kubefleet-dev/kubefleet main into Azure/fleet.

Approach:

  • Merged cncf/main into fleet, accepting all incoming changes
  • Replaced all github.com/kubefleet-dev/kubefleet references with go.goms.io/fleet
  • Reverted Dockerfile base images back to Azure Linux (fleet uses mcr.microsoft.com/azurelinux/distroless/base:3.0)
  • Removed new CRD symlinks not applicable to fleet chart structure
  • Removed crd-verify Makefile target (not applicable to fleet)
  • Ran go mod tidy and make reviewable

New commits from kubefleet:

42a1df03 fix: bump golang.org/x/net and golang.org/x/text for CVE-2026-46600 and CVE-2026-56852 (#758)
c458e951 feat: publish a standalone CRD tarball as a release asset (#743)
b170abb3 chore: bump distroless/base from ab7554b to b78832f in /docker (#753)
d83bc16c ci: add actionlint + shellcheck workflow linting (#747)
d0836c64 chore: bump actions/checkout from 6 to 7 (#748)

I have:

  • Run make reviewable to ensure this PR is ready for review.

How has this code been tested

make reviewable passes (fmt, vet, lint, staticcheck, tidy).

Special notes for your reviewer

  • Dockerfile base images were intentionally kept as Azure Linux rather than adopting kubefleet distroless/base switch.
  • New CRD symlinks from kubefleet were removed since fleet uses a different chart CRD structure.
  • The crd-verify Makefile target was removed as it requires charts/member-agent/templates/crds/ which does not exist in fleet.

dependabot Bot and others added 10 commits July 14, 2026 12:43
Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Commits](actions/checkout@v6...v7)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Muhammad Haseeb <171536921+haseebnizami@users.noreply.github.com>
…zure#753)

Bumps distroless/base from `ab7554b` to `b78832f`.

---
updated-dependencies:
- dependency-name: distroless/base
  dependency-version: nonroot
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add a crd-package Make target that bundles the CRDs the charts install
into kubefleet-crds-<tag>.tgz, split into crds/hub and crds/member, with a
portable SHA-256 checksum. A new publish-crds job in release.yml builds the
bundle and attaches it to the GitHub release for the tag, creating the
release as a draft first and publishing it only after the upload succeeds.

Also add a crd-lint target, wired into make reviewable and the helm-lint CI
job, that fails if config/crd/bases and the chart CRD directories drift, so a
newly added CRD cannot be silently dropped from the bundle.

Refs Azure#693

Signed-off-by: Yetkin Timocin <ytimocin@microsoft.com>
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
CVE-2026-56852 (Azure#758)

fix: bump x/net to v0.56.0 and x/text to v0.39.0 for CVE fixes

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Merge cncf/main into fleet, replace github.com/kubefleet-dev/kubefleet
imports with go.goms.io/fleet, remove new CRD symlinks, and remove
crd-verify target that doesn't apply to fleet's chart structure.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
- Add 1ES pool labels to actionlint.yaml config
- Fix publish-image.yml: replace invalid 'create' event tags filter with
  push tags trigger
- Update ubuntu-20.04 to ubuntu-latest in publish-image.yml

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
- Remove crd-verify step from code-lint.yml (fleet uses different chart structure)
- Remove publish-crds job from release.yml (depends on removed crd-package target)
- Remove crd-package Makefile target (references non-existent member-agent CRDs dir)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants