fix: improve handling of config file #480

wrenix · 2023-11-20T10:06:50Z

Split of #478

Move all the configfiles for nginx, nextcloud, htaccess out of the kubernetes-resources as single file beside the helmchart and load them with helm function into the kubernetes-resources.

benefits:

config files are readible (still support of golang/sring/helm-templates)
logic of which defaultConfigs is loaded is generic (is an range over the map)

jessebot · 2023-11-21T12:57:30Z

Please detail in the description of this PR what you're doing and why to make it easier to review. Ideally, please use the PR template.

wrenix · 2023-11-22T00:31:40Z

Done

wrenix · 2023-11-27T08:09:00Z

@jessebot do you like to review?

wrenix · 2023-11-30T11:05:31Z

rebased after #393 was merged

ci lint says:

Update Complete. ⎈Happy Helming!⎈
Saving 3 charts
Downloading postgresql from repo oci://registry-1.docker.io/bitnamicharts
Downloading mariadb from repo oci://registry-1.docker.io/bitnamicharts
Downloading redis from repo oci://registry-1.docker.io/bitnamicharts
Deleting outdated charts
Pulled: registry-1.docker.io/bitnamicharts/postgresql:12.12.10
Digest: sha256:179d5c6d017298bb9ab868321bcacb1a9efe5eb8224902f89f8693c69a72e428
Pulled: registry-1.docker.io/bitnamicharts/mariadb:12.2.9
Digest: sha256:834d78c385839bac4a7ec8cd0d25adea6b9a3324ef8c7e284e59d9e33c1e96b6
Pulled: registry-1.docker.io/bitnamicharts/redis:17.13.2
Digest: sha256:b7892f0842f1758bb35c61aaccdbb2ca30a7ff234477a2b270de31db8c0920e0
Linting chart "nextcloud => (version: \"4.5.3\", path: \"charts/nextcloud\")"
Checking chart "nextcloud => (version: \"4.5.3\", path: \"charts/nextcloud\")" for a version bump...
Old chart version: 4.4.0
New chart version: 4.5.3
Chart version ok.
Validating /home/wrenix/src/github.com/nextcloud/helm/charts/nextcloud/Chart.yaml...
Validation success! 👍
Validating maintainers...

Linting chart with values file "charts/nextcloud/ci/ct-all-enabled-values.yaml"...

==> Linting charts/nextcloud

1 chart(s) linted, 0 chart(s) failed

Linting chart with values file "charts/nextcloud/ci/ct-empty-values.yaml"...

==> Linting charts/nextcloud

1 chart(s) linted, 0 chart(s) failed

Linting chart with values file "charts/nextcloud/ci/ct-specials-values.yaml"...

==> Linting charts/nextcloud

1 chart(s) linted, 0 chart(s) failed

------------------------------------------------------------------------------------------------------------------------
 ✔︎ nextcloud => (version: "4.5.3", path: "charts/nextcloud")
------------------------------------------------------------------------------------------------------------------------
All charts linted successfully

wrenix · 2023-12-08T17:26:45Z

rebased and version bump again

jessebot · 2023-12-14T17:43:16Z

It looks like there's an error after the nginx default config PR was merged.

https://github.com/nextcloud/helm/actions/runs/7144375839/job/19639651937?pr=480#step:9:219

wrenix · 2023-12-14T17:59:34Z

charts/nextcloud/ci/ct-all-enabled-values.yaml

+nginx:
+  enabled: true
+  config:
+    custom: |-


it is just my test-value here

maybe that is better

