Conversation
Signed-off-by: Kilian Ries <mail@kilian-ries.de>
discostur
force-pushed
the
bump-fluentd-version-1-19
branch
from
57371cc to
b5c5126
Compare
|
Could anybody please review / merge this? |
stevehipwell
requested review from
patrick-stephens and
stevehipwell
as code owners
|
Please can you rebase on the latest versions so we can bring in the updated CI? |
|
@patrick-stephens done |
|
The DCO is a hard requirement for merge unfortunately so can you sort that? I think sometimes if you do the update via the web UI it messes up the signing. |
discostur
force-pushed
the
bump-fluentd-version-1-19
branch
from
9a6b3a3 to
ed94515
Compare
…updates (fluent#662) Bumps the github-actions group with 3 updates in the / directory: [actions/setup-python](https://github.com/actions/setup-python), [helm/chart-testing-action](https://github.com/helm/chart-testing-action) and [helm/kind-action](https://github.com/helm/kind-action). Updates `actions/setup-python` from 6.0.0 to 6.1.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](actions/setup-python@e797f83...83679a8) Updates `helm/chart-testing-action` from 2.7.0 to 2.8.0 - [Release notes](https://github.com/helm/chart-testing-action/releases) - [Commits](helm/chart-testing-action@0d28d31...6ec842c) Updates `helm/kind-action` from 1.12.0 to 1.13.0 - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@a1b0e39...92086f6) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 6.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: helm/chart-testing-action dependency-version: 2.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: helm/kind-action dependency-version: 1.13.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Xelus22 <17491233+Xelus22@users.noreply.github.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
fluent#672) Bumps the github-actions group with 1 update: [tj-actions/changed-files](https://github.com/tj-actions/changed-files). Updates `tj-actions/changed-files` from 47.0.0 to 47.0.1 - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](tj-actions/changed-files@24d32ff...e002140) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-version: 47.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Bumps the github-actions group with 2 updates: [action-stars/helm-workflows/.github/workflows/release.yaml](https://github.com/action-stars/helm-workflows) and [action-stars/helm-workflows/.github/workflows/validate.yaml](https://github.com/action-stars/helm-workflows). Updates `action-stars/helm-workflows/.github/workflows/release.yaml` from 0.8.11 to 0.9.0 - [Release notes](https://github.com/action-stars/helm-workflows/releases) - [Changelog](https://github.com/action-stars/helm-workflows/blob/main/CHANGELOG.md) - [Commits](action-stars/helm-workflows@25591df...36888a1) Updates `action-stars/helm-workflows/.github/workflows/validate.yaml` from 0.8.11 to 0.9.0 - [Release notes](https://github.com/action-stars/helm-workflows/releases) - [Changelog](https://github.com/action-stars/helm-workflows/blob/main/CHANGELOG.md) - [Commits](action-stars/helm-workflows@25591df...36888a1) --- updated-dependencies: - dependency-name: action-stars/helm-workflows/.github/workflows/release.yaml dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: action-stars/helm-workflows/.github/workflows/validate.yaml dependency-version: 0.9.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Patrick Stephens <pat@fluent.do> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Marco Franssen <marco.franssen@gmail.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
Signed-off-by: Patrick Stephens <pat@fluent.do> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
discostur
force-pushed
the
bump-fluentd-version-1-19
branch
from
beb166a to
9937c84
Compare
discostur
requested review from
benjaminhuo,
edsiper,
joshuabaird,
marcofranssen,
wanjunlei and
wenchajun
as code owners
|
@patrick-stephens sorry, DCO is green now ;) |
|
@discostur you still need to rebase this PR. |
|
@stevehipwell thanks for the reminder - done |
|
@discostur you'll need to add a CHANGELOG.md for this chart for the automation to pass. If you copy one of the other charts, you need to add the previous release and put your changes under an |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Kilian Ries <mail@kilian-ries.de>
|
@stevehipwell done |
| @@ -1,5 +1,5 @@ | |||
| {{- define "fluentd.pod" -}} | |||
| {{- $defaultTag := printf "%s-debian-%s-1.2" (.Chart.AppVersion) (.Values.variant) -}} | |||
| {{- $defaultTag := printf "%s-debian-1" (.Chart.AppVersion) -}} | |||
There was a problem hiding this comment.
Although this looks nice for you, I remember this being specifically changed because some people had the requirement to specify the variant.
If one traces the image to the repository for the available TAGs, one can notice that there are different 'variants', as the contributer called it, that are not specifically just 'debian-1'. Link to docker.io repo inlined.
So, I cannot merge and accept the drop of this feature (which is also not updated in the .Values file accordingly) without a valid reason. One can also see that the original commit with this change does not take into account that not all images end with 1.2 (that was an oversight from the PR reviewer at the time).
Thus, this leads to (TLDR):
- Yes update the chart AppVersion
- No, remove .values.variant
- Yes, keep things the stablest with as few changes as possible
As the tags seem to follow a pattern like (untested aprox. regex to follow):
v\d+.\d+.?\d*-debian-\w+-[0-9.]+ i would say that the line here should be:
{{- $defaultTag := printf "%s-debian-%s" (.Chart.AppVersion) (.Values.variant) -}}
Where:
- Your change to version is correct
- variant should be elasticsearch7-1.0
To form: v1.19.2-debian-elasticsearch7-1.0
Please be aware that the chart overwrites the computed tag, if you provide one where appropriate:
https://github.com/fluent/helm-charts/blob/7a00492f40fd981688e5e9b1922f0e8304f310a8/charts/fluentd/values.yaml#L11C1-L14C10
6 participants
Changes
Fixes