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

Fix broken diff action output #468

Merged
merged 5 commits into from
Dec 24, 2023
Merged

Fix broken diff action output #468

merged 5 commits into from
Dec 24, 2023

Conversation

allenporter
Copy link
Owner

@allenporter allenporter commented Dec 24, 2023

Fix diff broken in #459

Copy link
Contributor

--- tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Namespace: flux-system/podinfo

+++ tests/testdata/cluster/apps/prod Kustomization: flux-system/apps Namespace: flux-system/podinfo

@@ -1,9 +0,0 @@

----
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    kustomize.toolkit.fluxcd.io/name: apps
-    kustomize.toolkit.fluxcd.io/namespace: flux-system
-  name: podinfo
-

@allenporter allenporter changed the title Diff test Fix broken diff action output Dec 24, 2023
@codecov-commenter
Copy link

codecov-commenter commented Dec 24, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (7c4b165) 93.20% compared to head (d7a35e8) 93.20%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #468   +/-   ##
=======================================
  Coverage   93.20%   93.20%           
=======================================
  Files          19       19           
  Lines        1825     1825           
=======================================
  Hits         1701     1701           
  Misses        124      124           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@allenporter allenporter merged commit 37c70b7 into main Dec 24, 2023
28 checks passed
sp3nx0r referenced this pull request in sp3nx0r/homelab Dec 24, 2023
)

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [allenporter/flux-local](https://togithub.com/allenporter/flux-local)
| action | major | `3.2.0` -> `4.2.1` |

---

### Release Notes

<details>
<summary>allenporter/flux-local (allenporter/flux-local)</summary>

###
[`v4.2.1`](https://togithub.com/allenporter/flux-local/releases/tag/4.2.1)

[Compare
Source](https://togithub.com/allenporter/flux-local/compare/4.2.0...4.2.1)

#### What's Changed

Version `4.2.0` contains a bug in the diff action that caused it to
never emit a diff, which is fixed in this release.

- Update pages workflow to new versions by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/460](https://togithub.com/allenporter/flux-local/pull/460)
- fix: change running user to 1001 by
[@&#8203;onedr0p](https://togithub.com/onedr0p) in
[https://github.com/allenporter/flux-local/pull/461](https://togithub.com/allenporter/flux-local/pull/461)
- Initial design ideas for flux-local v5 by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/463](https://togithub.com/allenporter/flux-local/pull/463)
- Upgrade to pydantic v2 APIs by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/464](https://togithub.com/allenporter/flux-local/pull/464)
- Build with python 3.12 by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/465](https://togithub.com/allenporter/flux-local/pull/465)
- Fix broken diff action output by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/468](https://togithub.com/allenporter/flux-local/pull/468)

#### Developer updates

- chore(deps): update dependency coverage to v7.3.4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/469](https://togithub.com/allenporter/flux-local/pull/469)
- chore(deps): update dependency pydantic to v2.5.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/470](https://togithub.com/allenporter/flux-local/pull/470)

**Full Changelog**:
allenporter/flux-local@4.2.0...4.2.1

###
[`v4.2.0`](https://togithub.com/allenporter/flux-local/releases/tag/4.2.0)

[Compare
Source](https://togithub.com/allenporter/flux-local/compare/4.1.1...4.2.0)

#### What's Changed

- feat: add container build and workflows by
[@&#8203;onedr0p](https://togithub.com/onedr0p) in
[https://github.com/allenporter/flux-local/pull/452](https://togithub.com/allenporter/flux-local/pull/452)
- fix: update logic in container test to build on main by
[@&#8203;onedr0p](https://togithub.com/onedr0p) in
[https://github.com/allenporter/flux-local/pull/453](https://togithub.com/allenporter/flux-local/pull/453)
- fix: change CMD to ENTRYPOINT in Dockerfile by
[@&#8203;onedr0p](https://togithub.com/onedr0p) in
[https://github.com/allenporter/flux-local/pull/454](https://togithub.com/allenporter/flux-local/pull/454)
- Streamline devcontainer by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/456](https://togithub.com/allenporter/flux-local/pull/456)
- Add --output-file flag to get cluster action by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/457](https://togithub.com/allenporter/flux-local/pull/457)
- Add --output-file for build and diff and use in action by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/459](https://togithub.com/allenporter/flux-local/pull/459)

#### New Contributors

- [@&#8203;onedr0p](https://togithub.com/onedr0p) made their first
contribution in
[https://github.com/allenporter/flux-local/pull/452](https://togithub.com/allenporter/flux-local/pull/452)

**Full Changelog**:
allenporter/flux-local@4.1.1...4.2.0

###
[`v4.1.1`](https://togithub.com/allenporter/flux-local/releases/tag/4.1.1)

[Compare
Source](https://togithub.com/allenporter/flux-local/compare/4.1.0...4.1.1)

#### What's Changed

- Remove complexity from multi-cluster diff by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/447](https://togithub.com/allenporter/flux-local/pull/447)
- Improve timeout error message by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/448](https://togithub.com/allenporter/flux-local/pull/448)
- Update stale helm pydoc by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/449](https://togithub.com/allenporter/flux-local/pull/449)
- Cleanup visitor namespace related logic by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/450](https://togithub.com/allenporter/flux-local/pull/450)
- Fix bug in actions by setting cache dependency paths based on action
by [@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/451](https://togithub.com/allenporter/flux-local/pull/451)

**Full Changelog**:
allenporter/flux-local@4.1.0...4.1.1

###
[`v4.1.0`](https://togithub.com/allenporter/flux-local/releases/tag/4.1.0)

[Compare
Source](https://togithub.com/allenporter/flux-local/compare/4.0.0...4.1.0)

#### What's Changed

- Enable caching of package dependencies by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/442](https://togithub.com/allenporter/flux-local/pull/442)
- Fix formatting by running black on code by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/444](https://togithub.com/allenporter/flux-local/pull/444)
- Add container images from Kustomziations to the cluster manifest by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/443](https://togithub.com/allenporter/flux-local/pull/443)
- Add HelmRelease images to cluster manifest by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/445](https://togithub.com/allenporter/flux-local/pull/445)

#### Developer dependency updates

- Revert "Update actions/upload-pages-artifact action to v3" by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/438](https://togithub.com/allenporter/flux-local/pull/438)
- Revert "Update actions/deploy-pages action to v4" by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/439](https://togithub.com/allenporter/flux-local/pull/439)

**Full Changelog**:
allenporter/flux-local@4.0.0...4.1.0

###
[`v4.0.0`](https://togithub.com/allenporter/flux-local/releases/tag/4.0.0)

[Compare
Source](https://togithub.com/allenporter/flux-local/compare/3.2.0...4.0.0)

#### What's Changed

##### Native flux build

The primary change in this release is to move to use `flux build`
internally. This means that the `flux` CLI is now required to be present
in the environment, similar to how `kustomize` is already required. See
documentation for the [Github
Action](https://togithub.com/allenporter/flux-local?tab=readme-ov-file#github-action)
for details on how to setup the CLI environment.
[https://github.com/allenporter/flux-local/pull/392](https://togithub.com/allenporter/flux-local/pull/392)

To simplify internals, multiple clusters in the same path are no longer
supported. You can still use a multi-cluster repo if you specify
`--path` to one of the clusters. This should be a no-op for most users
of the github action since likely you already were setting a path
argument.

##### Diagnostics

You can now discover malormed or unexpected yaml files with `flux-local
diagnostics`
[https://github.com/allenporter/flux-local/pull/401](https://togithub.com/allenporter/flux-local/pull/401):

    ### flux-local diagnostics
    [DIAGNOSTICS OK]

##### Performance

With the move to `flux build`, we've been able to reduce some
unnecessary `kustomize` calls, improving internal caching, and
parallelize some of the cluster commands. Speed has been improved by 2x
even for smaller clusters with only a handful of kustomizations.
[https://github.com/allenporter/flux-local/pull/435](https://togithub.com/allenporter/flux-local/pull/435)

#### Change Log

- Add flux dependency in development environment by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/391](https://togithub.com/allenporter/flux-local/pull/391)
- Migrate tests to syrup by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/393](https://togithub.com/allenporter/flux-local/pull/393)
- Add tests that trace the full command stack of building the manifest
by [@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/394](https://togithub.com/allenporter/flux-local/pull/394)
- Increase coverage for cluster3 by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/395](https://togithub.com/allenporter/flux-local/pull/395)
- Improve test coverage for cluster3 cases by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/396](https://togithub.com/allenporter/flux-local/pull/396)
- Improve test coverage for internals of git repo manifest builders by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/397](https://togithub.com/allenporter/flux-local/pull/397)
- Remove support for multiple clusters in a single path by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/398](https://togithub.com/allenporter/flux-local/pull/398)
- Skip unnecessary kustomize cfg step when scanning the cluster by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/399](https://togithub.com/allenporter/flux-local/pull/399)
- Add a `diagnostics` command to find yaml files that kustomize does no…
by [@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/401](https://togithub.com/allenporter/flux-local/pull/401)
- Renovate Dockerfile and versions by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/422](https://togithub.com/allenporter/flux-local/pull/422)
- Use `flux build ks` when building Kustomizations by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/392](https://togithub.com/allenporter/flux-local/pull/392)
- Update documentation examples to include flux cli by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/424](https://togithub.com/allenporter/flux-local/pull/424)
- Improve error messages for shell commands by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/425](https://togithub.com/allenporter/flux-local/pull/425)
- Fix support for Kustomizations with absolute paths by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/426](https://togithub.com/allenporter/flux-local/pull/426)
- Improve logging/tracing and track performance counters by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/427](https://togithub.com/allenporter/flux-local/pull/427)
- Improve kustomization traversal performance by
[@&#8203;allenporter](https://togithub.com/allenporter) in
[https://github.com/allenporter/flux-local/pull/435](https://togithub.com/allenporter/flux-local/pull/435)

#### Developer dependency updates

- Update dependency pydantic to v2.5.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/400](https://togithub.com/allenporter/flux-local/pull/400)
- Update dependency mypy to v1.7.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/402](https://togithub.com/allenporter/flux-local/pull/402)
- Update dependency wheel to v0.42.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/404](https://togithub.com/allenporter/flux-local/pull/404)
- Update pypa/gh-action-pypi-publish action to v1.8.11 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/405](https://togithub.com/allenporter/flux-local/pull/405)
- Update ubuntu Docker tag to jammy-20231128 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/406](https://togithub.com/allenporter/flux-local/pull/406)
- Update dependency pytest-asyncio to v0.23.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/410](https://togithub.com/allenporter/flux-local/pull/410)
- Update dependency ruff to v0.1.7 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/412](https://togithub.com/allenporter/flux-local/pull/412)
- Update pre-commit hook charliermarsh/ruff-pre-commit to v0.1.7 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/413](https://togithub.com/allenporter/flux-local/pull/413)
- Update actions/setup-python action to v5 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/411](https://togithub.com/allenporter/flux-local/pull/411)
- Update actions/deploy-pages action to v3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/409](https://togithub.com/allenporter/flux-local/pull/409)
- Update actions/configure-pages action to v4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/408](https://togithub.com/allenporter/flux-local/pull/408)
- Update dependency pre-commit to v3.6.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/414](https://togithub.com/allenporter/flux-local/pull/414)
- Update dependency typing-extensions to v4.9.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/415](https://togithub.com/allenporter/flux-local/pull/415)
- Update dependency black to v23.12.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/416](https://togithub.com/allenporter/flux-local/pull/416)
- Update pre-commit hook psf/black to v23.12.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/417](https://togithub.com/allenporter/flux-local/pull/417)
- Update dependency ruff to v0.1.8 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/418](https://togithub.com/allenporter/flux-local/pull/418)
- Update pre-commit hook charliermarsh/ruff-pre-commit to v0.1.8 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/419](https://togithub.com/allenporter/flux-local/pull/419)
- Update dependency coverage to v7.3.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/420](https://togithub.com/allenporter/flux-local/pull/420)
- Update dependency pdoc to v14.2.0 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/421](https://togithub.com/allenporter/flux-local/pull/421)
- Update dependency pip to v23.3.2 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/428](https://togithub.com/allenporter/flux-local/pull/428)
- Update dependency fluxcd/flux2 to v2.2.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/429](https://togithub.com/allenporter/flux-local/pull/429)
- Update dependency helm/helm to v3.13.3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/432](https://togithub.com/allenporter/flux-local/pull/432)
- Update dependency kyverno/kyverno to v1.11.1 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/433](https://togithub.com/allenporter/flux-local/pull/433)
- Update actions/deploy-pages action to v4 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/430](https://togithub.com/allenporter/flux-local/pull/430)
- Update actions/upload-pages-artifact action to v3 by
[@&#8203;renovate](https://togithub.com/renovate) in
[https://github.com/allenporter/flux-local/pull/431](https://togithub.com/allenporter/flux-local/pull/431)
-

**Full Changelog**:
allenporter/flux-local@3.2.0...4.0.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "on saturday" (UTC), Automerge - At
any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/sp3nx0r/homelab).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xMDMuMSIsInVwZGF0ZWRJblZlciI6IjM3LjEwMy4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@allenporter allenporter deleted the diff-test branch April 21, 2024 13:31
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.

2 participants