approved the new workflow run. I wish that ran automatically still :(

can you explain further the ci directory you are adding? I don't think I understand what this is doing.

ci/*-values.yaml is used by chart-testing. it try to lint / install with every of that files (I add three -values.yaml files, so an lint or install tries this three setups).

your chart-testing github action pipeline try an install in a kubernetes clusters.
So it checks, if all helm generated resources also comes up (like helm --wait).
But with my current example with an customize nginx config (nginx.config.custom).
is put correct in the configmap and to the pod, but the nginx does not reach the state running (because the nginx config is invalid with my test values).

I just use the ct lint command on developing, so i have not seen, that this chart works (and the part is correct put together).

https://github.com/helm/chart-testing/blob/main/doc/ct_lint.md

Charts may have multiple custom values files matching the glob pattern '*-values.yaml' in a directory named 'ci' in the root of the chart's directory. The chart is linted for each of these files. If no custom values file is present, the chart is linted with defaults.

i remove the ct-values for #523 - to make this PR smaller

wrenix · 2023-12-19T21:30:14Z

rebased again and set an valid nginx.config.custom in charts/nextcloud/ci/ct-specials-values.yaml.

wrenix · 2023-12-25T10:57:50Z

rebased and version dump again

wrenix · 2024-02-04T17:25:34Z

rebased (after #520) and version dump again

wrenix · 2024-02-05T07:53:44Z

huhu @provokateurin do you like to take a look here too?

wrenix · 2024-02-05T12:30:38Z

This is the last for nd importend PR from my big bunch ;)
Thanks so much till here.

provokateurin · 2024-02-05T12:34:49Z

I'll have a look soon

Signed-off-by: WrenIX <dev.github@wrenix.eu>

wrenix · 2024-03-31T21:29:14Z

I do not know, why it / i close this

wrenix · 2024-04-19T10:20:08Z

Any update?

I found a not good default value for nginx, which i like to improve (and then i good a merge conflict)

wrenix force-pushed the fix/file-config branch from ff0c6bc to e5c7e61 Compare November 20, 2023 10:17

This was referenced Nov 20, 2023

fix: cleanup and linting of metric resources #481

Closed

fix: another cleanup and linting (contains move to configfiles) #478

Closed

wrenix mentioned this pull request Nov 27, 2023

fix: another cleanup and linting #484

Closed

3 tasks

wrenix force-pushed the fix/file-config branch from 1db6808 to c74a666 Compare November 30, 2023 11:00

wrenix force-pushed the fix/file-config branch 5 times, most recently from 09f5f70 to d03fc12 Compare December 2, 2023 10:40

wrenix force-pushed the fix/file-config branch from d03fc12 to c966cc9 Compare December 8, 2023 17:26

jessebot requested a review from provokateurin December 14, 2023 17:40

wrenix commented Dec 14, 2023

View reviewed changes

wrenix force-pushed the fix/file-config branch 3 times, most recently from 9181f14 to 5660b62 Compare December 19, 2023 21:28

wrenix force-pushed the fix/file-config branch from 5660b62 to a6ca7bd Compare December 25, 2023 10:57

wrenix mentioned this pull request Feb 4, 2024

fix(ci): improve lint and testing - WIP #523

Draft

6 tasks

wrenix force-pushed the fix/file-config branch 2 times, most recently from 9361dc8 to 96ae2ab Compare February 4, 2024 17:23

wrenix force-pushed the fix/file-config branch from 96ae2ab to 36f875d Compare February 4, 2024 17:25

wrenix force-pushed the fix/file-config branch 2 times, most recently from 48a7885 to 5a7cb38 Compare February 5, 2024 07:44

wrenix force-pushed the fix/file-config branch 3 times, most recently from c592d5a to 2714d88 Compare February 5, 2024 11:39

wrenix mentioned this pull request Feb 5, 2024

fix: another cleanup and linting #529

Merged

3 tasks

wrenix force-pushed the fix/file-config branch from 2714d88 to 19b40b7 Compare February 5, 2024 12:16

wrenix force-pushed the fix/file-config branch from 19b40b7 to ee33112 Compare February 29, 2024 21:28

wrenix closed this Feb 29, 2024

wrenix force-pushed the fix/file-config branch from ee33112 to 9851531 Compare February 29, 2024 21:30

fix: move configs to files

57ed963

Signed-off-by: WrenIX <dev.github@wrenix.eu>

wrenix reopened this Mar 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: improve handling of config file #480

fix: improve handling of config file #480

wrenix commented Nov 20, 2023 •

edited

jessebot commented Nov 21, 2023 •

edited

wrenix commented Nov 22, 2023

wrenix commented Nov 27, 2023

wrenix commented Nov 30, 2023 •

edited

wrenix commented Dec 8, 2023

jessebot commented Dec 14, 2023

wrenix Dec 14, 2023

wrenix Dec 14, 2023

jessebot Dec 15, 2023

jessebot Dec 15, 2023

wrenix Dec 19, 2023 •

edited

wrenix Feb 4, 2024

wrenix commented Dec 19, 2023

wrenix commented Dec 25, 2023

wrenix commented Feb 4, 2024

wrenix commented Feb 5, 2024

wrenix commented Feb 5, 2024 •

edited

provokateurin commented Feb 5, 2024

wrenix commented Mar 31, 2024

wrenix commented Apr 19, 2024

fix: improve handling of config file #480

Are you sure you want to change the base?

fix: improve handling of config file #480

Conversation

wrenix commented Nov 20, 2023 • edited

jessebot commented Nov 21, 2023 • edited

wrenix commented Nov 22, 2023

wrenix commented Nov 27, 2023

wrenix commented Nov 30, 2023 • edited

wrenix commented Dec 8, 2023

jessebot commented Dec 14, 2023

wrenix Dec 14, 2023

Choose a reason for hiding this comment

wrenix Dec 14, 2023

Choose a reason for hiding this comment

jessebot Dec 15, 2023

Choose a reason for hiding this comment

jessebot Dec 15, 2023

Choose a reason for hiding this comment

wrenix Dec 19, 2023 • edited

Choose a reason for hiding this comment

wrenix Feb 4, 2024

Choose a reason for hiding this comment

wrenix commented Dec 19, 2023

wrenix commented Dec 25, 2023

wrenix commented Feb 4, 2024

wrenix commented Feb 5, 2024

wrenix commented Feb 5, 2024 • edited

provokateurin commented Feb 5, 2024

wrenix commented Mar 31, 2024

wrenix commented Apr 19, 2024

wrenix commented Nov 20, 2023 •

edited

jessebot commented Nov 21, 2023 •

edited

wrenix commented Nov 30, 2023 •

edited

wrenix Dec 19, 2023 •

edited

wrenix commented Feb 5, 2024 •

edited