Add vtysh.conf file to image - #3
Merged
Merged
Conversation
msherif1234
reviewed
Nov 1, 2021
Signed-off-by: Michael Cambria <mcambria@redhat.com>
Contributor
|
/lgtm |
Contributor
|
/approve |
fedepaol
added a commit
to fedepaol/frr
that referenced
this pull request
Jan 17, 2024
Basic CI setup
openshift-merge-bot Bot
pushed a commit
that referenced
this pull request
Aug 9, 2026
Four independent bugs in `charts/frr-k8s/values.schema.json` that
together leave strictly-shaped chart inputs unvalidated, reject
documented inputs, and bury a large `frrk8s` block in a schema-ignored
position. Single-file diff.
1. JSON property key typo: `"resources:"` (with trailing colon).
Pre-fix the property name under `frrk8s.frr.properties` had a stray
colon, so the `resources` map under `frrk8s.frr` was effectively
unschema'd. Rename to `"resources"`, matching the sibling shapes
`frrk8s.reloader.resources`, `frrk8s.frrMetrics.resources`,
`frrk8s.frrStatus.resources` in the same file.
2. `prometheus.serviceMonitor.interval` schema mismatch.
Pre-fix declared `anyOf: integer | null`, but the Prometheus
convention for scrape intervals is a duration string (`"30s"`,
`"1m"`, etc.) and `charts/frr-k8s/README.md:86` already documents
the field as `string`. Operators who set
`prometheus.serviceMonitor.interval: 30s` were rejected by
`helm template` with a schema error. Widen to
`anyOf: string | null`.
3. `crds` block misplaced under `prometheus`.
Pre-fix the `crds` schema lived at `properties.prometheus.crds`.
JSON Schema silently ignores unknown sibling keys, so the entire
top-level `crds` map in `values.yaml` was unvalidated —
`crds.enabled: "not_a_bool"` was accepted without complaint. Move
it to `properties.crds`; the schema now catches type errors on
`crds.enabled` and constrains `crds.validationFailurePolicy` to
the documented enum `Ignore | Fail`.
4. `frrk8s` block misplaced under `prometheus`.
Pre-fix an entire `frrk8s` definition (`tolerateMaster`,
`updateStrategy`, `runtimeClassName`, `secretName`, `frr.{image,
metricsPort, secureMetricsPort, resources}`, `command`, `reloader`,
`frrMetrics`) lived at `properties.prometheus.frrk8s` — a sibling
of `properties` inside the `prometheus` block. Same JSON-Schema
silent-ignore as #3: the chart's actual `frrk8s.*` values went
unvalidated. Merge the misplaced block into the existing top-level
`properties.frrk8s` (which previously held only `strategy`,
`command`, `webhookMode`). The `frr.required: [enabled]` rule is
dropped during the move because the chart's own `values.yaml` does
not set `frrk8s.frr.enabled` — enforcing it would reject the chart's
default render with a confusing "missing property" error, which the
pre-fix schema avoided by being in a position the validator
ignored.
Verified locally (helm v3.18 and v3.21):
Pre-fix:
- `helm template ... --set prometheus.serviceMonitor.interval=30s` →
rejected ("got string, want integer").
- `helm template ... --set crds.enabled=not_a_bool` → silently accepted.
- `helm template ... --set frrk8s.tolerateMaster=not_a_bool` → silently
accepted.
Post-fix:
- `interval=30s` → accepted.
- `crds.enabled=not_a_bool` → rejected:
`at '/crds/enabled': got string, want boolean`.
- `frrk8s.tolerateMaster=not_a_bool` → rejected:
`at '/frrk8s/tolerateMaster': got string, want boolean`.
- Default `helm template charts/frr-k8s --set crds.enabled=true` renders
cleanly (42 documents, 0 errors).
- `helm lint charts/frr-k8s --set crds.enabled=true` clean.
Signed-off-by: Aleksei Sviridkin <f@lex.la>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add vtysh.conf file to image
Signed-off-by: Michael Cambria mcambria@redhat.com