chore: refactor to common zarf config and values files

defenseunicorns / uds-package-sonarqube

🏭 UDS Sonarqube Zarf Package

Apache License 2.0

3 stars 2 forks source link

chore: refactor to common zarf config and values files #44

Closed ericwyles closed 7 months ago

ericwyles commented 7 months ago

Description

Refactor zarf.yaml to move shared values to a common/zarf.yaml and create flavor specific values files at values/registry1-values.yaml and values/upstream-values.yaml

In the process of refactoring this I also updated some of the github workflows to reference uds-common shared workflows.

In addition I attempted to use upstream chart for both flavors but it doesn't work, left a note in the README.md explaining why and referenced it from the chart reference in common/zarf.yaml (tracked in #48 )

Related Issue

Fixes #43 Fixes #40 Relates to #48

Type of change

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

Checklist before merging

[x] Test, docs, adr added or updated as needed
[x] Contributor Guide Steps followed

ericwyles commented 7 months ago

@zachariahmiller if you get a minute, could use some eyes on this one. Feels like I might be missing something here. The only part I was able to refactor out to common was the 'uds-sonarqube-config' chart. The 'sonarqube' chart has very little in common between the two flavors. Am I missing something more elegant here?

zachariahmiller commented 7 months ago

@ericwyles it actually looks like the only additional thing you could move to common is namespace. I hadnt realized when i created the issue two different charts were being used. We probably need to discuss which one we will use as we shouldnt be using two different ones. Apologies for the confusion

ericwyles commented 7 months ago

Will finish testing this after registry1 is up again.

zachariahmiller commented 7 months ago

@ericwyles updated the required checks to match the new convention

ericwyles commented 7 months ago

I think this looks good. Just FYI if you are pulling in the latest setup action (0.2.2?) the publish will break as is currently --no-progress was accidentally dropped from uds run so you'll need to check the publish task

https://github.com/defenseunicorns/uds-package-sonarqube/blob/f1679f7c7dae4c6bc301c020f6c43aec3e5cefbc/tasks/publish.yaml#L21

Went ahead and removed --no-progress to save us a headache in the future.