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

Implement chart/manifest merging #1975

Merged
merged 20 commits into from
Aug 29, 2023
Merged

Implement chart/manifest merging #1975

merged 20 commits into from
Aug 29, 2023

Conversation

Racer159
Copy link
Contributor

@Racer159 Racer159 commented Aug 18, 2023

Description

This implements more intelligent merging functionality based on the uniqueness of names in charts and manifests

Related Issue

Fixes #1976

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

@Racer159 Racer159 added needs-docs PR Label - Docs required to merge needs-tests PR Label - Tests required to merge labels Aug 18, 2023
@netlify
Copy link

netlify bot commented Aug 18, 2023

Deploy Preview for zarf-docs ready!

Name Link
🔨 Latest commit 86b5b78
🔍 Latest deploy log https://app.netlify.com/sites/zarf-docs/deploys/64ed2972454a110008aa1be0
😎 Deploy Preview https://deploy-preview-1975--zarf-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@Racer159 Racer159 removed the needs-docs PR Label - Docs required to merge label Aug 18, 2023
@Racer159 Racer159 removed the needs-tests PR Label - Tests required to merge label Aug 21, 2023
Copy link
Contributor

@cmwylie19 cmwylie19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't work in practice

@Racer159 Racer159 added the needs-tests PR Label - Tests required to merge label Aug 23, 2023
@Racer159 Racer159 added this to the The Bucket milestone Aug 24, 2023
@Racer159 Racer159 removed the needs-tests PR Label - Tests required to merge label Aug 24, 2023
Copy link
Contributor

@Noxsios Noxsios left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small tweaks, overall logic looked solid

examples/composable-packages/README.md Outdated Show resolved Hide resolved
src/config/lang/english.go Outdated Show resolved Hide resolved
src/config/lang/english.go Outdated Show resolved Hide resolved
src/pkg/utils/yaml.go Show resolved Hide resolved
Co-authored-by: razzle <harry@razzle.cloud>
Copy link
Contributor

@cmwylie19 cmwylie19 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Racer159 Racer159 merged commit f59b154 into main Aug 29, 2023
28 checks passed
@Racer159 Racer159 deleted the hotfix-merge-manifests branch August 29, 2023 00:13
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.

Zarf chart / manifest composability merging
3 participants