Skip to content

Commit

Permalink
chore: update renovate config/values to match all neuvector images (#755
Browse files Browse the repository at this point in the history
)

## Description

Switches NeuVector to leverage the [match from
uds-common](https://github.com/defenseunicorns/uds-common/blob/main/config/renovate.json5#L93-L102).

Each item can be tested with the regex tester to validate:
https://regex101.com/r/d9t0lt/1

## Related Issue

Fixes some issues with
#750 PR.

## Type of change

- [x] 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](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)
followed
  • Loading branch information
mjnagel authored Sep 11, 2024
1 parent c3a2f62 commit 72a97ba
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 34 deletions.
34 changes: 0 additions & 34 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,6 @@
"helm-values": {
"ignorePaths": ["src/neuvector/values"]
},
"regexManagers": [
{
"fileMatch": ["^src/neuvector/values/.*\\.yaml$"],
"matchStrings": [
"registry:\\s+(?<registryUrl>.*?)\n(.|\\s)*repository:\\s+(?<depName>.*?)\\s+tag:\\s+[\"]?(?<currentValue>[^\"]*)[\"]?"
],
"registryUrlTemplate": "https://{{{registryUrl}}}",
"datasourceTemplate": "docker"
},
{
"fileMatch": ["^src/neuvector/values/upstream-values\\.yaml$"],
"matchStrings": [
"registry: docker.io\\s+tag:\\s+[\"]?(?<currentValue>[^\"]*)[\"]?"
],
"depNameTemplate": "docker.io/neuvector/controller",
"datasourceTemplate": "docker"
},
{
"fileMatch": ["^src/neuvector/values/unicorn-values\\.yaml$"],
"matchStrings": [
"registry: cgr.dev\\s+tag:\\s+[\"]?(?<currentValue>[^\"]*)[\"]?"
],
"depNameTemplate": "cgr.dev/du-uds-defenseunicorns/neuvector-controller-fips",
"datasourceTemplate": "docker"
},
{
"fileMatch": ["^src/neuvector/values/registry1-values\\.yaml$"],
"matchStrings": [
"registry: registry1.dso.mil\\s+tag:\\s+[\"]?(?<currentValue>[^\"]*)[\"]?"
],
"depNameTemplate": "registry1.dso.mil/ironbank/neuvector/neuvector/controller",
"datasourceTemplate": "docker"
}
],
"packageRules": [
{
"matchFileNames": ["src/authservice/**"],
Expand Down
3 changes: 3 additions & 0 deletions src/neuvector/values/registry1-values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
registry: registry1.dso.mil
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/neuvector/neuvector/controller versioning=docker
tag: "5.3.4"
manager:
image:
Expand Down Expand Up @@ -30,6 +31,7 @@ cve:
scanner:
image:
repository: ironbank/neuvector/neuvector/scanner
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/neuvector/neuvector/scanner versioning=docker
tag: "5"
containerSecurityContext:
capabilities:
Expand All @@ -41,6 +43,7 @@ cve:
enabled: true
image:
repository: ironbank/redhat/ubi/ubi9-minimal
# renovate: datasource=docker depName=registry1.dso.mil/ironbank/redhat/ubi/ubi9-minimal versioning=docker
tag: "9.4"
containerSecurityContext:
capabilities:
Expand Down
2 changes: 2 additions & 0 deletions src/neuvector/values/unicorn-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
autoGenerateCert: true

registry: cgr.dev
# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/neuvector-controller-fips versioning=docker
tag: "5.3.4"
manager:
image:
Expand Down Expand Up @@ -36,4 +37,5 @@ cve:
enabled: true
image:
repository: du-uds-defenseunicorns/neuvector-updater-fips
# renovate: datasource=docker depName=cgr.dev/du-uds-defenseunicorns/neuvector-updater-fips versioning=docker
tag: 8.9.1-dev
1 change: 1 addition & 0 deletions src/neuvector/values/upstream-values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
registry: docker.io
# renovate: datasource=docker depName=docker.io/neuvector/controller versioning=docker
tag: "5.3.4"
manager:
image:
Expand Down

0 comments on commit 72a97ba

Please sign in to comment.