diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 11527b4190b..c281602a5ae 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,10 +1,11 @@ # Default code owners * @ornias1993 -* app/renovate-approve-2 -* app/renovate-approve-1 -* app/renovate-approve -/charts/stable/ @ornias1993 @stavros-k -/charts/incubator/ @ornias1993 +* @truecharts-bot +/charts/stable/ @stavros-k +/charts/incubator/ @stavros-k +/charts/SCALE/ @ornias1993 +/charts/core/ @ornias1993 +/charts/dependency/ @ornias1993 +/charts/enterprise/ @ornias1993 +/charts/dev/ @ornias1993 /docs/ @ornias1993 @stavros-k -/promo/ @ornias1993 @stavros-k -/containers/ @ornias1993 diff --git a/.github/ct-install.yaml b/.github/ct-install.yaml index 25a51c57b51..7456a9e0e33 100644 --- a/.github/ct-install.yaml +++ b/.github/ct-install.yaml @@ -10,6 +10,7 @@ chart-dirs: - charts/dev - charts/games - charts/enterprise +- charts/SCALE excluded-charts: - charts/incubator/sdtd - charts/stable/alertmanager-bot diff --git a/.github/ct-lint.yaml b/.github/ct-lint.yaml index f037618de97..c5363e58cb4 100644 --- a/.github/ct-lint.yaml +++ b/.github/ct-lint.yaml @@ -10,6 +10,7 @@ chart-dirs: - charts/dev - charts/games - charts/enterprise +- charts/SCALE excluded-charts: [] chart-repos: - truecharts-old=https://truecharts.org diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 50ec0b80143..08bf68426e3 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -66,7 +66,7 @@ "bumpVersion": "major", "labels": ["update/helm/general/major"], "groupName": ["helm general major"], - "paths": ["charts/incubator/", "charts/games/", "charts/dev/", "charts/enterprise/", "charts/stable/", "charts/core/", "templates/app/"], + "paths": ["charts/incubator/", "charts/SCALE/", "charts/games/", "charts/dev/", "charts/enterprise/", "charts/stable/", "charts/core/", "templates/app/"], "schedule": [ "before 10pm on tuesday" ], @@ -81,7 +81,7 @@ "bumpVersion": "patch", "labels": ["update/helm/general/non-major"], "groupName": "helm general non-major", - "paths": ["charts/incubator/", "charts/games/", "charts/dev/", "charts/enterprise/", "charts/stable/", "charts/core/", "templates/app/"], + "paths": ["charts/incubator/", "charts/SCALE/", "charts/games/", "charts/dev/", "charts/enterprise/", "charts/stable/", "charts/core/", "templates/app/"], "schedule": [ "before 10pm on tuesday" ], @@ -137,7 +137,7 @@ "updateTypes": ["major"], "bumpVersion": "minor", "labels": ["update/docker/general/major"], - "paths": ["charts/dependency/", "charts/games/", "charts/incubator/", "charts/dev/", "charts/library/", "charts/stable/", "charts/core/", "templates/app/"], + "paths": ["charts/dependency/", "charts/SCALE/", "charts/games/", "charts/incubator/", "charts/dev/", "charts/library/", "charts/stable/", "charts/core/", "templates/app/"], "schedule": [ "before 8am" ], @@ -154,7 +154,7 @@ "bumpVersion": "patch", "labels": ["update/docker/general/non-major"], "groupName": ["docker general non-major"], - "paths": ["charts/dependency/", "charts/games/", "charts/incubator/", "charts/dev/", "charts/library/", "charts/stable/", "charts/core/", "templates/app/"], + "paths": ["charts/dependency/", "charts/SCALE/", "charts/games/", "charts/incubator/", "charts/dev/", "charts/library/", "charts/stable/", "charts/core/", "templates/app/"], "schedule": [ "before 8am" ], diff --git a/.github/scripts/build-catalog.sh b/.github/scripts/build-catalog.sh index bb347f7f446..d63fc9e6534 100755 --- a/.github/scripts/build-catalog.sh +++ b/.github/scripts/build-catalog.sh @@ -201,6 +201,7 @@ patch_apps() { touch ${target}/values.yaml # mv ${target}/SCALE/ix_values.yaml ${target}/ 2>/dev/null || : cp -rf ${target}/SCALE/templates/* ${target}/templates 2>/dev/null || : + cp -rf ${target}/SCALE/migrations/* ${target}/migrations 2>/dev/null || : rm -rf ${target}/SCALE 2>/dev/null || : touch ${target}/values.yaml # Generate item.yaml diff --git a/.github/workflows/charts-changelog.yaml b/.github/workflows/charts-changelog.yaml index d7e615a9347..d50e349f152 100644 --- a/.github/workflows/charts-changelog.yaml +++ b/.github/workflows/charts-changelog.yaml @@ -50,7 +50,7 @@ jobs: - name: Install Kubernetes tools if: inputs.isRenovatePR == 'true' - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | yq diff --git a/.github/workflows/charts-lint.yaml b/.github/workflows/charts-lint.yaml index 3689ec0426e..70ba818963d 100644 --- a/.github/workflows/charts-lint.yaml +++ b/.github/workflows/charts-lint.yaml @@ -58,23 +58,24 @@ jobs: - name: Collect changes id: list-changed if: inputs.chartChangesDetected == 'true' + shell: bash run: | EXCLUDED=$(yq eval -o=json '.excluded-charts // []' .github/ct-lint.yaml) CHARTS=$(ct list-changed --config .github/ct-lint.yaml) CHARTS_JSON=$(echo "${CHARTS}" | jq -R -s -c 'split("\n")[:-1]') OUTPUT_JSON=$(echo "{\"excluded\": ${EXCLUDED}, \"all\": ${CHARTS_JSON}}" | jq -c '.all-.excluded') - OUTPUT_JSON1=$(echo $OUTPUT_JSON | jq -r -c '.[:250]') - OUTPUT_JSON2=$(echo $OUTPUT_JSON | jq -r -c '.[251:500]') - OUTPUT_JSON3=$(echo $OUTPUT_JSON | jq -r -c '.[501:750]') - OUTPUT_JSON4=$(echo $OUTPUT_JSON | jq -r -c '.[751:1000]') - OUTPUT_JSON5=$(echo $OUTPUT_JSON | jq -r -c '.[1001:1250]') - OUTPUT_JSON6=$(echo $OUTPUT_JSON | jq -r -c '.[1251:1500]') + OUTPUT_JSON1=$((echo $OUTPUT_JSON | jq -r -c '.[:50]'; echo $OUTPUT_JSON | jq -r -c '.[301:350]'; echo $OUTPUT_JSON | jq -r -c '.[601:650]'; echo $OUTPUT_JSON | jq -r -c '.[901:950]'; echo $OUTPUT_JSON | jq -r -c '.[1201:1250]') | jq -s add) + OUTPUT_JSON2=$((echo $OUTPUT_JSON | jq -r -c '.[51:100]'; echo $OUTPUT_JSON | jq -r -c '.[351:400]'; echo $OUTPUT_JSON | jq -r -c '.[651:700]'; echo $OUTPUT_JSON | jq -r -c '.[951:1000]'; echo $OUTPUT_JSON | jq -r -c '.[1251:1300]') | jq -s add) + OUTPUT_JSON3=$((echo $OUTPUT_JSON | jq -r -c '.[101:150]'; echo $OUTPUT_JSON | jq -r -c '.[401:450]'; echo $OUTPUT_JSON | jq -r -c '.[701:750]'; echo $OUTPUT_JSON | jq -r -c '.[1001:1050]'; echo $OUTPUT_JSON | jq -r -c '.[1301:1350]') | jq -s add) + OUTPUT_JSON4=$((echo $OUTPUT_JSON | jq -r -c '.[151:200]'; echo $OUTPUT_JSON | jq -r -c '.[451:500]'; echo $OUTPUT_JSON | jq -r -c '.[751:800]'; echo $OUTPUT_JSON | jq -r -c '.[1051:1100]'; echo $OUTPUT_JSON | jq -r -c '.[1351:1400]') | jq -s add) + OUTPUT_JSON5=$((echo $OUTPUT_JSON | jq -r -c '.[201:250]'; echo $OUTPUT_JSON | jq -r -c '.[501:550]'; echo $OUTPUT_JSON | jq -r -c '.[801:850]'; echo $OUTPUT_JSON | jq -r -c '.[1101:1150]'; echo $OUTPUT_JSON | jq -r -c '.[1401:1450]') | jq -s add) + OUTPUT_JSON6=$((echo $OUTPUT_JSON | jq -r -c '.[251:300]'; echo $OUTPUT_JSON | jq -r -c '.[551:600]'; echo $OUTPUT_JSON | jq -r -c '.[851:900]'; echo $OUTPUT_JSON | jq -r -c '.[1151:1200]'; echo $OUTPUT_JSON | jq -r -c '.[1451:1500]') | jq -s add) echo ::set-output name=charts1::${OUTPUT_JSON1} echo ::set-output name=charts2::${OUTPUT_JSON2} - echo ::set-output name=charts2::${OUTPUT_JSON3} - echo ::set-output name=charts2::${OUTPUT_JSON4} - echo ::set-output name=charts2::${OUTPUT_JSON5} - echo ::set-output name=charts2::${OUTPUT_JSON6} + echo ::set-output name=charts3::${OUTPUT_JSON3} + echo ::set-output name=charts4::${OUTPUT_JSON4} + echo ::set-output name=charts5::${OUTPUT_JSON5} + echo ::set-output name=charts6::${OUTPUT_JSON6} if [[ $(echo ${OUTPUT_JSON1} | jq -c '. | length') -gt 0 ]]; then echo "::set-output name=detected1::true" fi @@ -112,7 +113,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: lint Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -146,7 +147,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: lint Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -180,7 +181,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: lint Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -214,7 +215,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: lint Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -248,7 +249,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: lint Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -282,7 +283,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: lint Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -305,11 +306,15 @@ jobs: - generate-lint-matrix - lint-charts1 - lint-charts2 + - lint-charts3 + - lint-charts4 + - lint-charts5 + - lint-charts6 if: | always() name: Lint successful runs-on: ubuntu-latest steps: - name: Check lint matrix status - if: ${{ ( (needs.generate-lint-matrix.outputs.detected1 == 'true') && (needs.lint-charts1.result != 'success') ) && ( (needs.generate-lint-matrix.outputs.detected2 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts2.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected3 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts3.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected4 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts4.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected5 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts5.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected6 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts6.result != 'skipped' ) ) ) }} + if: ${{ ( (needs.generate-lint-matrix.outputs.detected1 == 'true') && (needs.lint-charts1.result != 'success') ) && ( (needs.generate-lint-matrix.outputs.detected2 == 'true') && ( (needs.lint-charts2.result != 'success') || ( needs.lint-charts2.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected3 == 'true') && ( (needs.lint-charts3.result != 'success') || ( needs.lint-charts3.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected4 == 'true') && ( (needs.lint-charts4.result != 'success') || ( needs.lint-charts4.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected5 == 'true') && ( (needs.lint-charts5.result != 'success') || ( needs.lint-charts5.result != 'skipped' ) ) ) && ( (needs.generate-lint-matrix.outputs.detected6 == 'true') && ( (needs.lint-charts6.result != 'success') || ( needs.lint-charts6.result != 'skipped' ) ) ) }} run: exit 1 diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml index 6c2c89ff72d..90b89a27cbf 100644 --- a/.github/workflows/charts-release.yaml +++ b/.github/workflows/charts-release.yaml @@ -18,7 +18,7 @@ jobs: concurrency: gitpush steps: - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 diff --git a/.github/workflows/charts-test.yaml b/.github/workflows/charts-test.yaml index a379185fb01..ca57d10bd5d 100644 --- a/.github/workflows/charts-test.yaml +++ b/.github/workflows/charts-test.yaml @@ -22,7 +22,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -97,18 +97,18 @@ jobs: CHARTS=$(ct list-changed --config .github/ct-install.yaml) CHARTS_JSON=$(echo "${CHARTS}" | jq -R -s -c 'split("\n")[:-1]') OUTPUT_JSON=$(echo "{\"excluded\": ${EXCLUDED}, \"all\": ${CHARTS_JSON}}" | jq -c '.all-.excluded') - OUTPUT_JSON1=$(echo $OUTPUT_JSON | jq -r -c '.[:250]') - OUTPUT_JSON2=$(echo $OUTPUT_JSON | jq -r -c '.[251:500]') - OUTPUT_JSON3=$(echo $OUTPUT_JSON | jq -r -c '.[501:750]') - OUTPUT_JSON4=$(echo $OUTPUT_JSON | jq -r -c '.[751:1000]') - OUTPUT_JSON5=$(echo $OUTPUT_JSON | jq -r -c '.[1001:1250]') - OUTPUT_JSON6=$(echo $OUTPUT_JSON | jq -r -c '.[1251:1500]') + OUTPUT_JSON1=$((echo $OUTPUT_JSON | jq -r -c '.[:50]'; echo $OUTPUT_JSON | jq -r -c '.[301:350]'; echo $OUTPUT_JSON | jq -r -c '.[601:650]'; echo $OUTPUT_JSON | jq -r -c '.[901:950]'; echo $OUTPUT_JSON | jq -r -c '.[1201:1250]') | jq -s add) + OUTPUT_JSON2=$((echo $OUTPUT_JSON | jq -r -c '.[51:100]'; echo $OUTPUT_JSON | jq -r -c '.[351:400]'; echo $OUTPUT_JSON | jq -r -c '.[651:700]'; echo $OUTPUT_JSON | jq -r -c '.[951:1000]'; echo $OUTPUT_JSON | jq -r -c '.[1251:1300]') | jq -s add) + OUTPUT_JSON3=$((echo $OUTPUT_JSON | jq -r -c '.[101:150]'; echo $OUTPUT_JSON | jq -r -c '.[401:450]'; echo $OUTPUT_JSON | jq -r -c '.[701:750]'; echo $OUTPUT_JSON | jq -r -c '.[1001:1050]'; echo $OUTPUT_JSON | jq -r -c '.[1301:1350]') | jq -s add) + OUTPUT_JSON4=$((echo $OUTPUT_JSON | jq -r -c '.[151:200]'; echo $OUTPUT_JSON | jq -r -c '.[451:500]'; echo $OUTPUT_JSON | jq -r -c '.[751:800]'; echo $OUTPUT_JSON | jq -r -c '.[1051:1100]'; echo $OUTPUT_JSON | jq -r -c '.[1351:1400]') | jq -s add) + OUTPUT_JSON5=$((echo $OUTPUT_JSON | jq -r -c '.[201:250]'; echo $OUTPUT_JSON | jq -r -c '.[501:550]'; echo $OUTPUT_JSON | jq -r -c '.[801:850]'; echo $OUTPUT_JSON | jq -r -c '.[1101:1150]'; echo $OUTPUT_JSON | jq -r -c '.[1401:1450]') | jq -s add) + OUTPUT_JSON6=$((echo $OUTPUT_JSON | jq -r -c '.[251:300]'; echo $OUTPUT_JSON | jq -r -c '.[551:600]'; echo $OUTPUT_JSON | jq -r -c '.[851:900]'; echo $OUTPUT_JSON | jq -r -c '.[1151:1200]'; echo $OUTPUT_JSON | jq -r -c '.[1451:1500]') | jq -s add) echo ::set-output name=charts1::${OUTPUT_JSON1} echo ::set-output name=charts2::${OUTPUT_JSON2} - echo ::set-output name=charts2::${OUTPUT_JSON3} - echo ::set-output name=charts2::${OUTPUT_JSON4} - echo ::set-output name=charts2::${OUTPUT_JSON5} - echo ::set-output name=charts2::${OUTPUT_JSON6} + echo ::set-output name=charts3::${OUTPUT_JSON3} + echo ::set-output name=charts4::${OUTPUT_JSON4} + echo ::set-output name=charts5::${OUTPUT_JSON5} + echo ::set-output name=charts6::${OUTPUT_JSON6} if [[ $(echo ${OUTPUT_JSON1} | jq -c '. | length') -gt 0 ]]; then echo "::set-output name=detected1::true" fi @@ -146,7 +146,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -193,7 +193,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -241,7 +241,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -288,7 +288,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -335,7 +335,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -382,7 +382,7 @@ jobs: ref: ${{ inputs.checkoutCommit }} - name: Install Kubernetes tools - uses: yokawasa/action-setup-kube-tools@c81bf94cddd6c3172e6f61aa7f5ad66a2b5db98d # tag=v0.8.0 + uses: yokawasa/action-setup-kube-tools@ce0b2d7df14d57e25dc8959d693692c9aff5d3c6 # tag=v0.8.1 with: setup-tools: | helmv3 @@ -417,11 +417,15 @@ jobs: - generate-install-matrix - install-charts1 - install-charts2 + - install-charts3 + - install-charts4 + - install-charts5 + - install-charts6 if: | always() name: Install successful runs-on: ubuntu-latest steps: - name: Check install matrix status - if: ${{ ( (needs.generate-install-matrix.outputs.detected1 == 'true') && (needs.install-charts1.result != 'success') ) && ( (needs.generate-install-matrix.outputs.detected2 == 'true') && ( (needs.install-charts2.result != 'success') || ( needs.install-charts2.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected3 == 'true') && ( (needs.install-charts2.result != 'success') || ( needs.install-charts3.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected4 == 'true') && ( (needs.install-charts2.result != 'success') || ( needs.install-charts4.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected5 == 'true') && ( (needs.install-charts2.result != 'success') || ( needs.install-charts5.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected6 == 'true') && ( (needs.install-charts2.result != 'success') || ( needs.install-charts6.result != 'skipped' ) ) ) }} + if: ${{ ( (needs.generate-install-matrix.outputs.detected1 == 'true') && (needs.install-charts1.result != 'success') ) && ( (needs.generate-install-matrix.outputs.detected2 == 'true') && ( (needs.install-charts2.result != 'success') || ( needs.install-charts2.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected3 == 'true') && ( (needs.install-charts3.result != 'success') || ( needs.install-charts3.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected4 == 'true') && ( (needs.install-charts4.result != 'success') || ( needs.install-charts4.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected5 == 'true') && ( (needs.install-charts5.result != 'success') || ( needs.install-charts5.result != 'skipped' ) ) ) && ( (needs.generate-install-matrix.outputs.detected6 == 'true') && ( (needs.install-charts6.result != 'success') || ( needs.install-charts6.result != 'skipped' ) ) ) }} run: exit 1 diff --git a/.github/workflows/renovate-bump.yaml b/.github/workflows/renovate-bump.yaml index 2b73b892bfb..36e97c74b25 100644 --- a/.github/workflows/renovate-bump.yaml +++ b/.github/workflows/renovate-bump.yaml @@ -31,6 +31,7 @@ jobs: changed: - 'charts/stable/**' - 'charts/incubator/**' + - 'charts/SCALE/**' - 'charts/library/**' - 'charts/dependency/**' - 'charts/core/**' @@ -51,6 +52,8 @@ jobs: train="stable" elif test -f "./charts/incubator/${chart}/Chart.yaml"; then train="incubator" + elif test -f "./charts/SCALE/${chart}/Chart.yaml"; then + train="SCALE" elif test -f "./charts/library/${chart}/Chart.yaml"; then train="library" elif test -f "./charts/dependency/${chart}/Chart.yaml"; then diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 9f0c0c7c870..114c9d4c351 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -12,7 +12,7 @@ jobs: with: token: ${{ secrets.BOT_TOKEN }} - name: Self-hosted Renovate - uses: renovatebot/github-action@7a95044dacd006a39e01ce53048fbfdb04c40c5c # tag=v32.71.1 + uses: renovatebot/github-action@89415f25942956ffca7963700f5d895ee70384be # tag=v32.74.3 with: configurationFile: .github/renovate-config.js token: ${{ secrets.BOT_TOKEN }} diff --git a/charts/core/amd-gpu-plugin/CHANGELOG.md b/charts/core/amd-gpu-plugin/CHANGELOG.md deleted file mode 100644 index 61a4a9b494e..00000000000 --- a/charts/core/amd-gpu-plugin/CHANGELOG.md +++ /dev/null @@ -1,18 +0,0 @@ -# Changelog
- - - -### [amd-gpu-plugin-0.0.3](https://github.com/truecharts/apps/compare/amd-gpu-plugin-0.0.2...amd-gpu-plugin-0.0.3) (2022-03-26) - -#### Chore - -* bump all apps to trigger ci - - - - -### [amd-gpu-plugin-0.0.2](https://github.com/truecharts/apps/compare/amd-gpu-plugin-0.0.1...amd-gpu-plugin-0.0.2) (2022-01-14) - -#### Fix - -* rerelease to catalog diff --git a/charts/core/amd-gpu-plugin/Chart.yaml b/charts/core/amd-gpu-plugin/Chart.yaml deleted file mode 100644 index b0d053def44..00000000000 --- a/charts/core/amd-gpu-plugin/Chart.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v2 -appVersion: "upstream" -deprecated: false -description: A kubernetes plugin to add AMD GPU's to Pods -home: https://github.com/truecharts/apps/tree/master/charts/core/amd-gpu-plugin -icon: https://truecharts.org/_static/img/appicons/amd-gpu-plugin.png -keywords: -- amd -- gpu -- plugin -dependencies: -- name: amd-gpu - repository: https://radeonopencompute.github.io/k8s-device-plugin/ - version: 0.2.0 -kubeVersion: '>=1.16.0-0' -maintainers: -- email: info@truecharts.org - name: TrueCharts - url: https://truecharts.org -name: amd-gpu-plugin -sources: - - https://github.com/metallb/metallb - - https://metallb.universe.tf -type: application -version: 0.0.3 -annotations: - truecharts.org/catagories: | - - core - truecharts.org/SCALE-support: "true" - truecharts.org/grade: U diff --git a/charts/core/amd-gpu-plugin/README.md b/charts/core/amd-gpu-plugin/README.md deleted file mode 100644 index 1ca955fd0b5..00000000000 --- a/charts/core/amd-gpu-plugin/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# Introduction - -A kubernetes plugin to add AMD GPU's to Pods - -TrueCharts are designed to be installed as TrueNAS SCALE app only. We can not guarantee this charts works as a stand-alone helm installation. -**This chart is not maintained by the upstream project and any issues with the chart should be raised [here](https://github.com/truecharts/apps/issues/new/choose)** - -## Source Code - -* -* - -## Requirements - -Kubernetes: `>=1.16.0-0` - -## Dependencies - -| Repository | Name | Version | -|------------|------|---------| -| https://radeonopencompute.github.io/k8s-device-plugin/ | amd-gpu | 0.2.0 | - -## Installing the Chart - -To install this App on TrueNAS SCALE check our [Quick-Start Guide](https://truecharts.org/manual/Quick-Start%20Guides/02-Installing-an-App/). - -## Upgrading, Rolling Back and Uninstalling the Chart - -To upgrade, rollback or delete this App from TrueNAS SCALE check our [Quick-Start Guide](https://truecharts.org/manual/Quick-Start%20Guides/04-Upgrade-rollback-delete-an-App/). - -## Support - -- Please check our [quick-start guides](https://truecharts.org/manual/Quick-Start%20Guides/01-Adding-TrueCharts/) first. -- See the [Wiki](https://truecharts.org) -- Check our [Discord](https://discord.gg/tVsPTHWTtr) -- Open a [issue](https://github.com/truecharts/apps/issues/new/choose) ---- -All Rights Reserved - The TrueCharts Project diff --git a/charts/core/amd-gpu-plugin/helm-values.md b/charts/core/amd-gpu-plugin/helm-values.md deleted file mode 100644 index 0025d48dc9e..00000000000 --- a/charts/core/amd-gpu-plugin/helm-values.md +++ /dev/null @@ -1,18 +0,0 @@ -# Default Helm-Values - -TrueCharts is primarily build to supply TrueNAS SCALE Apps. -However, we also supply all Apps as standard Helm-Charts. In this document we aim to document the default values in our values.yaml file. - -Most of our Apps also consume our "common" Helm Chart. -If this is the case, this means that all values.yaml values are set to the common chart values.yaml by default. This values.yaml file will only contain values that deviate from the common chart. -You will, however, be able to use all values referenced in the common chart here, besides the values listed in this document. - -## Values - -| Key | Type | Default | Description | -|-----|------|---------|-------------| -| image.pullPolicy | string | `"IfNotPresent"` | | -| image.repository | string | `"placeholder"` | | -| image.tag | string | `"upstream"` | | - -All Rights Reserved - The TrueCharts Project diff --git a/charts/core/amd-gpu-plugin/questions.yaml b/charts/core/amd-gpu-plugin/questions.yaml deleted file mode 100644 index 71c17ca5da8..00000000000 --- a/charts/core/amd-gpu-plugin/questions.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Include{groups} -questions: -# Include{global} - - - variable: amd-gpu - group: "App Configuration" - label: "" - schema: - additional_attrs: true - type: dict - attrs: - - variable: nfd - label: "nfd" - schema: - additional_attrs: true - type: dict - attrs: - - variable: enabled - label: "enabled" - schema: - type: boolean - default: false - - variable: labeller - label: "labeller" - schema: - additional_attrs: true - type: dict - attrs: - - variable: enabled - label: "enabled" - schema: - type: boolean - default: false diff --git a/charts/core/amd-gpu-plugin/security.md b/charts/core/amd-gpu-plugin/security.md deleted file mode 100644 index d5841107161..00000000000 --- a/charts/core/amd-gpu-plugin/security.md +++ /dev/null @@ -1,80 +0,0 @@ ---- -hide: - - toc ---- - -# Security Overview - - - -## Helm-Chart - -##### Scan Results - -#### Chart Object: amd-gpu-plugin/charts/amd-gpu/templates/deviceplugin-daemonset.yaml - - - -| Type | Misconfiguration ID | Check | Severity | Explaination | Links | -|:----------------|:------------------:|:-----------:|:------------------:|-----------------------------------------|-----------------------------------------| -| Kubernetes Security Check | KSV011 | CPU not limited | LOW |
Expand... Enforcing CPU limits prevents DoS via resource exhaustion.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'resources.limits.cpu'
|
Expand...https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits
https://avd.aquasec.com/appshield/ksv011
| -| Kubernetes Security Check | KSV012 | Runs as root user | MEDIUM |
Expand... 'runAsNonRoot' forces the running image to run as a non-root user to ensure least privileges.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'securityContext.runAsNonRoot' to true
|
Expand...https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
https://avd.aquasec.com/appshield/ksv012
| -| Kubernetes Security Check | KSV014 | Root file system is not read-only | LOW |
Expand... An immutable root file system prevents applications from writing to their local disk. This can limit intrusions, as attackers will not be able to tamper with the file system or write foreign executables to disk.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'securityContext.readOnlyRootFilesystem' to true
|
Expand...https://kubesec.io/basics/containers-securitycontext-readonlyrootfilesystem-true/
https://avd.aquasec.com/appshield/ksv014
| -| Kubernetes Security Check | KSV015 | CPU requests not specified | LOW |
Expand... When containers have resource requests specified, the scheduler can make better decisions about which nodes to place pods on, and how to deal with resource contention.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'resources.requests.cpu'
|
Expand...https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits
https://avd.aquasec.com/appshield/ksv015
| -| Kubernetes Security Check | KSV016 | Memory requests not specified | LOW |
Expand... When containers have memory requests specified, the scheduler can make better decisions about which nodes to place pods on, and how to deal with resource contention.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'resources.requests.memory'
|
Expand...https://kubesec.io/basics/containers-resources-limits-memory/
https://avd.aquasec.com/appshield/ksv016
| -| Kubernetes Security Check | KSV018 | Memory not limited | LOW |
Expand... Enforcing memory limits prevents DoS via resource exhaustion.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'resources.limits.memory'
|
Expand...https://kubesec.io/basics/containers-resources-limits-memory/
https://avd.aquasec.com/appshield/ksv018
| -| Kubernetes Security Check | KSV020 | Runs with low user ID | MEDIUM |
Expand... Force the container to run with user ID > 10000 to avoid conflicts with the host’s user table.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'securityContext.runAsUser' > 10000
|
Expand...https://kubesec.io/basics/containers-securitycontext-runasuser/
https://avd.aquasec.com/appshield/ksv020
| -| Kubernetes Security Check | KSV021 | Runs with low group ID | MEDIUM |
Expand... Force the container to run with group ID > 10000 to avoid conflicts with the host’s user table.

Container 'amd-gpu-dp-cntr' of DaemonSet 'amd-gpu-device-plugin-daemonset' should set 'securityContext.runAsGroup' > 10000
|
Expand...https://kubesec.io/basics/containers-securitycontext-runasuser/
https://avd.aquasec.com/appshield/ksv021
| -| Kubernetes Security Check | KSV023 | hostPath volumes mounted | MEDIUM |
Expand... HostPath volumes must be forbidden.

DaemonSet 'amd-gpu-device-plugin-daemonset' should not set 'spec.template.volumes.hostPath'
|
Expand...https://kubernetes.io/docs/concepts/security/pod-security-standards/#baseline
https://avd.aquasec.com/appshield/ksv023
| - -## Containers - -##### Detected Containers - - docker.io/rocm/k8s-device-plugin:1.18.0 - -##### Scan Results - - -#### Container: docker.io/rocm/k8s-device-plugin:1.18.0 (alpine 3.13.5) - - -**alpine** - - -| Package | Vulnerability | Severity | Installed Version | Fixed Version | Links | -|:----------------|:------------------:|:-----------:|:------------------:|:-------------:|-----------------------------------------| -| apk-tools | CVE-2021-36159 | CRITICAL | 2.12.5-r0 | 2.12.6-r0 |
Expand...https://github.com/freebsd/freebsd-src/commits/main/lib/libfetch
https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/10749
https://lists.apache.org/thread.html/r61db8e7dcb56dc000a5387a88f7a473bacec5ee01b9ff3f55308aacc@%3Cdev.kafka.apache.org%3E
https://lists.apache.org/thread.html/r61db8e7dcb56dc000a5387a88f7a473bacec5ee01b9ff3f55308aacc@%3Cusers.kafka.apache.org%3E
https://lists.apache.org/thread.html/rbf4ce74b0d1fa9810dec50ba3ace0caeea677af7c27a97111c06ccb7@%3Cdev.kafka.apache.org%3E
https://lists.apache.org/thread.html/rbf4ce74b0d1fa9810dec50ba3ace0caeea677af7c27a97111c06ccb7@%3Cusers.kafka.apache.org%3E
| -| busybox | CVE-2021-42378 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42378
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42379 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42379
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42380 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42380
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42381 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42381
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42382 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42382
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42383 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
| -| busybox | CVE-2021-42384 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42384
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42385 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42385
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42386 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42386
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42374 | MEDIUM | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42374
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| busybox | CVE-2021-42375 | MEDIUM | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
| -| libcrypto1.1 | CVE-2021-3711 | CRITICAL | 1.1.1k-r0 | 1.1.1l-r0 |
Expand...http://www.openwall.com/lists/oss-security/2021/08/26/2
https://cert-portal.siemens.com/productcert/pdf/ssa-389290.pdf
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3711
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=59f5e75f3bced8fc0e130d72a3f582cf7b480b46
https://lists.apache.org/thread.html/r18995de860f0e63635f3008fd2a6aca82394249476d21691e7c59c9e@%3Cdev.tomcat.apache.org%3E
https://lists.apache.org/thread.html/rad5d9f83f0d11fb3f8bb148d179b8a9ad7c6a17f18d70e5805a713d1@%3Cdev.tomcat.apache.org%3E
https://security.netapp.com/advisory/ntap-20210827-0010/
https://security.netapp.com/advisory/ntap-20211022-0003/
https://ubuntu.com/security/notices/USN-5051-1
https://www.debian.org/security/2021/dsa-4963
https://www.openssl.org/news/secadv/20210824.txt
https://www.oracle.com/security-alerts/cpujan2022.html
https://www.oracle.com/security-alerts/cpuoct2021.html
https://www.tenable.com/security/tns-2021-16
https://www.tenable.com/security/tns-2022-02
| -| libcrypto1.1 | CVE-2021-3712 | HIGH | 1.1.1k-r0 | 1.1.1l-r0 |
Expand...http://www.openwall.com/lists/oss-security/2021/08/26/2
https://cert-portal.siemens.com/productcert/pdf/ssa-244969.pdf
https://cert-portal.siemens.com/productcert/pdf/ssa-389290.pdf
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3712
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=94d23fcff9b2a7a8368dfe52214d5c2569882c11
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=ccb0a11145ee72b042d10593a64eaf9e8a55ec12
https://kc.mcafee.com/corporate/index?page=content&id=SB10366
https://linux.oracle.com/cve/CVE-2021-3712.html
https://linux.oracle.com/errata/ELSA-2022-9023.html
https://lists.apache.org/thread.html/r18995de860f0e63635f3008fd2a6aca82394249476d21691e7c59c9e@%3Cdev.tomcat.apache.org%3E
https://lists.apache.org/thread.html/rad5d9f83f0d11fb3f8bb148d179b8a9ad7c6a17f18d70e5805a713d1@%3Cdev.tomcat.apache.org%3E
https://lists.debian.org/debian-lts-announce/2021/09/msg00014.html
https://lists.debian.org/debian-lts-announce/2021/09/msg00021.html
https://security.netapp.com/advisory/ntap-20210827-0010/
https://ubuntu.com/security/notices/USN-5051-1
https://ubuntu.com/security/notices/USN-5051-2
https://ubuntu.com/security/notices/USN-5051-3
https://ubuntu.com/security/notices/USN-5051-4 (regression only in trusty/esm)
https://ubuntu.com/security/notices/USN-5088-1
https://www.debian.org/security/2021/dsa-4963
https://www.openssl.org/news/secadv/20210824.txt
https://www.oracle.com/security-alerts/cpujan2022.html
https://www.oracle.com/security-alerts/cpuoct2021.html
https://www.tenable.com/security/tns-2021-16
https://www.tenable.com/security/tns-2022-02
| -| libcrypto1.1 | CVE-2022-0778 | HIGH | 1.1.1k-r0 | 1.1.1n-r0 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0778
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=3118eb64934499d93db3230748a452351d1d9a65
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=380085481c64de749a6dd25cdf0bcf4360b30f83
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=a466912611aa6cbdf550cd10601390e587451246
https://linux.oracle.com/cve/CVE-2022-0778.html
https://linux.oracle.com/errata/ELSA-2022-9246.html
https://lists.debian.org/debian-lts-announce/2022/03/msg00023.html
https://lists.debian.org/debian-lts-announce/2022/03/msg00024.html
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/GDB3GQVJPXJE7X5C5JN6JAA4XUDWD6E6/
https://psirt.global.sonicwall.com/vuln-detail/SNWLID-2022-0002
https://security.netapp.com/advisory/ntap-20220321-0002/
https://ubuntu.com/security/notices/USN-5328-1
https://ubuntu.com/security/notices/USN-5328-2
https://www.debian.org/security/2022/dsa-5103
https://www.openssl.org/news/secadv/20220315.txt
| -| libssl1.1 | CVE-2021-3711 | CRITICAL | 1.1.1k-r0 | 1.1.1l-r0 |
Expand...http://www.openwall.com/lists/oss-security/2021/08/26/2
https://cert-portal.siemens.com/productcert/pdf/ssa-389290.pdf
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3711
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=59f5e75f3bced8fc0e130d72a3f582cf7b480b46
https://lists.apache.org/thread.html/r18995de860f0e63635f3008fd2a6aca82394249476d21691e7c59c9e@%3Cdev.tomcat.apache.org%3E
https://lists.apache.org/thread.html/rad5d9f83f0d11fb3f8bb148d179b8a9ad7c6a17f18d70e5805a713d1@%3Cdev.tomcat.apache.org%3E
https://security.netapp.com/advisory/ntap-20210827-0010/
https://security.netapp.com/advisory/ntap-20211022-0003/
https://ubuntu.com/security/notices/USN-5051-1
https://www.debian.org/security/2021/dsa-4963
https://www.openssl.org/news/secadv/20210824.txt
https://www.oracle.com/security-alerts/cpujan2022.html
https://www.oracle.com/security-alerts/cpuoct2021.html
https://www.tenable.com/security/tns-2021-16
https://www.tenable.com/security/tns-2022-02
| -| libssl1.1 | CVE-2021-3712 | HIGH | 1.1.1k-r0 | 1.1.1l-r0 |
Expand...http://www.openwall.com/lists/oss-security/2021/08/26/2
https://cert-portal.siemens.com/productcert/pdf/ssa-244969.pdf
https://cert-portal.siemens.com/productcert/pdf/ssa-389290.pdf
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3712
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=94d23fcff9b2a7a8368dfe52214d5c2569882c11
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=ccb0a11145ee72b042d10593a64eaf9e8a55ec12
https://kc.mcafee.com/corporate/index?page=content&id=SB10366
https://linux.oracle.com/cve/CVE-2021-3712.html
https://linux.oracle.com/errata/ELSA-2022-9023.html
https://lists.apache.org/thread.html/r18995de860f0e63635f3008fd2a6aca82394249476d21691e7c59c9e@%3Cdev.tomcat.apache.org%3E
https://lists.apache.org/thread.html/rad5d9f83f0d11fb3f8bb148d179b8a9ad7c6a17f18d70e5805a713d1@%3Cdev.tomcat.apache.org%3E
https://lists.debian.org/debian-lts-announce/2021/09/msg00014.html
https://lists.debian.org/debian-lts-announce/2021/09/msg00021.html
https://security.netapp.com/advisory/ntap-20210827-0010/
https://ubuntu.com/security/notices/USN-5051-1
https://ubuntu.com/security/notices/USN-5051-2
https://ubuntu.com/security/notices/USN-5051-3
https://ubuntu.com/security/notices/USN-5051-4 (regression only in trusty/esm)
https://ubuntu.com/security/notices/USN-5088-1
https://www.debian.org/security/2021/dsa-4963
https://www.openssl.org/news/secadv/20210824.txt
https://www.oracle.com/security-alerts/cpujan2022.html
https://www.oracle.com/security-alerts/cpuoct2021.html
https://www.tenable.com/security/tns-2021-16
https://www.tenable.com/security/tns-2022-02
| -| libssl1.1 | CVE-2022-0778 | HIGH | 1.1.1k-r0 | 1.1.1n-r0 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-0778
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=3118eb64934499d93db3230748a452351d1d9a65
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=380085481c64de749a6dd25cdf0bcf4360b30f83
https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff;h=a466912611aa6cbdf550cd10601390e587451246
https://linux.oracle.com/cve/CVE-2022-0778.html
https://linux.oracle.com/errata/ELSA-2022-9246.html
https://lists.debian.org/debian-lts-announce/2022/03/msg00023.html
https://lists.debian.org/debian-lts-announce/2022/03/msg00024.html
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/GDB3GQVJPXJE7X5C5JN6JAA4XUDWD6E6/
https://psirt.global.sonicwall.com/vuln-detail/SNWLID-2022-0002
https://security.netapp.com/advisory/ntap-20220321-0002/
https://ubuntu.com/security/notices/USN-5328-1
https://ubuntu.com/security/notices/USN-5328-2
https://www.debian.org/security/2022/dsa-5103
https://www.openssl.org/news/secadv/20220315.txt
| -| libxml2 | CVE-2021-3517 | HIGH | 2.9.10-r6 | 2.9.10-r7 |
Expand...https://bugzilla.redhat.com/show_bug.cgi?id=1954232
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3517
https://gitlab.gnome.org/GNOME/libxml2/-/commit/bf22713507fe1fc3a2c4b525cf0a88c2dc87a3a2
https://gitlab.gnome.org/GNOME/libxml2/-/issues/235
https://linux.oracle.com/cve/CVE-2021-3517.html
https://linux.oracle.com/errata/ELSA-2021-2569.html
https://lists.apache.org/thread.html/r58af02e294bd07f487e2c64ffc0a29b837db5600e33b6e698b9d696b@%3Cissues.bookkeeper.apache.org%3E
https://lists.apache.org/thread.html/rf4c02775860db415b4955778a131c2795223f61cb8c6a450893651e4@%3Cissues.bookkeeper.apache.org%3E
https://lists.debian.org/debian-lts-announce/2021/05/msg00008.html
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/BZOMV5J4PMZAORVT64BKLV6YIZAFDGX6/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/QVM4UJ3376I6ZVOYMHBNX4GY3NIV52WV/
https://security.gentoo.org/glsa/202107-05
https://security.netapp.com/advisory/ntap-20210625-0002/
https://security.netapp.com/advisory/ntap-20211022-0004/
https://ubuntu.com/security/notices/USN-4991-1
https://www.oracle.com/security-alerts/cpujan2022.html
https://www.oracle.com/security-alerts/cpuoct2021.html
| -| libxml2 | CVE-2021-3518 | HIGH | 2.9.10-r6 | 2.9.10-r7 |
Expand...http://seclists.org/fulldisclosure/2021/Jul/54
http://seclists.org/fulldisclosure/2021/Jul/55
http://seclists.org/fulldisclosure/2021/Jul/58
http://seclists.org/fulldisclosure/2021/Jul/59
https://bugzilla.redhat.com/show_bug.cgi?id=1954242
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3518
https://gitlab.gnome.org/GNOME/libxml2/-/commit/1098c30a040e72a4654968547f415be4e4c40fe7
https://gitlab.gnome.org/GNOME/libxml2/-/issues/237
https://linux.oracle.com/cve/CVE-2021-3518.html
https://linux.oracle.com/errata/ELSA-2021-2569.html
https://lists.apache.org/thread.html/r58af02e294bd07f487e2c64ffc0a29b837db5600e33b6e698b9d696b@%3Cissues.bookkeeper.apache.org%3E
https://lists.apache.org/thread.html/rf4c02775860db415b4955778a131c2795223f61cb8c6a450893651e4@%3Cissues.bookkeeper.apache.org%3E
https://lists.debian.org/debian-lts-announce/2021/05/msg00008.html
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/BZOMV5J4PMZAORVT64BKLV6YIZAFDGX6/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/QVM4UJ3376I6ZVOYMHBNX4GY3NIV52WV/
https://security.gentoo.org/glsa/202107-05
https://security.netapp.com/advisory/ntap-20210625-0002/
https://support.apple.com/kb/HT212601
https://support.apple.com/kb/HT212602
https://support.apple.com/kb/HT212604
https://support.apple.com/kb/HT212605
https://ubuntu.com/security/notices/USN-4991-1
https://www.oracle.com/security-alerts/cpuoct2021.html
| -| libxml2 | CVE-2022-23308 | HIGH | 2.9.10-r6 | 2.9.13-r0 |
Expand...https://access.redhat.com/security/cve/CVE-2022-23308
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23308
https://github.com/GNOME/libxml2/commit/652dd12a858989b14eed4e84e453059cd3ba340e
https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.9.13/NEWS
https://linux.oracle.com/cve/CVE-2022-23308.html
https://linux.oracle.com/errata/ELSA-2022-0899.html
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/LA3MWWAYZADWJ5F6JOUBX65UZAMQB7RF/
https://ubuntu.com/security/notices/USN-5324-1
| -| libxml2 | CVE-2021-3537 | MEDIUM | 2.9.10-r6 | 2.9.10-r7 |
Expand...https://bugzilla.redhat.com/show_bug.cgi?id=1956522
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3537
https://gitlab.gnome.org/GNOME/libxml2/-/commit/babe75030c7f64a37826bb3342317134568bef61
https://gitlab.gnome.org/GNOME/libxml2/-/issues/243
https://gitlab.gnome.org/GNOME/libxml2/-/issues/244
https://gitlab.gnome.org/GNOME/libxml2/-/issues/245
https://linux.oracle.com/cve/CVE-2021-3537.html
https://linux.oracle.com/errata/ELSA-2021-2569.html
https://lists.debian.org/debian-lts-announce/2021/05/msg00008.html
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/BZOMV5J4PMZAORVT64BKLV6YIZAFDGX6/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/QVM4UJ3376I6ZVOYMHBNX4GY3NIV52WV/
https://security.gentoo.org/glsa/202107-05
https://security.netapp.com/advisory/ntap-20210625-0002/
https://ubuntu.com/security/notices/USN-4991-1
https://www.oracle.com/security-alerts/cpuoct2021.html
| -| libxml2 | CVE-2021-3541 | MEDIUM | 2.9.10-r6 | 2.9.11-r0 |
Expand...https://blog.hartwork.org/posts/cve-2021-3541-parameter-laughs-fixed-in-libxml2-2-9-11/
https://bugzilla.redhat.com/show_bug.cgi?id=1950515
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3541
https://gitlab.gnome.org/GNOME/libxml2/-/commit/8598060bacada41a0eb09d95c97744ff4e428f8e
https://gitlab.gnome.org/GNOME/libxml2/-/issues/228 (currently private)
https://linux.oracle.com/cve/CVE-2021-3541.html
https://linux.oracle.com/errata/ELSA-2021-2569.html
https://security.netapp.com/advisory/ntap-20210805-0007/
https://ubuntu.com/security/notices/USN-4991-1
https://www.oracle.com/security-alerts/cpujan2022.html
| -| ssl_client | CVE-2021-42378 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42378
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42379 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42379
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42380 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42380
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42381 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42381
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42382 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42382
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42383 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
| -| ssl_client | CVE-2021-42384 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42384
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42385 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42385
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42386 | HIGH | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42386
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42374 | MEDIUM | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-42374
https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
https://ubuntu.com/security/notices/USN-5179-1
| -| ssl_client | CVE-2021-42375 | MEDIUM | 1.32.1-r6 | 1.32.1-r7 |
Expand...https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
| diff --git a/charts/core/amd-gpu-plugin/values.yaml b/charts/core/amd-gpu-plugin/values.yaml deleted file mode 100644 index 13ddb5d4688..00000000000 --- a/charts/core/amd-gpu-plugin/values.yaml +++ /dev/null @@ -1,5 +0,0 @@ -image: - repository: placeholder - # defaults to appVersion - tag: upstream - pullPolicy: IfNotPresent diff --git a/charts/core/docker-compose/templates/common.yaml b/charts/core/docker-compose/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/core/docker-compose/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/core/external-service/templates/common.yaml b/charts/core/external-service/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/core/external-service/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/core/metallb/.helmignore b/charts/core/metallb/.helmignore deleted file mode 100644 index 0e8a0eb36f4..00000000000 --- a/charts/core/metallb/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/dependency/mariadb/Chart.yaml b/charts/dependency/mariadb/Chart.yaml index 12204323354..b0474b056a3 100644 --- a/charts/dependency/mariadb/Chart.yaml +++ b/charts/dependency/mariadb/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "10.7.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.29 + version: 10.0.8 deprecated: false description: Fast, reliable, scalable, and easy to use open-source relational database system. home: https://github.com/truecharts/apps/tree/master/charts/dependency/mariadb @@ -24,7 +24,7 @@ sources: - https://github.com/prometheus/mysqld_exporter - https://mariadb.org type: application -version: 2.0.92 +version: 3.0.0 annotations: truecharts.org/catagories: | - database diff --git a/charts/dependency/mariadb/templates/common.yaml b/charts/dependency/mariadb/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/dependency/mariadb/templates/common.yaml +++ b/charts/dependency/mariadb/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dependency/mariadb/templates/secret.yaml b/charts/dependency/mariadb/templates/secret.yaml deleted file mode 100644 index 589049d27e9..00000000000 --- a/charts/dependency/mariadb/templates/secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.names.fullname" . }} - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -type: Opaque -data: - mariadb-password: {{ ( .Values.mariadbPassword | default "empty" ) | b64enc | quote }} - mariadb-root-password: {{ ( .Values.mariadbRootPassword | default "empty" ) | b64enc | quote }} diff --git a/charts/dependency/mariadb/values.yaml b/charts/dependency/mariadb/values.yaml index 9e09360544b..5aeb19e7572 100644 --- a/charts/dependency/mariadb/values.yaml +++ b/charts/dependency/mariadb/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/truecharts/mariadb pullPolicy: IfNotPresent - tag: v10.7.4@sha256:2741faf6ed0c730bf41357f7d0de3546025ddd9341bb64e946df0f193ed7a03f + tag: v10.7.4@sha256:28bbb5a46a33545dcac0dc46859db117221c2b60e49d6c07a6854fc74f8d18c9 controller: # -- Set the controller type. @@ -34,6 +34,24 @@ service: securityContext: readOnlyRootFilesystem: false +secret: + credentials: + enabled: true + data: + mariadb-password: '{{ ( .Values.mariadbPassword | default "empty" ) }}' + mariadb-root-password: '{{ ( .Values.mariadbRootPassword | default "empty" ) }}' + +env: + MARIADB_PASSWORD: + secretKeyRef: + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' + key: "mariadb-password" + MARIADB_ROOT_PASSWORD: + secretKeyRef: + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' + key: "mariadb-root-password" + MARIADB_USER: "{{ .Values.mariadbUsername }}" + MARIADB_DATABASE: "{{ .Values.mariadbDatabase }}" podSecurityContext: runAsGroup: 0 @@ -101,17 +119,3 @@ mariadbUsername: "test" mariadbDatabase: "test" mariadbRootPassword: "testroot" existingSecret: "" - -envValueFrom: - MARIADB_PASSWORD: - secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' - key: "mariadb-password" - MARIADB_ROOT_PASSWORD: - secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' - key: "mariadb-root-password" - -envTpl: - MARIADB_USER: "{{ .Values.mariadbUsername }}" - MARIADB_DATABASE: "{{ .Values.mariadbDatabase }}" diff --git a/charts/dependency/memcached/Chart.yaml b/charts/dependency/memcached/Chart.yaml index bb3c7e92a70..cf6f9ead1b0 100644 --- a/charts/dependency/memcached/Chart.yaml +++ b/charts/dependency/memcached/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.6.15" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.29 + version: 10.0.8 deprecated: false description: Memcached is a memory-backed database caching solution home: https://github.com/truecharts/apps/tree/master/charts/dependency/memcached @@ -22,7 +22,7 @@ sources: - https://github.com/bitnami/bitnami-docker-memcached - http://memcached.org/ type: application -version: 2.0.91 +version: 3.0.0 annotations: truecharts.org/catagories: | - database diff --git a/charts/dependency/memcached/templates/common.yaml b/charts/dependency/memcached/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/dependency/memcached/templates/common.yaml +++ b/charts/dependency/memcached/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dependency/memcached/values.yaml b/charts/dependency/memcached/values.yaml index 747e2a313f2..868625d86db 100644 --- a/charts/dependency/memcached/values.yaml +++ b/charts/dependency/memcached/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/truecharts/memcached pullPolicy: IfNotPresent - tag: v1.6.15@sha256:927e68b0726f32b4fde93e280f378968ff78279372ec7166846f29616c7819dc + tag: v1.6.15@sha256:4f0cd77095fa73ee4ceb75eb37d45a4289c34548497fb78a695a48bc7bde5e5f service: main: diff --git a/charts/dependency/mongodb/Chart.yaml b/charts/dependency/mongodb/Chart.yaml index e5dd476ee43..d3e34aadd12 100644 --- a/charts/dependency/mongodb/Chart.yaml +++ b/charts/dependency/mongodb/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.0.9" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.29 + version: 10.0.8 deprecated: false description: Fast, reliable, scalable, and easy to use open-source no-sql database system. home: https://github.com/truecharts/apps/tree/master/charts/dependency/mongodb @@ -23,7 +23,7 @@ sources: - https://github.com/bitnami/bitnami-docker-mongodb - https://www.mongodb.com type: application -version: 0.1.49 +version: 1.0.0 annotations: truecharts.org/catagories: | - database diff --git a/charts/dependency/mongodb/templates/common.yaml b/charts/dependency/mongodb/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/dependency/mongodb/templates/common.yaml +++ b/charts/dependency/mongodb/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/dependency/mongodb/templates/secret.yaml b/charts/dependency/mongodb/templates/secret.yaml deleted file mode 100644 index c36531b5dbe..00000000000 --- a/charts/dependency/mongodb/templates/secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.names.fullname" . }} - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -type: Opaque -data: - mongodb-password: {{ ( .Values.mongodbPassword | default "empty" ) | b64enc | quote }} - mongodb-root-password: {{ ( .Values.mongodbRootPassword | default "empty" ) | b64enc | quote }} diff --git a/charts/dependency/mongodb/values.yaml b/charts/dependency/mongodb/values.yaml index 0e71fc1e7c2..ca6bef31540 100644 --- a/charts/dependency/mongodb/values.yaml +++ b/charts/dependency/mongodb/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/truecharts/mongodb pullPolicy: IfNotPresent - tag: v5.0.9@sha256:4f5a82e1b66a48423960d1b5d07566fe55e606de70e42f36ea52ffa54fe20e8e + tag: v5.0.9@sha256:289263798ce4e53424af42901c9729e95117550dbc8810832783c21c3a4c0920 controller: # -- Set the controller type. @@ -102,16 +102,21 @@ mongodbDatabase: "test" mongodbRootPassword: "testroot" existingSecret: "" -envValueFrom: - MONGODB_PASSWORD: - secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' - key: "mongodb-password" - MONGODB_ROOT_PASSWORD: - secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' - key: "mongodb-root-password" +secret: + credentials: + enabled: true + data: + mongodb-password: '{{ ( .Values.mongodbPassword | default "empty" ) }}' + mongodb-root-password: '{{ ( .Values.mongodbRootPassword | default "empty" ) }}' env: MONGODB_USERNAME: "{{ .Values.mongodbUsername }}" MONGODB_DATABASE: "{{ .Values.mongodbDatabase }}" + MONGODB_PASSWORD: + secretKeyRef: + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' + key: "mongodb-password" + MONGODB_ROOT_PASSWORD: + secretKeyRef: + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' + key: "mongodb-root-password" diff --git a/charts/dependency/postgresql/Chart.yaml b/charts/dependency/postgresql/Chart.yaml index 14e7a89bd94..452e2f1d579 100644 --- a/charts/dependency/postgresql/Chart.yaml +++ b/charts/dependency/postgresql/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "14.3.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.29 + version: 10.0.8 deprecated: false description: PostgresSQL home: https://github.com/truecharts/apps/tree/master/charts/dependency/postgresql @@ -22,7 +22,7 @@ name: postgresql sources: - https://www.postgresql.org/ type: application -version: 7.0.93 +version: 8.0.0 annotations: truecharts.org/catagories: | - database diff --git a/charts/dependency/postgresql/templates/backup-postgres-config.yaml b/charts/dependency/postgresql/templates/backup-postgres-config.yaml deleted file mode 100644 index e52eb2ed5a1..00000000000 --- a/charts/dependency/postgresql/templates/backup-postgres-config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: "postgres-backup-hook-config-map" - annotations: - rollme: {{ randAlphaNum 5 | quote }} -data: - entrypoint.sh: |- - #!/bin/sh - cmd="/docker-entrypoint.sh postgres" - eval "${cmd}" & disown; - until pg_isready; do - sleep 5; - done; - pg_dump -U {{ .Values.postgresqlUser }} -d {{ .Values.postgresqlDatabase }} > /dbbackups/$BACKUP_NAME; diff --git a/charts/dependency/postgresql/templates/common.yaml b/charts/dependency/postgresql/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/dependency/postgresql/templates/common.yaml +++ b/charts/dependency/postgresql/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dependency/postgresql/templates/secret.yaml b/charts/dependency/postgresql/templates/secret.yaml deleted file mode 100644 index 1e3025442a6..00000000000 --- a/charts/dependency/postgresql/templates/secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.names.fullname" . }} - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -type: Opaque -data: - postgresql-password: {{ ( .Values.postgresqlPassword | default "empty" ) | b64enc | quote }} - postgresql-postgres-password: {{ ( .Values.postgrespassword | default "empty" ) | b64enc | quote }} diff --git a/charts/dependency/postgresql/templates/upgrade-backup-postgres-hook.yaml b/charts/dependency/postgresql/templates/upgrade-backup-postgres-hook.yaml deleted file mode 100644 index 516ee5180a6..00000000000 --- a/charts/dependency/postgresql/templates/upgrade-backup-postgres-hook.yaml +++ /dev/null @@ -1,56 +0,0 @@ -{{- if and ( .Values.enableUpgradeBackup ) ( .Values.ixChartContext ) -}} -{{- if .Values.ixChartContext.isUpgrade -}} -{{- $upgradeDict := .Values.ixChartContext.upgradeMetadata -}} -{{ $values := (. | mustDeepCopy) }} ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: "pre-upgrade-hook2" - annotations: - "helm.sh/hook": pre-upgrade - "helm.sh/hook-weight": "1" - "helm.sh/hook-delete-policy": hook-succeeded - rollme: {{ randAlphaNum 5 | quote }} -spec: - template: - metadata: - name: "pre-upgrade-hook2" - spec: - restartPolicy: Never - containers: - - name: {{ .Chart.Name }}-postgres-backup - image: {{ printf "%v:%v" .Values.image.repository .Values.image.tag}} - imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: BACKUP_NAME - value: {{- printf "postgres-backup-from-%s-to-%s-revision-%d" $upgradeDict.oldChartVersion $upgradeDict.newChartVersion (int64 $upgradeDict.preUpgradeRevision) -}} - - name: POSTGRES_USER - value: {{ .Values.postgresqlUsername | quote }} - - name: POSTGRES_DB - value: {{ .Values.postgresqlDatabase | quote }} - - name: POSTGRES_PASSWORD - valueFrom: - secretKeyRef: - name: {{ ( .Values.existingSecret | default ( include "common.names.fullname" . ) ) | quote }} - key: "postgresql-password" - command: - - "/bin/backup_entrypoint.sh" - volumeMounts: - - name: backup-script-configmap - mountPath: /bin/backup_entrypoint.sh - readOnly: true - subPath: entrypoint.sh - {{- with (include "common.controller.volumeMounts" . | trim) }} - {{ nindent 4 . }} - {{- end }} - volumes: - - name: backup-script-configmap - configMap: - defaultMode: 0700 - name: "postgres-backup-hook-config-map" - {{- with (include "common.controller.volumes" . | trim) }} - {{- nindent 2 . }} - {{- end }} -{{- end -}} -{{- end -}} diff --git a/charts/dependency/postgresql/values.yaml b/charts/dependency/postgresql/values.yaml index c742436dc8f..1420f21eca5 100644 --- a/charts/dependency/postgresql/values.yaml +++ b/charts/dependency/postgresql/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/truecharts/postgresql pullPolicy: IfNotPresent - tag: v14.3.0@sha256:997205be58254e4196f4afdf2d0f539b809177966f62cc9891cca037b3da37a7 + tag: v14.3.0@sha256:8ceb5ef6482804203d3b09251df17c9b202ac29e4292c6cb6559db93ca57dfc3 controller: # -- Set the controller type. @@ -104,17 +104,22 @@ postgresqlDatabase: "test" postgrespassword: "testroot" existingSecret: "" -envValueFrom: +secret: + credentials: + enabled: true + data: + postgresql-password: '{{ ( .Values.postgresqlPassword | default "empty" ) }}' + postgresql-postgres-password: '{{ ( .Values.postgrespassword | default "empty" ) }}' + +env: POSTGRES_PASSWORD: secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' key: "postgresql-password" POSTGRESQL_POSTGRES_PASSWORD: secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' key: "postgresql-postgres-password" - -envTpl: POSTGRES_USER: "{{ .Values.postgresqlUsername }}" POSTGRES_DB: "{{ .Values.postgresqlDatabase }}" # POSTGRESQL_POSTGRES_PASSWORD: "{{ .Values.postgrespassword }}" diff --git a/charts/dependency/promtail/Chart.yaml b/charts/dependency/promtail/Chart.yaml index 39b7a33e470..ad834be4fe2 100644 --- a/charts/dependency/promtail/Chart.yaml +++ b/charts/dependency/promtail/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.5.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.29 + version: 10.0.8 deprecated: false description: Promtail is an agent which ships the contents of local logs to a Loki instance icon: https://raw.githubusercontent.com/grafana/loki/master/docs/sources/logo.png @@ -22,7 +22,7 @@ sources: - https://grafana.com/oss/loki/ - https://grafana.com/docs/loki/latest/ type: application -version: 2.0.52 +version: 3.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/dependency/promtail/templates/servicemonitor.yaml b/charts/dependency/promtail/templates/_servicemonitor.tpl similarity index 93% rename from charts/dependency/promtail/templates/servicemonitor.yaml rename to charts/dependency/promtail/templates/_servicemonitor.tpl index 98ce039eb9c..2daee565e15 100644 --- a/charts/dependency/promtail/templates/servicemonitor.yaml +++ b/charts/dependency/promtail/templates/_servicemonitor.tpl @@ -1,4 +1,6 @@ +{{- define "tc.promtail.servicemonitor" -}} {{- if .Values.serviceMonitor.enabled }} +--- apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: @@ -29,3 +31,4 @@ spec: scrapeTimeout: {{ . }} {{- end }} {{- end }} +{{- end -}} diff --git a/charts/dependency/promtail/templates/common.yaml b/charts/dependency/promtail/templates/common.yaml index f6d3b6d3a08..c3527e0fb07 100644 --- a/charts/dependency/promtail/templates/common.yaml +++ b/charts/dependency/promtail/templates/common.yaml @@ -1,2 +1,4 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.init" . }} +{{ include "tc.promtail.servicemonitor" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/dependency/promtail/templates/secret.yaml b/charts/dependency/promtail/templates/secret.yaml deleted file mode 100644 index c7b32e1089f..00000000000 --- a/charts/dependency/promtail/templates/secret.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: promtail-config - labels: - {{- include "common.labels" . | nindent 4 }} -stringData: - promtail.yaml: | - {{- tpl .Values.config.file . | nindent 4 }} diff --git a/charts/dependency/promtail/values.yaml b/charts/dependency/promtail/values.yaml index bf63cb0dc8e..69e5229a181 100644 --- a/charts/dependency/promtail/values.yaml +++ b/charts/dependency/promtail/values.yaml @@ -10,7 +10,14 @@ image: args: - "-config.file=/etc/promtail/promtail.yaml" -envValueFrom: +secret: + config: + enabled: true + data: + promtail.yaml: | + {{- tpl .Values.config.file . | nindent 4 }} + +env: HOSTNAME: fieldRef: fieldPath: spec.nodeName @@ -62,34 +69,36 @@ persistence: enabled: true type: hostPath mountPath: /run/promtail - hostPath: /run/promtai + hostPath: /run/promtail config: enabled: true type: secret - objectName: "promtail-config" + objectName: '{{ include "tc.common.names.fullname" . }}-config' mountPath: /etc/promtail # -- Whether Role Based Access Control objects like roles and rolebindings should be created rbac: - enabled: true - rules: - - apiGroups: - - "" - resources: - - nodes - - nodes/proxy - - services - - endpoints - - pods - verbs: - - get - - watch - - list + main: + enabled: true + rules: + - apiGroups: + - "" + resources: + - nodes + - nodes/proxy + - services + - endpoints + - pods + verbs: + - get + - watch + - list +# -- The service account the pods will use to interact with the Kubernetes API serviceAccount: - # -- Specifies whether a ServiceAccount should be created - create: true + main: + create: true # -- Tolerations for pods. By default, pods will be scheduled on master/control-plane nodes. tolerations: diff --git a/charts/dependency/redis/Chart.yaml b/charts/dependency/redis/Chart.yaml index a1d022e51b7..9f4dfa7481c 100644 --- a/charts/dependency/redis/Chart.yaml +++ b/charts/dependency/redis/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.2.7" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.29 + version: 10.0.8 deprecated: false description: Open source, advanced key-value store. home: https://github.com/truecharts/apps/tree/master/charts/dependency/redis @@ -22,7 +22,7 @@ sources: - https://github.com/bitnami/bitnami-docker-redis - http://redis.io/ type: application -version: 2.0.83 +version: 3.0.0 annotations: truecharts.org/catagories: | - database diff --git a/charts/dependency/redis/templates/common.yaml b/charts/dependency/redis/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/dependency/redis/templates/common.yaml +++ b/charts/dependency/redis/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dependency/redis/templates/health-configmap.yaml b/charts/dependency/redis/templates/health-configmap.yaml deleted file mode 100644 index 88e7fc35692..00000000000 --- a/charts/dependency/redis/templates/health-configmap.yaml +++ /dev/null @@ -1,79 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: redis-health - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -data: - ping_readiness_local.sh: |- - #!/bin/bash - [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h localhost \ - -p $REDIS_PORT \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "failed to connect using password: $REDIS_PASSWORD response: $response" - exit 1 - fi - ping_liveness_local.sh: |- - #!/bin/bash - [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h localhost \ - -p $REDIS_PORT \ - ping - ) - if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then - echo "$response" - exit 1 - fi - ping_readiness_master.sh: |- - #!/bin/bash - [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h $REDIS_MASTER_HOST \ - -p $REDIS_MASTER_PORT_NUMBER \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "$response" - exit 1 - fi - ping_liveness_master.sh: |- - #!/bin/bash - [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" - response=$( - timeout -s 3 $1 \ - redis-cli \ - -h $REDIS_MASTER_HOST \ - -p $REDIS_MASTER_PORT_NUMBER \ - ping - ) - if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then - echo "$response" - exit 1 - fi - ping_readiness_local_and_master.sh: |- - script_dir="$(dirname "$0")" - exit_status=0 - "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? - "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? - exit $exit_status - ping_liveness_local_and_master.sh: |- - script_dir="$(dirname "$0")" - exit_status=0 - "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? - "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? - exit $exit_status diff --git a/charts/dependency/redis/templates/secret.yaml b/charts/dependency/redis/templates/secret.yaml deleted file mode 100644 index ab61d7b0b08..00000000000 --- a/charts/dependency/redis/templates/secret.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.names.fullname" . }} - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -type: Opaque -data: - redis-password: {{ ( .Values.redisPassword | default "nothing" ) | b64enc | quote }} diff --git a/charts/dependency/redis/values.yaml b/charts/dependency/redis/values.yaml index 172ce7d9e2b..7a581eb9ef0 100644 --- a/charts/dependency/redis/values.yaml +++ b/charts/dependency/redis/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/truecharts/redis pullPolicy: IfNotPresent - tag: v6.2.7@sha256:692ee212a2bfe72367f9b568abbc0e73092c440dcb93497f4deebd89dd174079 + tag: v7.0.0@sha256:5ca358fcb215690d5dcc1a447b9884cc903003457ef2507cb33ec7dc555a4710 controller: # -- Set the controller type. @@ -30,24 +30,97 @@ securityContext: podSecurityContext: runAsGroup: 0 -env: - - name: REDIS_REPLICATION_MODE - value: master - - name: ALLOW_EMPTY_PASSWORD - value: "yes" +configmap: + health: + enabled: true + data: + ping_readiness_local.sh: |- + #!/bin/bash + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ + -p $REDIS_PORT \ + ping + ) + if [ "$response" != "PONG" ]; then + echo "failed to connect using password: $REDIS_PASSWORD response: $response" + exit 1 + fi + ping_liveness_local.sh: |- + #!/bin/bash + [[ -n "$REDIS_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h localhost \ + -p $REDIS_PORT \ + ping + ) + if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then + echo "$response" + exit 1 + fi + ping_readiness_master.sh: |- + #!/bin/bash + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ + ping + ) + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_master.sh: |- + #!/bin/bash + [[ -n "$REDIS_MASTER_PASSWORD" ]] && export REDISCLI_AUTH="$REDIS_MASTER_PASSWORD" + response=$( + timeout -s 3 $1 \ + redis-cli \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ + ping + ) + if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then + echo "$response" + exit 1 + fi + ping_readiness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? + "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? + exit $exit_status + ping_liveness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? + "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? + exit $exit_status -envTpl: +secret: + credentials: + enabled: true + data: + redis-password: '{{ ( .Values.redisPassword | default "nothing" ) }}' + +env: + REDIS_REPLICATION_MODE: master + ALLOW_EMPTY_PASSWORD: "yes" REDIS_PORT: "{{ .Values.service.main.ports.main.targetPort }}" + REDIS_PASSWORD: + secretKeyRef: + name: '{{ .Values.existingSecret | default ( printf "%s-credentials" ( include "tc.common.names.fullname" . ) ) }}' + key: "redis-password" redisPassword: "testpass" existingSecret: "" -envValueFrom: - REDIS_PASSWORD: - secretKeyRef: - name: '{{ ( tpl .Values.existingSecret $ ) | default ( include "common.names.fullname" . ) }}' - key: "redis-password" - service: main: ports: @@ -130,4 +203,4 @@ persistence: volumeSpec: configMap: defaultMode: 0755 - name: redis-health + name: '{{ include "tc.common.names.fullname" . }}-health' diff --git a/charts/dev/acestream/Chart.yaml b/charts/dev/acestream/Chart.yaml index 71c401d2b4d..f823bee1916 100644 --- a/charts/dev/acestream/Chart.yaml +++ b/charts/dev/acestream/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Acestream-engine\r\n" home: https://github.com/truecharts/apps/tree/master/charts/dev/acestream diff --git a/charts/dev/acestream/SCALE/migrations/migrate b/charts/dev/acestream/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/acestream/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/acestream/templates/common.yaml b/charts/dev/acestream/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/acestream/templates/common.yaml +++ b/charts/dev/acestream/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/adguard-home/Chart.yaml b/charts/dev/adguard-home/Chart.yaml index 3fd78377db2..f9d5f4211a0 100644 --- a/charts/dev/adguard-home/Chart.yaml +++ b/charts/dev/adguard-home/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "AdGuard Home is a network-wide software for blocking ads & tracking.\ \ After you set it up, it\u2019ll cover ALL your home devices, and you don\u2019\ diff --git a/charts/dev/adguard-home/SCALE/migrations/migrate b/charts/dev/adguard-home/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/adguard-home/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/adguard-home/templates/common.yaml b/charts/dev/adguard-home/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/adguard-home/templates/common.yaml +++ b/charts/dev/adguard-home/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/adguardhome-sync/Chart.yaml b/charts/dev/adguardhome-sync/Chart.yaml index c0418f72abd..34d94d4eff8 100644 --- a/charts/dev/adguardhome-sync/Chart.yaml +++ b/charts/dev/adguardhome-sync/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Adguardhome-sync(https://github.com/bakito/adguardhome-sync/) is a tool to synchronize AdGuardHome config to replica instances. diff --git a/charts/dev/adguardhome-sync/SCALE/migrations/migrate b/charts/dev/adguardhome-sync/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/adguardhome-sync/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/adguardhome-sync/templates/common.yaml b/charts/dev/adguardhome-sync/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/adguardhome-sync/templates/common.yaml +++ b/charts/dev/adguardhome-sync/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/adminer/Chart.yaml b/charts/dev/adminer/Chart.yaml index dfb7181a589..8aada0962fc 100644 --- a/charts/dev/adminer/Chart.yaml +++ b/charts/dev/adminer/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Adminer (formerly phpMinAdmin) is a full-featured database management\ \ tool written in PHP. Conversely to phpMyAdmin, it consist of a single file ready\ diff --git a/charts/dev/adminer/SCALE/migrations/migrate b/charts/dev/adminer/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/adminer/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/adminer/templates/common.yaml b/charts/dev/adminer/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/adminer/templates/common.yaml +++ b/charts/dev/adminer/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/alienswarm-reactivedrop/Chart.yaml b/charts/dev/alienswarm-reactivedrop/Chart.yaml index afd7fd92bf8..32044ffad6a 100644 --- a/charts/dev/alienswarm-reactivedrop/Chart.yaml +++ b/charts/dev/alienswarm-reactivedrop/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ Alien Swarm: Reactive Drop and run it. (!!!This container will only run on systems\ diff --git a/charts/dev/alienswarm-reactivedrop/SCALE/migrations/migrate b/charts/dev/alienswarm-reactivedrop/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/alienswarm-reactivedrop/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/alienswarm-reactivedrop/templates/common.yaml b/charts/dev/alienswarm-reactivedrop/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/alienswarm-reactivedrop/templates/common.yaml +++ b/charts/dev/alienswarm-reactivedrop/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/alienswarm/Chart.yaml b/charts/dev/alienswarm/Chart.yaml index 13a17c8846d..cccfbaab22c 100644 --- a/charts/dev/alienswarm/Chart.yaml +++ b/charts/dev/alienswarm/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ Alien Swarm and run it.\r\n" diff --git a/charts/dev/alienswarm/SCALE/migrations/migrate b/charts/dev/alienswarm/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/alienswarm/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/alienswarm/templates/common.yaml b/charts/dev/alienswarm/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/alienswarm/templates/common.yaml +++ b/charts/dev/alienswarm/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/altitude/Chart.yaml b/charts/dev/altitude/Chart.yaml index e46343101a5..ab316b763a3 100644 --- a/charts/dev/altitude/Chart.yaml +++ b/charts/dev/altitude/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install Altitude and run it.\r\n" home: https://github.com/truecharts/apps/tree/master/charts/dev/altitude diff --git a/charts/dev/altitude/SCALE/migrations/migrate b/charts/dev/altitude/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/altitude/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/altitude/templates/common.yaml b/charts/dev/altitude/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/altitude/templates/common.yaml +++ b/charts/dev/altitude/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/ama/Chart.yaml b/charts/dev/ama/Chart.yaml index ba67707c716..86e4d634126 100644 --- a/charts/dev/ama/Chart.yaml +++ b/charts/dev/ama/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Automated Music Archiver :: This script will automatically archive music using a popular online DL Client' diff --git a/charts/dev/ama/SCALE/migrations/migrate b/charts/dev/ama/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/ama/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/ama/templates/common.yaml b/charts/dev/ama/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/ama/templates/common.yaml +++ b/charts/dev/ama/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/ambd/Chart.yaml b/charts/dev/ambd/Chart.yaml index d479a3bc870..636f440d88a 100644 --- a/charts/dev/ambd/Chart.yaml +++ b/charts/dev/ambd/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Automated MusicBrainz Downloader :: This script will automatically archive music using a popular online DL Client' diff --git a/charts/dev/ambd/SCALE/migrations/migrate b/charts/dev/ambd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/ambd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/ambd/templates/common.yaml b/charts/dev/ambd/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/ambd/templates/common.yaml +++ b/charts/dev/ambd/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/americasarmy-pg/Chart.yaml b/charts/dev/americasarmy-pg/Chart.yaml index e65c25f7501..25e3c46d0d6 100644 --- a/charts/dev/americasarmy-pg/Chart.yaml +++ b/charts/dev/americasarmy-pg/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ America's Army: Proving Grounds and run it.\r\n" diff --git a/charts/dev/americasarmy-pg/SCALE/migrations/migrate b/charts/dev/americasarmy-pg/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/americasarmy-pg/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/americasarmy-pg/templates/common.yaml b/charts/dev/americasarmy-pg/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/americasarmy-pg/templates/common.yaml +++ b/charts/dev/americasarmy-pg/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/amtd/Chart.yaml b/charts/dev/amtd/Chart.yaml index 0841049bf77..33f09daf39f 100644 --- a/charts/dev/amtd/Chart.yaml +++ b/charts/dev/amtd/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Automated Movie Trailer Downloader :: AMTD is a Radarr Companion script to automatically download movie trailers for use in media applications diff --git a/charts/dev/amtd/SCALE/migrations/migrate b/charts/dev/amtd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/amtd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/amtd/templates/common.yaml b/charts/dev/amtd/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/amtd/templates/common.yaml +++ b/charts/dev/amtd/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/amule/Chart.yaml b/charts/dev/amule/Chart.yaml index 6033682d5db..50c0391b67b 100644 --- a/charts/dev/amule/Chart.yaml +++ b/charts/dev/amule/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "DESCRIPTION\r\n" home: https://github.com/truecharts/apps/tree/master/charts/dev/amule diff --git a/charts/dev/amule/SCALE/migrations/migrate b/charts/dev/amule/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/amule/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/amule/templates/common.yaml b/charts/dev/amule/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/amule/templates/common.yaml +++ b/charts/dev/amule/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/amvd/Chart.yaml b/charts/dev/amvd/Chart.yaml index 4dcc1af91a1..8503aae30b9 100644 --- a/charts/dev/amvd/Chart.yaml +++ b/charts/dev/amvd/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Automated Music Video Downloader :: AMVD is a Lidarr Companion script to automatically download and tag Music Videos for use in various media applications' diff --git a/charts/dev/amvd/SCALE/migrations/migrate b/charts/dev/amvd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/amvd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/amvd/templates/common.yaml b/charts/dev/amvd/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/amvd/templates/common.yaml +++ b/charts/dev/amvd/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/android-8-0/.helmignore b/charts/dev/android-8-0/.helmignore index 4379e2b3014..30584baa09d 100644 --- a/charts/dev/android-8-0/.helmignore +++ b/charts/dev/android-8-0/.helmignore @@ -24,3 +24,7 @@ OWNERS # helm-docs templates *.gotmpl +# Image +*.png +*.jpg +*.jpeg diff --git a/charts/dev/android-8-0/Chart.yaml b/charts/dev/android-8-0/Chart.yaml index 9821e385807..fe18db5c92e 100644 --- a/charts/dev/android-8-0/Chart.yaml +++ b/charts/dev/android-8-0/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Android in docker solution with noVNC supported and video recording. Work way better with Intel CPUs because AMD doesn't an cpu graphics card. So with diff --git a/charts/dev/android-8-0/SCALE/migrations/migrate b/charts/dev/android-8-0/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/android-8-0/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/android-8-0/templates/common.yaml b/charts/dev/android-8-0/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/android-8-0/templates/common.yaml +++ b/charts/dev/android-8-0/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/androiddebugbridge/Chart.yaml b/charts/dev/androiddebugbridge/Chart.yaml index 40bb0ebea1d..e3e5708b40a 100644 --- a/charts/dev/androiddebugbridge/Chart.yaml +++ b/charts/dev/androiddebugbridge/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Control AndroidTV/FireTV devices through ADB from the Home Assistant\ \ Core docker image.\r\n" diff --git a/charts/dev/androiddebugbridge/SCALE/migrations/migrate b/charts/dev/androiddebugbridge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/androiddebugbridge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/androiddebugbridge/templates/common.yaml b/charts/dev/androiddebugbridge/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/androiddebugbridge/templates/common.yaml +++ b/charts/dev/androiddebugbridge/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/anope/Chart.yaml b/charts/dev/anope/Chart.yaml index a222ab8d0cb..e6d88e9a5ce 100644 --- a/charts/dev/anope/Chart.yaml +++ b/charts/dev/anope/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Anope is a set of IRC Services designed for flexibility and ease of\ \ use.\r\n" diff --git a/charts/dev/anope/SCALE/migrations/migrate b/charts/dev/anope/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/anope/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/anope/templates/common.yaml b/charts/dev/anope/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/anope/templates/common.yaml +++ b/charts/dev/anope/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/apache-webdav/Chart.yaml b/charts/dev/apache-webdav/Chart.yaml index 7e4fd73f765..7d1193605e2 100644 --- a/charts/dev/apache-webdav/Chart.yaml +++ b/charts/dev/apache-webdav/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Very simple WebDAV server based on Apache. You need a WebDAV client\ \ to transfer files. It does not include a WebUI to upload files through your browser.\r\ diff --git a/charts/dev/apache-webdav/SCALE/migrations/migrate b/charts/dev/apache-webdav/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/apache-webdav/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/apache-webdav/templates/common.yaml b/charts/dev/apache-webdav/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/apache-webdav/templates/common.yaml +++ b/charts/dev/apache-webdav/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/apprise-api/Chart.yaml b/charts/dev/apprise-api/Chart.yaml index 53a93fdc11c..a8ae67d5bcf 100644 --- a/charts/dev/apprise-api/Chart.yaml +++ b/charts/dev/apprise-api/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Apprise-api(https://github.com/caronc/apprise-api) Takes advantage of Apprise(https://github.com/caronc/apprise) through your network with a user-friendly diff --git a/charts/dev/apprise-api/SCALE/migrations/migrate b/charts/dev/apprise-api/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/apprise-api/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/apprise-api/templates/common.yaml b/charts/dev/apprise-api/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/apprise-api/templates/common.yaml +++ b/charts/dev/apprise-api/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/apt-cacher-ng/Chart.yaml b/charts/dev/apt-cacher-ng/Chart.yaml index 016b1520964..aa0acf4ad86 100644 --- a/charts/dev/apt-cacher-ng/Chart.yaml +++ b/charts/dev/apt-cacher-ng/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Apt-Cacher NG is a caching proxy, specialized for package files from Linux distributors, primarily for Debian (and Debian based) distributions but not diff --git a/charts/dev/apt-cacher-ng/SCALE/migrations/migrate b/charts/dev/apt-cacher-ng/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/apt-cacher-ng/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/apt-cacher-ng/templates/common.yaml b/charts/dev/apt-cacher-ng/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/apt-cacher-ng/templates/common.yaml +++ b/charts/dev/apt-cacher-ng/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/archiveteam-warrior/Chart.yaml b/charts/dev/archiveteam-warrior/Chart.yaml index 8f9d0fc2a9f..8054e7bb23c 100644 --- a/charts/dev/archiveteam-warrior/Chart.yaml +++ b/charts/dev/archiveteam-warrior/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "The Archive Team Warrior is a virtual archiving appliance. You can run\ \ it to help with the Archive Team archiving efforts. It will download sites and\ diff --git a/charts/dev/archiveteam-warrior/SCALE/migrations/migrate b/charts/dev/archiveteam-warrior/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/archiveteam-warrior/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/archiveteam-warrior/templates/common.yaml b/charts/dev/archiveteam-warrior/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/archiveteam-warrior/templates/common.yaml +++ b/charts/dev/archiveteam-warrior/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/arksurvivalevolved/Chart.yaml b/charts/dev/arksurvivalevolved/Chart.yaml index 378262e2781..1411642a8d8 100644 --- a/charts/dev/arksurvivalevolved/Chart.yaml +++ b/charts/dev/arksurvivalevolved/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ ARK:SurvivalEvolved and run it (Normal server startup of ARK can take a long time!).\r\ diff --git a/charts/dev/arksurvivalevolved/SCALE/migrations/migrate b/charts/dev/arksurvivalevolved/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/arksurvivalevolved/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/arksurvivalevolved/templates/common.yaml b/charts/dev/arksurvivalevolved/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/arksurvivalevolved/templates/common.yaml +++ b/charts/dev/arksurvivalevolved/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/arma3/Chart.yaml b/charts/dev/arma3/Chart.yaml index 1e21a604042..f56f4d7844a 100644 --- a/charts/dev/arma3/Chart.yaml +++ b/charts/dev/arma3/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ ArmA III and run it.\r\n" diff --git a/charts/dev/arma3/SCALE/migrations/migrate b/charts/dev/arma3/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/arma3/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/arma3/templates/common.yaml b/charts/dev/arma3/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/arma3/templates/common.yaml +++ b/charts/dev/arma3/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/arma3exilemod/Chart.yaml b/charts/dev/arma3exilemod/Chart.yaml index 339fa516de7..7c65e66e70c 100644 --- a/charts/dev/arma3exilemod/Chart.yaml +++ b/charts/dev/arma3exilemod/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ ArmA III including ExileMod and run it.\r\n" diff --git a/charts/dev/arma3exilemod/SCALE/migrations/migrate b/charts/dev/arma3exilemod/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/arma3exilemod/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/arma3exilemod/templates/common.yaml b/charts/dev/arma3exilemod/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/arma3exilemod/templates/common.yaml +++ b/charts/dev/arma3exilemod/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/artifactory-oss/Chart.yaml b/charts/dev/artifactory-oss/Chart.yaml index 88b8c90aca6..4cd4c35e291 100644 --- a/charts/dev/artifactory-oss/Chart.yaml +++ b/charts/dev/artifactory-oss/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "7.38.10" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "JFrog\u2019s Artifactory open source project was created to speed up\ \ development cycles using binary repositories. It\u2019s the world\u2019s most\ diff --git a/charts/dev/artifactory-oss/SCALE/migrations/migrate b/charts/dev/artifactory-oss/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/artifactory-oss/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/artifactory-oss/templates/common.yaml b/charts/dev/artifactory-oss/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/artifactory-oss/templates/common.yaml +++ b/charts/dev/artifactory-oss/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/assettocorsa/Chart.yaml b/charts/dev/assettocorsa/Chart.yaml index a0650dcc4d2..bc8fb3455b0 100644 --- a/charts/dev/assettocorsa/Chart.yaml +++ b/charts/dev/assettocorsa/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ AssettoCorsa and run it.\r\n" diff --git a/charts/dev/assettocorsa/SCALE/migrations/migrate b/charts/dev/assettocorsa/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/assettocorsa/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/assettocorsa/templates/common.yaml b/charts/dev/assettocorsa/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/assettocorsa/templates/common.yaml +++ b/charts/dev/assettocorsa/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/atd/Chart.yaml b/charts/dev/atd/Chart.yaml index decc5bfe6b0..fb3eafdc9e7 100644 --- a/charts/dev/atd/Chart.yaml +++ b/charts/dev/atd/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: '[b][u][span style=''color: #E80000;'']NOT FOR PUBLIC USE YET...[/span][/u][/b][br][br]Automated Tidal Downloader :: This script will automatically archive music using a popular diff --git a/charts/dev/atd/SCALE/migrations/migrate b/charts/dev/atd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/atd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/atd/templates/common.yaml b/charts/dev/atd/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/atd/templates/common.yaml +++ b/charts/dev/atd/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/aurora-files/Chart.yaml b/charts/dev/aurora-files/Chart.yaml index 72fd56c610e..cbf57444666 100644 --- a/charts/dev/aurora-files/Chart.yaml +++ b/charts/dev/aurora-files/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "DESCRIPTION\r\n" home: https://github.com/truecharts/apps/tree/master/charts/dev/aurora-files diff --git a/charts/dev/aurora-files/SCALE/migrations/migrate b/charts/dev/aurora-files/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/aurora-files/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/aurora-files/templates/common.yaml b/charts/dev/aurora-files/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/aurora-files/templates/common.yaml +++ b/charts/dev/aurora-files/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/auto-yt-dl/Chart.yaml b/charts/dev/auto-yt-dl/Chart.yaml index ea0d1dbbd8e..4e92b7b1c9f 100644 --- a/charts/dev/auto-yt-dl/Chart.yaml +++ b/charts/dev/auto-yt-dl/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: auto-yt-dl is used to automatically download new Videos of specific YouTube Channels. It features a Web Gui to add and remove Channels from your watch list. diff --git a/charts/dev/auto-yt-dl/SCALE/migrations/migrate b/charts/dev/auto-yt-dl/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/auto-yt-dl/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/auto-yt-dl/templates/common.yaml b/charts/dev/auto-yt-dl/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/auto-yt-dl/templates/common.yaml +++ b/charts/dev/auto-yt-dl/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/autoscan/Chart.yaml b/charts/dev/autoscan/Chart.yaml index b5373471708..a1a1725ade4 100644 --- a/charts/dev/autoscan/Chart.yaml +++ b/charts/dev/autoscan/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Autoscan replaces the default Plex and Emby behaviour for picking up file changes on the file system. Autoscan integrates with Sonarr, Radarr and Lidarr diff --git a/charts/dev/autoscan/SCALE/migrations/migrate b/charts/dev/autoscan/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/autoscan/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/autoscan/templates/common.yaml b/charts/dev/autoscan/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/autoscan/templates/common.yaml +++ b/charts/dev/autoscan/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/avorion/Chart.yaml b/charts/dev/avorion/Chart.yaml index 4187c658543..8cae58cec2a 100644 --- a/charts/dev/avorion/Chart.yaml +++ b/charts/dev/avorion/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ Avorion and run it.\r\n" diff --git a/charts/dev/avorion/SCALE/migrations/migrate b/charts/dev/avorion/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/avorion/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/avorion/templates/common.yaml b/charts/dev/avorion/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/avorion/templates/common.yaml +++ b/charts/dev/avorion/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/backuppc/Chart.yaml b/charts/dev/backuppc/Chart.yaml index 878c8f6a684..228da73044e 100644 --- a/charts/dev/backuppc/Chart.yaml +++ b/charts/dev/backuppc/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: BackupPC is a high-performance, enterprise-grade system for backing up Linux, Windows and macOS PCs and laptops to a server's disk. diff --git a/charts/dev/backuppc/SCALE/migrations/migrate b/charts/dev/backuppc/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/backuppc/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/backuppc/templates/common.yaml b/charts/dev/backuppc/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/backuppc/templates/common.yaml +++ b/charts/dev/backuppc/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/baikal/Chart.yaml b/charts/dev/baikal/Chart.yaml index 53f8b261f3d..21408183243 100644 --- a/charts/dev/baikal/Chart.yaml +++ b/charts/dev/baikal/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "nginx" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Ba\xEFkal is a lightweight CalDAV+CardDAV server" home: https://github.com/truecharts/apps/tree/master/charts/dev/baikal diff --git a/charts/dev/baikal/SCALE/migrations/migrate b/charts/dev/baikal/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/baikal/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/baikal/templates/common.yaml b/charts/dev/baikal/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/baikal/templates/common.yaml +++ b/charts/dev/baikal/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/barcodebuddy/Chart.yaml b/charts/dev/barcodebuddy/Chart.yaml index 42b0baec277..6becd5bbaa2 100644 --- a/charts/dev/barcodebuddy/Chart.yaml +++ b/charts/dev/barcodebuddy/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "<b>Barcode Buddy is a Grocy companion app/plugin, which allows\ \ you to install the Barcode Buddy app and scan products directly to your Grocy\ diff --git a/charts/dev/barcodebuddy/SCALE/migrations/migrate b/charts/dev/barcodebuddy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/barcodebuddy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/barcodebuddy/templates/common.yaml b/charts/dev/barcodebuddy/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/barcodebuddy/templates/common.yaml +++ b/charts/dev/barcodebuddy/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/barotrauma/Chart.yaml b/charts/dev/barotrauma/Chart.yaml index 74a699a5d46..3e759c323a3 100644 --- a/charts/dev/barotrauma/Chart.yaml +++ b/charts/dev/barotrauma/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ Barotrauma and run it.\r\n" diff --git a/charts/dev/barotrauma/SCALE/migrations/migrate b/charts/dev/barotrauma/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/barotrauma/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/barotrauma/templates/common.yaml b/charts/dev/barotrauma/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/barotrauma/templates/common.yaml +++ b/charts/dev/barotrauma/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/bitcoin-node/Chart.yaml b/charts/dev/bitcoin-node/Chart.yaml index 36808ef5722..1e7e641c388 100644 --- a/charts/dev/bitcoin-node/Chart.yaml +++ b/charts/dev/bitcoin-node/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "DESCRIPTION\r\n" home: https://github.com/truecharts/apps/tree/master/charts/dev/bitcoin-node diff --git a/charts/dev/bitcoin-node/SCALE/migrations/migrate b/charts/dev/bitcoin-node/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/bitcoin-node/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/bitcoin-node/templates/common.yaml b/charts/dev/bitcoin-node/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/bitcoin-node/templates/common.yaml +++ b/charts/dev/bitcoin-node/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/bitcoind/Chart.yaml b/charts/dev/bitcoind/Chart.yaml index fab997973c1..95e9924e087 100644 --- a/charts/dev/bitcoind/Chart.yaml +++ b/charts/dev/bitcoind/Chart.yaml @@ -10,7 +10,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Support the Bitcoin network by hosting your own node! This template provides a full Bitcoin Core node, built in a verifiably trustless way. diff --git a/charts/dev/bitcoind/SCALE/migrations/migrate b/charts/dev/bitcoind/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/bitcoind/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/bitcoind/templates/common.yaml b/charts/dev/bitcoind/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/bitcoind/templates/common.yaml +++ b/charts/dev/bitcoind/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/bitcoinunlimited/Chart.yaml b/charts/dev/bitcoinunlimited/Chart.yaml index c3913c632a3..ad2bfcff3b2 100644 --- a/charts/dev/bitcoinunlimited/Chart.yaml +++ b/charts/dev/bitcoinunlimited/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "The Bitcoin Unlimited project seeks to provide a voice to all stakeholders\ \ in the Bitcoin ecosystem.\r\n" diff --git a/charts/dev/bitcoinunlimited/SCALE/migrations/migrate b/charts/dev/bitcoinunlimited/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/bitcoinunlimited/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/bitcoinunlimited/templates/common.yaml b/charts/dev/bitcoinunlimited/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/bitcoinunlimited/templates/common.yaml +++ b/charts/dev/bitcoinunlimited/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/bitcoinwalletgui/Chart.yaml b/charts/dev/bitcoinwalletgui/Chart.yaml index ba9cc4c6b6c..829aa793339 100644 --- a/charts/dev/bitcoinwalletgui/Chart.yaml +++ b/charts/dev/bitcoinwalletgui/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: 'Bitcoin wallet with GUI over VNC and NoVNC. diff --git a/charts/dev/bitcoinwalletgui/SCALE/migrations/migrate b/charts/dev/bitcoinwalletgui/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/bitcoinwalletgui/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/bitcoinwalletgui/templates/common.yaml b/charts/dev/bitcoinwalletgui/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/bitcoinwalletgui/templates/common.yaml +++ b/charts/dev/bitcoinwalletgui/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/blender-desktop-g3/Chart.yaml b/charts/dev/blender-desktop-g3/Chart.yaml index 71b61b6721f..458bfa03669 100644 --- a/charts/dev/blender-desktop-g3/Chart.yaml +++ b/charts/dev/blender-desktop-g3/Chart.yaml @@ -11,7 +11,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "DESCRIPTION\r\n" home: https://github.com/truecharts/apps/tree/master/charts/dev/blender-desktop-g3 diff --git a/charts/dev/blender-desktop-g3/SCALE/migrations/migrate b/charts/dev/blender-desktop-g3/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/blender-desktop-g3/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/blender-desktop-g3/templates/common.yaml b/charts/dev/blender-desktop-g3/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/blender-desktop-g3/templates/common.yaml +++ b/charts/dev/blender-desktop-g3/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/blender/Chart.yaml b/charts/dev/blender/Chart.yaml index e63e9fa045a..a8a06c42ce3 100644 --- a/charts/dev/blender/Chart.yaml +++ b/charts/dev/blender/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Blender(https://www.blender.org/) is a free and open-source 3D computer graphics software toolset used for creating animated films, visual effects, art, diff --git a/charts/dev/blender/SCALE/migrations/migrate b/charts/dev/blender/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/blender/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/blender/templates/common.yaml b/charts/dev/blender/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/blender/templates/common.yaml +++ b/charts/dev/blender/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/breitbandmessung-de/Chart.yaml b/charts/dev/breitbandmessung-de/Chart.yaml index 2ac0ea96e6c..332a5ffdf26 100644 --- a/charts/dev/breitbandmessung-de/Chart.yaml +++ b/charts/dev/breitbandmessung-de/Chart.yaml @@ -12,7 +12,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "A script to enable customers of lazy ISPs to perform measurement campaigns\ \ of the connection speed as described here in an automated way.\r\n" diff --git a/charts/dev/breitbandmessung-de/SCALE/migrations/migrate b/charts/dev/breitbandmessung-de/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/breitbandmessung-de/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/breitbandmessung-de/templates/common.yaml b/charts/dev/breitbandmessung-de/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/breitbandmessung-de/templates/common.yaml +++ b/charts/dev/breitbandmessung-de/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/btdex/Chart.yaml b/charts/dev/btdex/Chart.yaml index 34edcbb9b6f..4889a649742 100644 --- a/charts/dev/btdex/Chart.yaml +++ b/charts/dev/btdex/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: This is a Docker container for BTDEX based on jlesage/docker-baseimage-gui Docker image. diff --git a/charts/dev/btdex/SCALE/migrations/migrate b/charts/dev/btdex/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/btdex/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/btdex/templates/common.yaml b/charts/dev/btdex/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/btdex/templates/common.yaml +++ b/charts/dev/btdex/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/bwapp/Chart.yaml b/charts/dev/bwapp/Chart.yaml index d05ebf9840f..5827f3748e5 100644 --- a/charts/dev/bwapp/Chart.yaml +++ b/charts/dev/bwapp/Chart.yaml @@ -9,7 +9,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "bWAPP, or a buggy web application, is a free and open source deliberately\ \ insecure web application.\r\n" diff --git a/charts/dev/bwapp/SCALE/migrations/migrate b/charts/dev/bwapp/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/bwapp/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/bwapp/templates/common.yaml b/charts/dev/bwapp/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/bwapp/templates/common.yaml +++ b/charts/dev/bwapp/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/dev/comixed/SCALE/migrations/migrate b/charts/dev/comixed/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/comixed/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/server-7daystodie/Chart.yaml b/charts/dev/server-7daystodie/Chart.yaml index 178665a043f..280adcf309d 100644 --- a/charts/dev/server-7daystodie/Chart.yaml +++ b/charts/dev/server-7daystodie/Chart.yaml @@ -8,7 +8,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "This Docker will download and install SteamCMD. It will also install\ \ 7 Days to Die and run it.\r\n" diff --git a/charts/dev/server-7daystodie/SCALE/migrations/migrate b/charts/dev/server-7daystodie/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/dev/server-7daystodie/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/dev/server-7daystodie/templates/common.yaml b/charts/dev/server-7daystodie/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/dev/server-7daystodie/templates/common.yaml +++ b/charts/dev/server-7daystodie/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/impostor-server/templates/common.yaml b/charts/games/impostor-server/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/games/impostor-server/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/games/minecraft-bedrock/templates/common.yaml b/charts/games/minecraft-bedrock/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/games/minecraft-bedrock/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/games/minecraft-java/templates/common.yaml b/charts/games/minecraft-java/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/games/minecraft-java/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/games/minetest/templates/common.yaml b/charts/games/minetest/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/games/minetest/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/games/satisfactory/templates/common.yaml b/charts/games/satisfactory/templates/common.yaml deleted file mode 100644 index a6613c2ce21..00000000000 --- a/charts/games/satisfactory/templates/common.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.all" . }} diff --git a/charts/games/valheim/CONFIG.md b/charts/games/valheim/CONFIG.md deleted file mode 100644 index c147b7c819c..00000000000 --- a/charts/games/valheim/CONFIG.md +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration Options - -##### Connecting to other apps -If you need to connect this App to other Apps on TrueNAS SCALE, please refer to our [Linking Apps Internally](https://truecharts.org/manual/Quick-Start%20Guides/06-linking-apps/) quick-start guide. - -##### Available config options -In the future this page is going to contain an automated list of options available in the installation/edit UI. diff --git a/charts/incubator/adguard-home/Chart.yaml b/charts/incubator/adguard-home/Chart.yaml index 686e34431da..7a3ef296835 100644 --- a/charts/incubator/adguard-home/Chart.yaml +++ b/charts/incubator/adguard-home/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.107.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Free and open source, powerful network-wide ads & trackers blocking DNS server. home: https://github.com/truecharts/apps/tree/master/charts/incubator/adguard-home icon: https://truecharts.org/_static/img/appicons/adguard-home.png @@ -18,7 +18,7 @@ maintainers: name: adguard-home sources: - https://hub.docker.com/r/adguard/adguardhome -version: 0.0.9 +version: 1.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/adguard-home/SCALE/migrations/migrate b/charts/incubator/adguard-home/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/adguard-home/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/adguard-home/templates/common.yaml b/charts/incubator/adguard-home/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/adguard-home/templates/common.yaml +++ b/charts/incubator/adguard-home/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/appsmith/Chart.yaml b/charts/incubator/appsmith/Chart.yaml index b514def552d..01c5c58248f 100644 --- a/charts/incubator/appsmith/Chart.yaml +++ b/charts/incubator/appsmith/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.7.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: redis.enabled name: redis repository: https://charts.truecharts.org @@ -25,7 +25,7 @@ maintainers: name: appsmith sources: - https://github.com/appsmithorg/appsmith -version: 0.0.16 +version: 1.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/appsmith/SCALE/migrations/migrate b/charts/incubator/appsmith/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/appsmith/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/appsmith/templates/common.yaml b/charts/incubator/appsmith/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/appsmith/templates/common.yaml +++ b/charts/incubator/appsmith/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/appsmith/values.yaml b/charts/incubator/appsmith/values.yaml index 651b33e8c97..d7afae2dcc7 100644 --- a/charts/incubator/appsmith/values.yaml +++ b/charts/incubator/appsmith/values.yaml @@ -13,6 +13,10 @@ podSecurityContext: env: APPSMITH_ADMIN_EMAILS: "me@example.com,you@example.com" + APPSMITH_REDIS_URL: + secretKeyRef: + name: rediscreds + key: url service: main: @@ -33,15 +37,6 @@ persistence: enabled: true mountPath: "/appsmith-stacks" -envValueFrom: - # APPSMITH_MONGODB_URI: - # secretKeyRef: - # name: mongodbcreds - # key: url - APPSMITH_REDIS_URL: - secretKeyRef: - name: rediscreds - key: url redis: enabled: true diff --git a/charts/incubator/authentik/Chart.yaml b/charts/incubator/authentik/Chart.yaml index ac5c5be390b..68b4ff8f161 100644 --- a/charts/incubator/authentik/Chart.yaml +++ b/charts/incubator/authentik/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.5.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ name: authentik sources: - https://github.com/goauthentik/authentik - https://goauthentik.io/docs/ -version: 0.0.14 +version: 1.0.0 annotations: truecharts.org/catagories: | - authentication diff --git a/charts/incubator/authentik/SCALE/migrations/migrate b/charts/incubator/authentik/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/authentik/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/authentik/questions.yaml b/charts/incubator/authentik/questions.yaml index d13924d988a..2068cf4e929 100644 --- a/charts/incubator/authentik/questions.yaml +++ b/charts/incubator/authentik/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/incubator/authentik/templates/_cronjob.tpl b/charts/incubator/authentik/templates/_cronjob.tpl index d8129700975..2d0293c794f 100644 --- a/charts/incubator/authentik/templates/_cronjob.tpl +++ b/charts/incubator/authentik/templates/_cronjob.tpl @@ -1,6 +1,6 @@ {{/* Define the cronjob */}} {{- define "authentik.cronjob" -}} -{{- $jobName := include "common.names.fullname" . }} +{{- $jobName := include "tc.common.names.fullname" . }} --- apiVersion: batch/v1beta1 @@ -8,7 +8,7 @@ kind: CronJob metadata: name: {{ printf "%s-cronjob" $jobName }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} spec: schedule: "0 */{{ .Values.geoip.freqhours }} * * *" concurrencyPolicy: Forbid @@ -25,7 +25,7 @@ spec: metadata: spec: restartPolicy: Never - {{- with (include "common.controller.volumes" . | trim) }} + {{- with (include "tc.common.controller.volumes" . | trim) }} volumes: {{- nindent 12 . }} {{- end }} diff --git a/charts/incubator/authentik/templates/common.yaml b/charts/incubator/authentik/templates/common.yaml index d2efa6c4e25..ca3fd554674 100644 --- a/charts/incubator/authentik/templates/common.yaml +++ b/charts/incubator/authentik/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for authentik */}} {{- include "authentik.secrets" . }} @@ -10,4 +10,4 @@ {{- end -}} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/incubator/authentik/values.yaml b/charts/incubator/authentik/values.yaml index 7a92716b687..9871415518e 100644 --- a/charts/incubator/authentik/values.yaml +++ b/charts/incubator/authentik/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/authentik - tag: v2022.5.3@sha256:6554918741c64fceede79acac5f78c4753613b21cf11c62225490638ba94196b + tag: v2022.6.1@sha256:4821678221ccdaa264a9b669e964e1810a476420932f3734504d6cf259ebcc08 pullPolicy: IfNotPresent geoipImage: @@ -14,7 +14,7 @@ podSecurityContext: runAsUser: 1000 runAsGroup: 1000 -secret: +secretEnv: AK_ADMIN_PASS: "supersecret" AK_ADMIN_TOKEN: "supersecretapitoken" @@ -45,8 +45,6 @@ env: AUTHENTIK_EMAIL__USE_SSL: false AUTHENTIK_EMAIL__TIMEOUT: 10 AUTHENTIK_EMAIL__FROM: "" - -envValueFrom: AUTHENTIK_POSTGRESQL__HOST: secretKeyRef: name: dbcreds diff --git a/charts/incubator/cups-server/Chart.yaml b/charts/incubator/cups-server/Chart.yaml index 59fc0fa12a2..3d3a009c46c 100644 --- a/charts/incubator/cups-server/Chart.yaml +++ b/charts/incubator/cups-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: CUPS printing server home: https://github.com/truecharts/apps/tree/master/charts/incubator/cups-server icon: https://truecharts.org/_static/img/appicons/cups-server.png @@ -18,7 +18,7 @@ maintainers: name: cups-server sources: - https://hub.docker.com/r/ydkn/cups -version: 0.0.11 +version: 1.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/cups-server/SCALE/migrations/migrate b/charts/incubator/cups-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/cups-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/cups-server/questions.yaml b/charts/incubator/cups-server/questions.yaml index 857fa472fdc..2e15582f7f6 100644 --- a/charts/incubator/cups-server/questions.yaml +++ b/charts/incubator/cups-server/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/incubator/cups-server/templates/common.yaml b/charts/incubator/cups-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/cups-server/templates/common.yaml +++ b/charts/incubator/cups-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/cups-server/values.yaml b/charts/incubator/cups-server/values.yaml index 7171825fc65..0387a4a8ac0 100644 --- a/charts/incubator/cups-server/values.yaml +++ b/charts/incubator/cups-server/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/cups-server - tag: latest@sha256:f8dd7aab4918c4a4b0ff4dedfed1d9bc55919392066eed8e74327d82427ae4e2 + tag: latest@sha256:a32b021b8da8d0a19883b1ac3f274c8f6be3ad97a486c5134250682301ab31ef pullPolicy: IfNotPresent securityContext: @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: ADMIN_PASSWORD: "secretpass" service: diff --git a/charts/incubator/fancyindex/Chart.yaml b/charts/incubator/fancyindex/Chart.yaml index d0908453b19..a881b8ccd03 100644 --- a/charts/incubator/fancyindex/Chart.yaml +++ b/charts/incubator/fancyindex/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: fancyindex -version: 0.0.6 +version: 1.0.0 appVersion: "latest" description: Fancyindex provides a lightweight nginx directory listing with theming support type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 maintainers: - email: info@truecharts.org name: TrueCharts diff --git a/charts/incubator/fancyindex/SCALE/migrations/migrate b/charts/incubator/fancyindex/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/fancyindex/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/fancyindex/SCALE/migrations/migrate_from_0.0.60 b/charts/incubator/fancyindex/SCALE/migrations/migrate_from_0.0.60 new file mode 100644 index 00000000000..b1485990d75 --- /dev/null +++ b/charts/incubator/fancyindex/SCALE/migrations/migrate_from_0.0.60 @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + 'secretEnv': values.get('secret'), + 'secret': {} + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/fancyindex/questions.yaml b/charts/incubator/fancyindex/questions.yaml index ca679ca3b6b..356e73e87d0 100644 --- a/charts/incubator/fancyindex/questions.yaml +++ b/charts/incubator/fancyindex/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/incubator/fancyindex/templates/common.yaml b/charts/incubator/fancyindex/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/fancyindex/templates/common.yaml +++ b/charts/incubator/fancyindex/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/fancyindex/values.yaml b/charts/incubator/fancyindex/values.yaml index dc2f5bff74e..a3b8d788d31 100644 --- a/charts/incubator/fancyindex/values.yaml +++ b/charts/incubator/fancyindex/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: WEBUSER: "webuser" WEBPASSWORD: "webpassword" diff --git a/charts/incubator/filerun/Chart.yaml b/charts/incubator/filerun/Chart.yaml index 03471be23e6..10d2a420152 100644 --- a/charts/incubator/filerun/Chart.yaml +++ b/charts/incubator/filerun/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: filerun sources: - https://hub.docker.com/r/filerun/filerun - https://github.com/filerun/docker -version: 0.0.17 +version: 1.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/filerun/SCALE/migrations/migrate b/charts/incubator/filerun/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/filerun/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/filerun/templates/common.yaml b/charts/incubator/filerun/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/filerun/templates/common.yaml +++ b/charts/incubator/filerun/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/filerun/values.yaml b/charts/incubator/filerun/values.yaml index 593cab8780e..5bd0cc17485 100644 --- a/charts/incubator/filerun/values.yaml +++ b/charts/incubator/filerun/values.yaml @@ -15,8 +15,6 @@ env: FR_DB_NAME: "filerun" FR_DB_USER: "filerun" FR_DB_PORT: "3306" - -envValueFrom: FR_DB_HOST: secretKeyRef: name: mariadbcreds diff --git a/charts/incubator/frigate/Chart.yaml b/charts/incubator/frigate/Chart.yaml index 8d36a74da14..23b9fc9401f 100644 --- a/charts/incubator/frigate/Chart.yaml +++ b/charts/incubator/frigate/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "idia" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: NVR With Realtime Object Detection for IP Cameras home: https://github.com/truecharts/apps/tree/master/charts/incubator/frigate @@ -23,7 +23,7 @@ sources: - https://github.com/blakeblackshear/frigate - https://hub.docker.com/r/blakeblackshear/frigate type: application -version: 1.0.19 +version: 2.0.0 annotations: truecharts.org/catagories: | - nvr diff --git a/charts/incubator/frigate/SCALE/migrations/migrate b/charts/incubator/frigate/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/frigate/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/frigate/templates/common.yaml b/charts/incubator/frigate/templates/common.yaml index 9999dfc637a..b9e7208f382 100644 --- a/charts/incubator/frigate/templates/common.yaml +++ b/charts/incubator/frigate/templates/common.yaml @@ -1,17 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} - -{{/* Append the configMap volume to the volumes */}} -{{- define "frigate.configVolume" -}} -enabled: "true" -mountPath: "/config/config.yml" -subPath: "config.yml" -type: "custom" -volumeSpec: - configMap: - name: {{ template "common.names.fullname" . }}-config -{{- end -}} -{{- $_ := set .Values.persistence "frigate-config" (include "frigate.configVolume" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/incubator/frigate/templates/configmap.yaml b/charts/incubator/frigate/templates/configmap.yaml deleted file mode 100644 index c114333a88c..00000000000 --- a/charts/incubator/frigate/templates/configmap.yaml +++ /dev/null @@ -1,396 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - config.yml: | - mqtt: - # Required: host name - host: {{ .Values.frigate.mqtt.host }} - # Optional: port (default: shown below) - port: {{ .Values.frigate.mqtt.port }} - # Optional: topic prefix (default: shown below) - # NOTE: must be unique if you are running multiple instances - topic_prefix: frigate - # Optional: client id (default: shown below) - # NOTE: must be unique if you are running multiple instances - client_id: frigate -{{- if .Values.frigate.mqtt.authenticated }} - user: {{ .Values.frigate.mqtt.username }} - password: {{ .Values.frigate.mqtt.password }} - # Optional: user - # user: mqtt_user - # Optional: password - # NOTE: MQTT password can be specified with an environment variables that must begin with 'FRIGATE_'. - # e.g. password: '{FRIGATE_MQTT_PASSWORD}' - # password: password -{{- end }} - # Optional: tls_ca_certs for enabling TLS using self-signed certs (default: None) - # tls_ca_certs: /path/to/ca.crt - # Optional: tls_client_cert and tls_client key in order to use self-signed client - # certificates (default: None) - # NOTE: certificate must not be password-protected - # do not set user and password when using a client certificate - # tls_client_cert: /path/to/client.crt - # tls_client_key: /path/to/client.key - # Optional: tls_insecure (true/false) for enabling TLS verification of - # the server hostname in the server certificate (default: None) - # tls_insecure: false - # Optional: interval in seconds for publishing stats (default: shown below) - stats_interval: 60 - - # Optional: Detectors configuration. Defaults to a single CPU detector - detectors: - # Required: name of the detector -{{- if .Values.persistence.coral }} -{{- if .Values.persistence.coral.enabled }} - coral: - # Required: type of the detector - # Valid values are 'edgetpu' (requires device property below) and 'cpu'. - type: edgetpu - # Optional: device name as defined here: https://coral.ai/docs/edgetpu/multiple-edgetpu/#using-the-tensorflow-lite-python-api - device: usb -{{- else }} - cpu1: - type: cpu - # Optional: num_threads value passed to the tflite.Interpreter (default: shown below) - # This value is only used for CPU types - num_threads: 2 -{{- end }} -{{- end }} - - - # Optional: Database configuration - # database: - # The path to store the SQLite DB (default: shown below) - # path: /media/frigate/frigate.db - - # Optional: model modifications - # model: - # Optional: path to the model (default: automatic based on detector) - # path: /edgetpu_model.tflite - # Optional: path to the labelmap (default: shown below) - # labelmap_path: /labelmap.txt - # Required: Object detection model input width (default: shown below) - # width: 320 - # Required: Object detection model input height (default: shown below) - # height: 240 - # Optional: Label name modifications. These are merged into the standard labelmap. - # labelmap: - # 2: vehicle - - # Optional: logger verbosity settings - logger: - # Optional: Default log verbosity (default: shown below) - default: info - # Optional: Component specific logger overrides - # logs: - # frigate.event: info - - # Optional: set environment variables - # environment_vars: - # EXAMPLE_VAR: value - - # Optional: birdseye configuration - birdseye: - # Optional: Enable birdseye view (default: shown below) - enabled: {{ .Values.frigate.birdseye.enabled }} - # Optional: Width of the output resolution (default: shown below) - width: 1280 - # Optional: Height of the output resolution (default: shown below) - height: 720 - # Optional: Encoding quality of the mpeg1 feed (default: shown below) - # 1 is the highest quality, and 31 is the lowest. Lower quality feeds utilize less CPU resources. - quality: 8 - # Optional: Mode of the view. Available options are: objects, motion, and continuous - # objects - cameras are included if they have had a tracked object within the last 30 seconds - # motion - cameras are included if motion was detected in the last 30 seconds - # continuous - all cameras are included always - mode: {{ .Values.frigate.birdseye.mode }} - - # Optional: ffmpeg configuration - ffmpeg: - # Optional: global ffmpeg args (default: shown below) warning instead of debug - global_args: -hide_banner -loglevel debug - # Optional: global hwaccel args (default: shown below) - # NOTE: See hardware acceleration docs for your specific device - # hwaccel_args: [] - # Optional: global input args (default: shown below) - # input_args: -avoid_negative_ts make_zero -fflags +genpts+discardcorrupt -rtsp_transport tcp -stimeout 5000000 -use_wallclock_as_timestamps 1 - # Optional: global output args - # output_args: - # Optional: output args for detect streams (default: shown below) - # detect: -f rawvideo -pix_fmt yuv420p - # Optional: output args for record streams (default: shown below) - # record: -f segment -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c copy -an - # Optional: output args for rtmp streams (default: shown below) - # rtmp: -c copy -f flv - - # Optional: Detect configuration - # NOTE: Can be overridden at the camera level - detect: - # Optional: width of the frame for the input with the detect role (default: shown below) - width: 1280 - # Optional: height of the frame for the input with the detect role (default: shown below) - height: 720 - # Optional: desired fps for your camera for the input with the detect role (default: shown below) - # NOTE: Recommended value of 5. Ideally, try and reduce your FPS on the camera. - fps: 5 - # Optional: enables detection for the camera (default: True) - # This value can be set via MQTT and will be updated in startup based on retained value - enabled: True - # Optional: Number of frames without a detection before frigate considers an object to be gone. (default: 5x the frame rate) - # max_disappeared: 25 - # Optional: Frequency for running detection on stationary objects (default: 10x the frame rate) - # stationary_interval: 50 - - # Optional: Object configuration - # NOTE: Can be overridden at the camera level - objects: - # Optional: list of objects to track from labelmap.txt (default: shown below) - track: - - person - - car - - motorcyle - - cat - - dog - # Optional: mask to prevent all object types from being detected in certain areas (default: no mask) - # Checks based on the bottom center of the bounding box of the object. - # NOTE: This mask is COMBINED with the object type specific mask below - # mask: 0,0,1000,0,1000,200,0,200 - # Optional: filters to reduce false positives for specific object types - filters: - person: - # Optional: minimum width*height of the bounding box for the detected object (default: 0) - min_area: 5000 - # Optional: maximum width*height of the bounding box for the detected object (default: 24000000) - max_area: 100000 - # Optional: minimum score for the object to initiate tracking (default: shown below) - # min_score: 0.5 - # Optional: minimum decimal percentage for tracked object's computed score to be considered a true positive (default: shown below) - # threshold: 0.7 - # Optional: mask to prevent this object type from being detected in certain areas (default: no mask) - # Checks based on the bottom center of the bounding box of the object - # mask: 0,0,1000,0,1000,200,0,200 - - # Optional: Motion configuration - # NOTE: Can be overridden at the camera level - motion: - # Optional: The threshold passed to cv2.threshold to determine if a pixel is different enough to be counted as motion. (default: shown below) - # Increasing this value will make motion detection less sensitive and decreasing it will make motion detection more sensitive. - # The value should be between 1 and 255. - # threshold: 25 - # Optional: Minimum size in pixels in the resized motion image that counts as motion (default: 30) - # Increasing this value will prevent smaller areas of motion from being detected. Decreasing will - # make motion detection more sensitive to smaller moving objects. - # As a rule of thumb: - # - 15 - high sensitivity - # - 30 - medium sensitivity - # - 50 - low sensitivity - contour_area: 30 - # Optional: Alpha value passed to cv2.accumulateWeighted when averaging the motion delta across multiple frames (default: shown below) - # Higher values mean the current frame impacts the delta a lot, and a single raindrop may register as motion. - # Too low and a fast moving person wont be detected as motion. - # delta_alpha: 0.2 - # Optional: Alpha value passed to cv2.accumulateWeighted when averaging frames to determine the background (default: shown below) - # Higher values mean the current frame impacts the average a lot, and a new object will be averaged into the background faster. - # Low values will cause things like moving shadows to be detected as motion for longer. - # https://www.geeksforgeeks.org/background-subtraction-in-an-image-using-concept-of-running-average/ - # frame_alpha: 0.2 - # Optional: Height of the resized motion frame (default: 50) - # This operates as an efficient blur alternative. Higher values will result in more granular motion detection at the expense - # of higher CPU usage. Lower values result in less CPU, but small changes may not register as motion. - # frame_height: 50 - # Optional: motion mask - # NOTE: see docs for more detailed info on creating masks - # mask: 0,900,1080,900,1080,1920,0,1920 - - # Optional: Record configuration - # NOTE: Can be overridden at the camera level - record: - # Optional: Enable recording (default: shown below) - enabled: False - # Optional: Retention settings for recording - retain: - # Optional: Number of days to retain recordings regardless of events (default: shown below) - # NOTE: This should be set to 0 and retention should be defined in events section below - # if you only want to retain recordings of events. - days: 7 - # Optional: Mode for retention. Available options are: all, motion, and active_objects - # all - save all recording segments regardless of activity - # motion - save all recordings segments with any detected motion - # active_objects - save all recording segments with active/moving objects - # NOTE: this mode only applies when the days setting above is greater than 0 - mode: motion - # Optional: Event recording settings - events: - # Optional: Maximum length of time to retain video during long events. (default: shown below) - # NOTE: If an object is being tracked for longer than this amount of time, the retained recordings - # will be the last x seconds of the event unless retain->days under record is > 0. - max_seconds: 300 - # Optional: Number of seconds before the event to include (default: shown below) - pre_capture: 5 - # Optional: Number of seconds after the event to include (default: shown below) - post_capture: 5 - # Optional: Objects to save recordings for. (default: all tracked objects) - # objects: - # - person - # Optional: Restrict recordings to objects that entered any of the listed zones (default: no required zones) - # required_zones: [] - # Optional: Retention settings for recordings of events - retain: - # Required: Default retention days (default: shown below) - default: 14 - # Optional: Mode for retention. (default: shown below) - # all - save all recording segments for events regardless of activity - # motion - save all recordings segments for events with any detected motion - # active_objects - save all recording segments for event with active/moving objects - # - # NOTE: If the retain mode for the camera is more restrictive than the mode configured - # here, the segments will already be gone by the time this mode is applied. - # For example, if the camera retain mode is "motion", the segments without motion are - # never stored, so setting the mode to "all" here won't bring them back. - mode: active_objects - # Optional: Per object retention days - # objects: - # person: 15 - - # Optional: Configuration for the jpg snapshots written to the clips directory for each event - # NOTE: Can be overridden at the camera level - snapshots: - # Optional: Enable writing jpg snapshot to /media/frigate/clips (default: shown below) - # This value can be set via MQTT and will be updated in startup based on retained value - enabled: False - # Optional: print a timestamp on the snapshots (default: shown below) - # timestamp: False - # Optional: draw bounding box on the snapshots (default: shown below) - # bounding_box: False - # Optional: crop the snapshot (default: shown below) - # crop: False - # Optional: height to resize the snapshot to (default: original size) - # height: 175 - # Optional: Restrict snapshots to objects that entered any of the listed zones (default: no required zones) - required_zones: [] - # Optional: Camera override for retention settings (default: global values) - retain: - # Required: Default retention days (default: shown below) - default: 10 - # Optional: Per object retention days - objects: - person: 15 - - # Optional: RTMP configuration - # NOTE: Can be overridden at the camera level - rtmp: - # Optional: Enable the RTMP stream (default: True) - enabled: True - - # Optional: Live stream configuration for WebUI - # NOTE: Can be overridden at the camera level - live: - # Optional: Set the height of the live stream. (default: 720) - # This must be less than or equal to the height of the detect stream. Lower resolutions - # reduce bandwidth required for viewing the live stream. Width is computed to match known aspect ratio. - # height: 720 - # Optional: Set the encode quality of the live stream (default: shown below) - # 1 is the highest quality, and 31 is the lowest. Lower quality feeds utilize less CPU resources. - quality: 8 - - # Optional: in-feed timestamp style configuration - # NOTE: Can be overridden at the camera level - # timestamp_style: - # Optional: Position of the timestamp (default: shown below) - # "tl" (top left), "tr" (top right), "bl" (bottom left), "br" (bottom right) - # position: "tl" - # Optional: Format specifier conform to the Python package "datetime" (default: shown below) - # Additional Examples: - # german: "%d.%m.%Y %H:%M:%S" - # format: "%m/%d/%Y %H:%M:%S" - # Optional: Color of font - # color: - # All Required when color is specified (default: shown below) - # red: 255 - # green: 255 - # blue: 255 - # Optional: Line thickness of font (default: shown below) - # thickness: 2 - # Optional: Effect of lettering (default: shown below) - # None (No effect), - # "solid" (solid background in inverse color of font) - # "shadow" (shadow for font) - effect: solid - - # Required - cameras: -{{- range .Values.frigate.cameras }} - # Required: name of the camera - {{ .name }}: - objects: - # Optional: list of objects to track from labelmap.txt (default: shown below) - track: - {{- range .objects.track }} - - {{ . }} - {{- end }} - detect: - width: {{ .detect.width }} - height: {{ .detect.height }} - # Required: ffmpeg settings for the camera - ffmpeg: - # Required: A list of input streams for the camera. See documentation for more information. - inputs: - {{- range .inputs }} - - path: {{ .path }} - roles: - {{- range .roles }} - - {{ . }} - {{- end }} - {{- end }} - record: - enabled: {{ .record.enabled }} - # Optional: timeout for highest scoring image before allowing it - # to be replaced by a newer image. (default: shown below) - best_image_timeout: 60 - snapshots: - enabled: {{ .snapshots.enabled }} - - # Optional: zones for this camera - # zones: - # Required: name of the zone - # NOTE: This must be different than any camera names, but can match with another zone on another - # camera. - # front_steps: - # Required: List of x,y coordinates to define the polygon of the zone. - # NOTE: Coordinates can be generated at https://www.image-map.net/ - # coordinates: 545,1077,747,939,788,805 - # Optional: List of objects that can trigger this zone (default: all tracked objects) - # objects: - # - person - # Optional: Zone level object filters. - # NOTE: The global and camera filters are applied upstream. - # filters: - # person: - # min_area: 5000 - # max_area: 100000 - # threshold: 0.7 - - # Optional: Configuration for the jpg snapshots published via MQTT - # mqtt: - # Optional: Enable publishing snapshot via mqtt for camera (default: shown below) - # NOTE: Only applies to publishing image data to MQTT via 'frigate///snapshot'. - # All other messages will still be published. - # enabled: True - # Optional: print a timestamp on the snapshots (default: shown below) - # timestamp: True - # Optional: draw bounding box on the snapshots (default: shown below) - # bounding_box: True - # Optional: crop the snapshot (default: shown below) - # crop: True - # Optional: height to resize the snapshot to (default: shown below) - # height: 270 - # Optional: jpeg encode quality (default: shown below) - # quality: 70 - # Optional: Restrict mqtt messages to objects that entered any of the listed zones (default: no required zones) - # required_zones: [] -{{- end }} diff --git a/charts/incubator/frigate/values.yaml b/charts/incubator/frigate/values.yaml index 1e9b24d4b4a..617900c386b 100644 --- a/charts/incubator/frigate/values.yaml +++ b/charts/incubator/frigate/values.yaml @@ -7,6 +7,400 @@ securityContext: readOnlyRootFilesystem: false runAsNonRoot: false +configmap: + config: + enabled: true + data: + config.yml: | + mqtt: + # Required: host name + host: {{ .Values.frigate.mqtt.host }} + # Optional: port (default: shown below) + port: {{ .Values.frigate.mqtt.port }} + # Optional: topic prefix (default: shown below) + # NOTE: must be unique if you are running multiple instances + topic_prefix: frigate + # Optional: client id (default: shown below) + # NOTE: must be unique if you are running multiple instances + client_id: frigate + {{- if .Values.frigate.mqtt.authenticated }} + user: {{ .Values.frigate.mqtt.username }} + password: {{ .Values.frigate.mqtt.password }} + # Optional: user + # user: mqtt_user + # Optional: password + # NOTE: MQTT password can be specified with an environment variables that must begin with 'FRIGATE_'. + # e.g. password: '{FRIGATE_MQTT_PASSWORD}' + # password: password + {{- end }} + # Optional: tls_ca_certs for enabling TLS using self-signed certs (default: None) + # tls_ca_certs: /path/to/ca.crt + # Optional: tls_client_cert and tls_client key in order to use self-signed client + # certificates (default: None) + # NOTE: certificate must not be password-protected + # do not set user and password when using a client certificate + # tls_client_cert: /path/to/client.crt + # tls_client_key: /path/to/client.key + # Optional: tls_insecure (true/false) for enabling TLS verification of + # the server hostname in the server certificate (default: None) + # tls_insecure: false + # Optional: interval in seconds for publishing stats (default: shown below) + stats_interval: 60 + + # Optional: Detectors configuration. Defaults to a single CPU detector + detectors: + # Required: name of the detector + {{- if .Values.persistence.coral }} + {{- if .Values.persistence.coral.enabled }} + coral: + # Required: type of the detector + # Valid values are 'edgetpu' (requires device property below) and 'cpu'. + type: edgetpu + # Optional: device name as defined here: https://coral.ai/docs/edgetpu/multiple-edgetpu/#using-the-tensorflow-lite-python-api + device: usb + {{- else }} + cpu1: + type: cpu + # Optional: num_threads value passed to the tflite.Interpreter (default: shown below) + # This value is only used for CPU types + num_threads: 2 + {{- end }} + {{- end }} + + + # Optional: Database configuration + # database: + # The path to store the SQLite DB (default: shown below) + # path: /media/frigate/frigate.db + + # Optional: model modifications + # model: + # Optional: path to the model (default: automatic based on detector) + # path: /edgetpu_model.tflite + # Optional: path to the labelmap (default: shown below) + # labelmap_path: /labelmap.txt + # Required: Object detection model input width (default: shown below) + # width: 320 + # Required: Object detection model input height (default: shown below) + # height: 240 + # Optional: Label name modifications. These are merged into the standard labelmap. + # labelmap: + # 2: vehicle + + # Optional: logger verbosity settings + logger: + # Optional: Default log verbosity (default: shown below) + default: info + # Optional: Component specific logger overrides + # logs: + # frigate.event: info + + # Optional: set environment variables + # environment_vars: + # EXAMPLE_VAR: value + + # Optional: birdseye configuration + birdseye: + # Optional: Enable birdseye view (default: shown below) + enabled: {{ .Values.frigate.birdseye.enabled }} + # Optional: Width of the output resolution (default: shown below) + width: 1280 + # Optional: Height of the output resolution (default: shown below) + height: 720 + # Optional: Encoding quality of the mpeg1 feed (default: shown below) + # 1 is the highest quality, and 31 is the lowest. Lower quality feeds utilize less CPU resources. + quality: 8 + # Optional: Mode of the view. Available options are: objects, motion, and continuous + # objects - cameras are included if they have had a tracked object within the last 30 seconds + # motion - cameras are included if motion was detected in the last 30 seconds + # continuous - all cameras are included always + mode: {{ .Values.frigate.birdseye.mode }} + + # Optional: ffmpeg configuration + ffmpeg: + # Optional: global ffmpeg args (default: shown below) warning instead of debug + global_args: -hide_banner -loglevel debug + # Optional: global hwaccel args (default: shown below) + # NOTE: See hardware acceleration docs for your specific device + # hwaccel_args: [] + # Optional: global input args (default: shown below) + # input_args: -avoid_negative_ts make_zero -fflags +genpts+discardcorrupt -rtsp_transport tcp -stimeout 5000000 -use_wallclock_as_timestamps 1 + # Optional: global output args + # output_args: + # Optional: output args for detect streams (default: shown below) + # detect: -f rawvideo -pix_fmt yuv420p + # Optional: output args for record streams (default: shown below) + # record: -f segment -segment_time 10 -segment_format mp4 -reset_timestamps 1 -strftime 1 -c copy -an + # Optional: output args for rtmp streams (default: shown below) + # rtmp: -c copy -f flv + + # Optional: Detect configuration + # NOTE: Can be overridden at the camera level + detect: + # Optional: width of the frame for the input with the detect role (default: shown below) + width: 1280 + # Optional: height of the frame for the input with the detect role (default: shown below) + height: 720 + # Optional: desired fps for your camera for the input with the detect role (default: shown below) + # NOTE: Recommended value of 5. Ideally, try and reduce your FPS on the camera. + fps: 5 + # Optional: enables detection for the camera (default: True) + # This value can be set via MQTT and will be updated in startup based on retained value + enabled: True + # Optional: Number of frames without a detection before frigate considers an object to be gone. (default: 5x the frame rate) + # max_disappeared: 25 + # Optional: Frequency for running detection on stationary objects (default: 10x the frame rate) + # stationary_interval: 50 + + # Optional: Object configuration + # NOTE: Can be overridden at the camera level + objects: + # Optional: list of objects to track from labelmap.txt (default: shown below) + track: + - person + - car + - motorcyle + - cat + - dog + # Optional: mask to prevent all object types from being detected in certain areas (default: no mask) + # Checks based on the bottom center of the bounding box of the object. + # NOTE: This mask is COMBINED with the object type specific mask below + # mask: 0,0,1000,0,1000,200,0,200 + # Optional: filters to reduce false positives for specific object types + filters: + person: + # Optional: minimum width*height of the bounding box for the detected object (default: 0) + min_area: 5000 + # Optional: maximum width*height of the bounding box for the detected object (default: 24000000) + max_area: 100000 + # Optional: minimum score for the object to initiate tracking (default: shown below) + # min_score: 0.5 + # Optional: minimum decimal percentage for tracked object's computed score to be considered a true positive (default: shown below) + # threshold: 0.7 + # Optional: mask to prevent this object type from being detected in certain areas (default: no mask) + # Checks based on the bottom center of the bounding box of the object + # mask: 0,0,1000,0,1000,200,0,200 + + # Optional: Motion configuration + # NOTE: Can be overridden at the camera level + motion: + # Optional: The threshold passed to cv2.threshold to determine if a pixel is different enough to be counted as motion. (default: shown below) + # Increasing this value will make motion detection less sensitive and decreasing it will make motion detection more sensitive. + # The value should be between 1 and 255. + # threshold: 25 + # Optional: Minimum size in pixels in the resized motion image that counts as motion (default: 30) + # Increasing this value will prevent smaller areas of motion from being detected. Decreasing will + # make motion detection more sensitive to smaller moving objects. + # As a rule of thumb: + # - 15 - high sensitivity + # - 30 - medium sensitivity + # - 50 - low sensitivity + contour_area: 30 + # Optional: Alpha value passed to cv2.accumulateWeighted when averaging the motion delta across multiple frames (default: shown below) + # Higher values mean the current frame impacts the delta a lot, and a single raindrop may register as motion. + # Too low and a fast moving person wont be detected as motion. + # delta_alpha: 0.2 + # Optional: Alpha value passed to cv2.accumulateWeighted when averaging frames to determine the background (default: shown below) + # Higher values mean the current frame impacts the average a lot, and a new object will be averaged into the background faster. + # Low values will cause things like moving shadows to be detected as motion for longer. + # https://www.geeksforgeeks.org/background-subtraction-in-an-image-using-concept-of-running-average/ + # frame_alpha: 0.2 + # Optional: Height of the resized motion frame (default: 50) + # This operates as an efficient blur alternative. Higher values will result in more granular motion detection at the expense + # of higher CPU usage. Lower values result in less CPU, but small changes may not register as motion. + # frame_height: 50 + # Optional: motion mask + # NOTE: see docs for more detailed info on creating masks + # mask: 0,900,1080,900,1080,1920,0,1920 + + # Optional: Record configuration + # NOTE: Can be overridden at the camera level + record: + # Optional: Enable recording (default: shown below) + enabled: False + # Optional: Retention settings for recording + retain: + # Optional: Number of days to retain recordings regardless of events (default: shown below) + # NOTE: This should be set to 0 and retention should be defined in events section below + # if you only want to retain recordings of events. + days: 7 + # Optional: Mode for retention. Available options are: all, motion, and active_objects + # all - save all recording segments regardless of activity + # motion - save all recordings segments with any detected motion + # active_objects - save all recording segments with active/moving objects + # NOTE: this mode only applies when the days setting above is greater than 0 + mode: motion + # Optional: Event recording settings + events: + # Optional: Maximum length of time to retain video during long events. (default: shown below) + # NOTE: If an object is being tracked for longer than this amount of time, the retained recordings + # will be the last x seconds of the event unless retain->days under record is > 0. + max_seconds: 300 + # Optional: Number of seconds before the event to include (default: shown below) + pre_capture: 5 + # Optional: Number of seconds after the event to include (default: shown below) + post_capture: 5 + # Optional: Objects to save recordings for. (default: all tracked objects) + # objects: + # - person + # Optional: Restrict recordings to objects that entered any of the listed zones (default: no required zones) + # required_zones: [] + # Optional: Retention settings for recordings of events + retain: + # Required: Default retention days (default: shown below) + default: 14 + # Optional: Mode for retention. (default: shown below) + # all - save all recording segments for events regardless of activity + # motion - save all recordings segments for events with any detected motion + # active_objects - save all recording segments for event with active/moving objects + # + # NOTE: If the retain mode for the camera is more restrictive than the mode configured + # here, the segments will already be gone by the time this mode is applied. + # For example, if the camera retain mode is "motion", the segments without motion are + # never stored, so setting the mode to "all" here won't bring them back. + mode: active_objects + # Optional: Per object retention days + # objects: + # person: 15 + + # Optional: Configuration for the jpg snapshots written to the clips directory for each event + # NOTE: Can be overridden at the camera level + snapshots: + # Optional: Enable writing jpg snapshot to /media/frigate/clips (default: shown below) + # This value can be set via MQTT and will be updated in startup based on retained value + enabled: False + # Optional: print a timestamp on the snapshots (default: shown below) + # timestamp: False + # Optional: draw bounding box on the snapshots (default: shown below) + # bounding_box: False + # Optional: crop the snapshot (default: shown below) + # crop: False + # Optional: height to resize the snapshot to (default: original size) + # height: 175 + # Optional: Restrict snapshots to objects that entered any of the listed zones (default: no required zones) + required_zones: [] + # Optional: Camera override for retention settings (default: global values) + retain: + # Required: Default retention days (default: shown below) + default: 10 + # Optional: Per object retention days + objects: + person: 15 + + # Optional: RTMP configuration + # NOTE: Can be overridden at the camera level + rtmp: + # Optional: Enable the RTMP stream (default: True) + enabled: True + + # Optional: Live stream configuration for WebUI + # NOTE: Can be overridden at the camera level + live: + # Optional: Set the height of the live stream. (default: 720) + # This must be less than or equal to the height of the detect stream. Lower resolutions + # reduce bandwidth required for viewing the live stream. Width is computed to match known aspect ratio. + # height: 720 + # Optional: Set the encode quality of the live stream (default: shown below) + # 1 is the highest quality, and 31 is the lowest. Lower quality feeds utilize less CPU resources. + quality: 8 + + # Optional: in-feed timestamp style configuration + # NOTE: Can be overridden at the camera level + # timestamp_style: + # Optional: Position of the timestamp (default: shown below) + # "tl" (top left), "tr" (top right), "bl" (bottom left), "br" (bottom right) + # position: "tl" + # Optional: Format specifier conform to the Python package "datetime" (default: shown below) + # Additional Examples: + # german: "%d.%m.%Y %H:%M:%S" + # format: "%m/%d/%Y %H:%M:%S" + # Optional: Color of font + # color: + # All Required when color is specified (default: shown below) + # red: 255 + # green: 255 + # blue: 255 + # Optional: Line thickness of font (default: shown below) + # thickness: 2 + # Optional: Effect of lettering (default: shown below) + # None (No effect), + # "solid" (solid background in inverse color of font) + # "shadow" (shadow for font) + effect: solid + + # Required + cameras: + {{- range .Values.frigate.cameras }} + # Required: name of the camera + {{ .name }}: + objects: + # Optional: list of objects to track from labelmap.txt (default: shown below) + track: + {{- range .objects.track }} + - {{ . }} + {{- end }} + detect: + width: {{ .detect.width }} + height: {{ .detect.height }} + # Required: ffmpeg settings for the camera + ffmpeg: + # Required: A list of input streams for the camera. See documentation for more information. + inputs: + {{- range .inputs }} + - path: {{ .path }} + roles: + {{- range .roles }} + - {{ . }} + {{- end }} + {{- end }} + record: + enabled: {{ .record.enabled }} + # Optional: timeout for highest scoring image before allowing it + # to be replaced by a newer image. (default: shown below) + best_image_timeout: 60 + snapshots: + enabled: {{ .snapshots.enabled }} + + # Optional: zones for this camera + # zones: + # Required: name of the zone + # NOTE: This must be different than any camera names, but can match with another zone on another + # camera. + # front_steps: + # Required: List of x,y coordinates to define the polygon of the zone. + # NOTE: Coordinates can be generated at https://www.image-map.net/ + # coordinates: 545,1077,747,939,788,805 + # Optional: List of objects that can trigger this zone (default: all tracked objects) + # objects: + # - person + # Optional: Zone level object filters. + # NOTE: The global and camera filters are applied upstream. + # filters: + # person: + # min_area: 5000 + # max_area: 100000 + # threshold: 0.7 + + # Optional: Configuration for the jpg snapshots published via MQTT + # mqtt: + # Optional: Enable publishing snapshot via mqtt for camera (default: shown below) + # NOTE: Only applies to publishing image data to MQTT via 'frigate///snapshot'. + # All other messages will still be published. + # enabled: true + # Optional: print a timestamp on the snapshots (default: shown below) + # timestamp: True + # Optional: draw bounding box on the snapshots (default: shown below) + # bounding_box: True + # Optional: crop the snapshot (default: shown below) + # crop: True + # Optional: height to resize the snapshot to (default: shown below) + # height: 270 + # Optional: jpeg encode quality (default: shown below) + # quality: 70 + # Optional: Restrict mqtt messages to objects that entered any of the listed zones (default: no required zones) + # required_zones: [] + {{- end }} + podSecurityContext: runAsUser: 0 runAsGroup: 0 @@ -73,7 +467,7 @@ frigate: # to be replaced by a newer image. (default: shown below) best_image_timeout: 60 snapshots: - enabled: True + enabled: true persistence: cache: enabled: true @@ -87,3 +481,11 @@ persistence: media: enabled: true mountPath: "/media" + frigate-config: + enabled: true + mountPath: "/config/config.yml" + subPath: "config.yml" + type: "custom" + volumeSpec: + configMap: + name: '{{ template "tc.common.names.fullname" . }}-config' diff --git a/charts/incubator/ghost/Chart.yaml b/charts/incubator/ghost/Chart.yaml index 53548d779cc..dbcd3160534 100644 --- a/charts/incubator/ghost/Chart.yaml +++ b/charts/incubator/ghost/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.2.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -25,7 +25,7 @@ sources: - https://github.com/TryGhost/Ghost - https://hub.docker.com/_/ghost - https://ghost.org/docs/ -version: 1.0.45 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/ghost/SCALE/migrations/migrate b/charts/incubator/ghost/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/ghost/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/ghost/templates/common.yaml b/charts/incubator/ghost/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/ghost/templates/common.yaml +++ b/charts/incubator/ghost/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/ghost/values.yaml b/charts/incubator/ghost/values.yaml index a220417fd30..c0db334f412 100644 --- a/charts/incubator/ghost/values.yaml +++ b/charts/incubator/ghost/values.yaml @@ -43,8 +43,6 @@ env: tenor__contentFilter: "off" opensea__privateReadOnlyApiKey: "" twitter__privateReadOnlyToken: "" - -envValueFrom: database__connection__host: secretKeyRef: name: mariadbcreds diff --git a/charts/incubator/homebridge/Chart.yaml b/charts/incubator/homebridge/Chart.yaml index 1bd02da74da..453a66890aa 100644 --- a/charts/incubator/homebridge/Chart.yaml +++ b/charts/incubator/homebridge/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A lightweight NodeJS server that emulates the iOS HomeKit API home: https://github.com/truecharts/apps/tree/master/charts/incubator/homebridge @@ -21,7 +21,7 @@ sources: - https://homebridge.io/ - https://github.com/oznu/docker-homebridge type: application -version: 0.0.20 +version: 1.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/homebridge/SCALE/migrations/migrate b/charts/incubator/homebridge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/homebridge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/homebridge/templates/common.yaml b/charts/incubator/homebridge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/homebridge/templates/common.yaml +++ b/charts/incubator/homebridge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/meshcentral/Chart.yaml b/charts/incubator/meshcentral/Chart.yaml index 45c403d5c0c..8bf44501e85 100644 --- a/charts/incubator/meshcentral/Chart.yaml +++ b/charts/incubator/meshcentral/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: meshcentral -version: 1.1.17 +version: 2.0.0 appVersion: "1.0.31" description: MeshCentral is a full computer management web site type: application @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mongodb.enabled name: mongodb repository: https://charts.truecharts.org/ diff --git a/charts/incubator/meshcentral/SCALE/migrations/migrate b/charts/incubator/meshcentral/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/meshcentral/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/meshcentral/templates/common.yaml b/charts/incubator/meshcentral/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/incubator/meshcentral/templates/common.yaml +++ b/charts/incubator/meshcentral/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/incubator/piwigo/Chart.yaml b/charts/incubator/piwigo/Chart.yaml index d98551737c9..efd877f5412 100644 --- a/charts/incubator/piwigo/Chart.yaml +++ b/charts/incubator/piwigo/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "11.5.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A is photo gallery software for the web, built by an active community of users and developers. home: https://github.com/truecharts/apps/tree/master/charts/incubator/piwigo @@ -23,7 +23,7 @@ sources: - http://piwigo.org/ - https://github.com/linuxserver/docker-piwigo type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/piwigo/SCALE/migrations/migrate b/charts/incubator/piwigo/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/piwigo/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/piwigo/templates/common.yaml b/charts/incubator/piwigo/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/incubator/piwigo/templates/common.yaml +++ b/charts/incubator/piwigo/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/self-service-password/Chart.yaml b/charts/incubator/self-service-password/Chart.yaml index 3216cb9587e..2574a1f63dd 100644 --- a/charts/incubator/self-service-password/Chart.yaml +++ b/charts/incubator/self-service-password/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.2.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Self Service Password is a PHP application that allows users to change their password in an LDAP directory. home: https://github.com/truecharts/apps/tree/master/charts/incubator/self-service-password @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/tiredofit/self-service-password - https://self-service-password.readthedocs.io/en/latest type: application -version: 0.0.20 +version: 1.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/self-service-password/SCALE/migrations/migrate b/charts/incubator/self-service-password/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/self-service-password/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/self-service-password/templates/common.yaml b/charts/incubator/self-service-password/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/incubator/self-service-password/templates/common.yaml +++ b/charts/incubator/self-service-password/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/incubator/technitium/Chart.yaml b/charts/incubator/technitium/Chart.yaml index 27277c32115..a67acc513b7 100644 --- a/charts/incubator/technitium/Chart.yaml +++ b/charts/incubator/technitium/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "8.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Technitium DNS Server is an open source authoritative as well as recursive DNS server that can be used for self hosting a DNS server for privacy & security. home: https://github.com/truecharts/apps/tree/master/charts/incubator/technitium @@ -21,7 +21,7 @@ sources: - https://technitium.com/ - https://hub.docker.com/r/technitium/dns-server type: application -version: 0.0.16 +version: 1.0.0 annotations: truecharts.org/catagories: | - networking diff --git a/charts/incubator/technitium/SCALE/migrations/migrate b/charts/incubator/technitium/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/technitium/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/technitium/questions.yaml b/charts/incubator/technitium/questions.yaml index f97fcf255f1..2861105cb58 100644 --- a/charts/incubator/technitium/questions.yaml +++ b/charts/incubator/technitium/questions.yaml @@ -83,7 +83,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/incubator/technitium/templates/common.yaml b/charts/incubator/technitium/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/incubator/technitium/templates/common.yaml +++ b/charts/incubator/technitium/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/incubator/technitium/values.yaml b/charts/incubator/technitium/values.yaml index 982de9a2c77..20b7da54fb2 100644 --- a/charts/incubator/technitium/values.yaml +++ b/charts/incubator/technitium/values.yaml @@ -12,7 +12,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: DNS_SERVER_ADMIN_PASSWORD: "password" env: diff --git a/charts/incubator/theme-park/Chart.yaml b/charts/incubator/theme-park/Chart.yaml index 48853b66ce1..03af71b514f 100644 --- a/charts/incubator/theme-park/Chart.yaml +++ b/charts/incubator/theme-park/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.9.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Custom themes for your favorite apps! home: https://github.com/truecharts/apps/tree/master/charts/incubator/theme-park @@ -20,7 +20,7 @@ name: theme-park sources: - https://github.com/gilbn/theme.park type: application -version: 0.0.3 +version: 1.0.0 annotations: truecharts.org/catagories: | - customization diff --git a/charts/incubator/theme-park/SCALE/migrations/migrate b/charts/incubator/theme-park/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/theme-park/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/theme-park/templates/common.yaml b/charts/incubator/theme-park/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/theme-park/templates/common.yaml +++ b/charts/incubator/theme-park/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/zabbix-server/Chart.yaml b/charts/incubator/zabbix-server/Chart.yaml index d329df96dce..725ff6ce6b5 100644 --- a/charts/incubator/zabbix-server/Chart.yaml +++ b/charts/incubator/zabbix-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.0.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: zabbix-server sources: - https://hub.docker.com/r/zabbix/zabbix-server-pgsql - https://hub.docker.com/r/zabbix/zabbix-web-nginx-pgsql -version: 0.0.15 +version: 1.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/incubator/zabbix-server/SCALE/migrations/migrate b/charts/incubator/zabbix-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/incubator/zabbix-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/incubator/zabbix-server/templates/common.yaml b/charts/incubator/zabbix-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/incubator/zabbix-server/templates/common.yaml +++ b/charts/incubator/zabbix-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/incubator/zabbix-server/values.yaml b/charts/incubator/zabbix-server/values.yaml index d15029dd8b8..088c59769a0 100644 --- a/charts/incubator/zabbix-server/values.yaml +++ b/charts/incubator/zabbix-server/values.yaml @@ -32,8 +32,6 @@ env: # User Defined ZBX_LOADMODULE: "" ZBX_TIMEOUT: 4 - -envValueFrom: POSTGRES_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/airdcpp-webclient/Chart.yaml b/charts/stable/airdcpp-webclient/Chart.yaml index 8a37b42e703..386d74f726b 100644 --- a/charts/stable/airdcpp-webclient/Chart.yaml +++ b/charts/stable/airdcpp-webclient/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.11.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: AirDC++ Web Client is a locally installed application, which is designed for flexible sharing of files or directories within groups of people in a local network or over internet. home: https://github.com/truecharts/apps/tree/master/charts/stable/airdcpp-webclient @@ -23,7 +23,7 @@ sources: - https://github.com/airdcpp-web/airdcpp-webclient - https://hub.docker.com/r/gangefors/airdcpp-webclient type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/airdcpp-webclient/SCALE/migrations/migrate b/charts/stable/airdcpp-webclient/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/airdcpp-webclient/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/airdcpp-webclient/templates/common.yaml b/charts/stable/airdcpp-webclient/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/airdcpp-webclient/templates/common.yaml +++ b/charts/stable/airdcpp-webclient/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/airsonic-advanced/Chart.yaml b/charts/stable/airsonic-advanced/Chart.yaml index 2b2928578d6..1aa6e1e8bfc 100644 --- a/charts/stable/airsonic-advanced/Chart.yaml +++ b/charts/stable/airsonic-advanced/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "11.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -22,7 +22,7 @@ name: airsonic-advanced sources: - https://github.com/airsonic/airsonic-advanced - https://hub.docker.com/r/airsonicadvanced/airsonic-advanced -version: 2.0.23 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/airsonic-advanced/SCALE/migrations/migrate b/charts/stable/airsonic-advanced/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/airsonic-advanced/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/airsonic-advanced/templates/common.yaml b/charts/stable/airsonic-advanced/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/airsonic-advanced/templates/common.yaml +++ b/charts/stable/airsonic-advanced/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/airsonic-advanced/values.yaml b/charts/stable/airsonic-advanced/values.yaml index e231aecec83..00b70db2381 100644 --- a/charts/stable/airsonic-advanced/values.yaml +++ b/charts/stable/airsonic-advanced/values.yaml @@ -18,8 +18,6 @@ env: CONTEXT_PATH: "/" spring_liquibase_parameters_userTableQuote: '"' spring_datasource_username: "{{ .Values.postgresql.postgresqlUsername }}" - -envValueFrom: spring_datasource_url: secretKeyRef: name: dbcreds diff --git a/charts/stable/airsonic/Chart.yaml b/charts/stable/airsonic/Chart.yaml index cda478009d1..dbeacb6018f 100644 --- a/charts/stable/airsonic/Chart.yaml +++ b/charts/stable/airsonic/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "10.6.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Airsonic is a Free and Open Source community driven media server home: https://github.com/truecharts/apps/tree/master/charts/stable/airsonic icon: https://truecharts.org/_static/img/appicons/airsonic.png @@ -19,7 +19,7 @@ sources: - https://github.com/airsonic/airsonic - https://github.com/linuxserver/docker-airsonic - https://github.com/k8s-at-home/charts/tree/master/charts/airsonic -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/airsonic/SCALE/migrations/migrate b/charts/stable/airsonic/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/airsonic/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/airsonic/templates/common.yaml b/charts/stable/airsonic/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/airsonic/templates/common.yaml +++ b/charts/stable/airsonic/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/alist/Chart.yaml b/charts/stable/alist/Chart.yaml index b493bdcd98f..539ec1d45fb 100644 --- a/charts/stable/alist/Chart.yaml +++ b/charts/stable/alist/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: alist -version: 1.0.31 +version: 2.0.0 appVersion: "2.6.0" description: Alist program that supports multiple storage, powered by Gin and React type: application @@ -20,7 +20,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/alist/SCALE/migrations/migrate b/charts/stable/alist/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/alist/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/alist/templates/common.yaml b/charts/stable/alist/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/alist/templates/common.yaml +++ b/charts/stable/alist/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/alist/values.yaml b/charts/stable/alist/values.yaml index c55e39df5e3..90c879b28ea 100644 --- a/charts/stable/alist/values.yaml +++ b/charts/stable/alist/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/alist pullPolicy: IfNotPresent - tag: v2.6.0@sha256:850591597949aaf108088a663772863e2b1ac51fafcd64edf025a0d6c52980d8 + tag: v2.6.1@sha256:60d7928a8fef827c78a00c04f05bbc8e452a2a026dbbee67ddb6e4ce328628e0 env: {} diff --git a/charts/stable/amcrest2mqtt/Chart.yaml b/charts/stable/amcrest2mqtt/Chart.yaml index 3ce6c6d83a7..ce8f67986e7 100644 --- a/charts/stable/amcrest2mqtt/Chart.yaml +++ b/charts/stable/amcrest2mqtt/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0.16" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Expose all events from an Amcrest device to an MQTT broker home: https://github.com/truecharts/apps/tree/master/charts/stable/amcrest2mqtt icon: https://truecharts.org/_static/img/appicons/amcrest2mqtt.png @@ -17,7 +17,7 @@ maintainers: name: amcrest2mqtt sources: - https://github.com/dchesterton/amcrest2mqtt -version: 3.0.20 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/amcrest2mqtt/SCALE/migrations/migrate b/charts/stable/amcrest2mqtt/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/amcrest2mqtt/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/amcrest2mqtt/questions.yaml b/charts/stable/amcrest2mqtt/questions.yaml index 49df4cc812a..c5e3fe156aa 100644 --- a/charts/stable/amcrest2mqtt/questions.yaml +++ b/charts/stable/amcrest2mqtt/questions.yaml @@ -53,7 +53,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/amcrest2mqtt/templates/common.yaml b/charts/stable/amcrest2mqtt/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/stable/amcrest2mqtt/templates/common.yaml +++ b/charts/stable/amcrest2mqtt/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/amcrest2mqtt/values.yaml b/charts/stable/amcrest2mqtt/values.yaml index 94601f7379a..c73a8e00b41 100644 --- a/charts/stable/amcrest2mqtt/values.yaml +++ b/charts/stable/amcrest2mqtt/values.yaml @@ -21,7 +21,7 @@ probes: startup: enabled: false -secret: +secretEnv: # -- User name used to connect to the Amcrest device AMCREST_USERNAME: "admin" # -- Password used to connect to the Amcrest device diff --git a/charts/stable/anonaddy/Chart.yaml b/charts/stable/anonaddy/Chart.yaml index c3cc85f6f0b..68bd2d1bd0c 100644 --- a/charts/stable/anonaddy/Chart.yaml +++ b/charts/stable/anonaddy/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.11.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -25,7 +25,7 @@ maintainers: name: anonaddy sources: - https://github.com/anonaddy/docker -version: 7.0.26 +version: 8.0.0 annotations: truecharts.org/catagories: | - email diff --git a/charts/stable/anonaddy/SCALE/migrations/migrate b/charts/stable/anonaddy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/anonaddy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/anonaddy/templates/_appkey.tpl b/charts/stable/anonaddy/templates/_appkey.tpl index 1ac01679bfa..daf70c0c464 100644 --- a/charts/stable/anonaddy/templates/_appkey.tpl +++ b/charts/stable/anonaddy/templates/_appkey.tpl @@ -8,7 +8,7 @@ kind: Secret type: Opaque metadata: labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} name: appkey {{- $keyprevious := lookup "v1" "Secret" .Release.Namespace "appkey" }} {{- $appkey := "" }} diff --git a/charts/stable/anonaddy/templates/common.yaml b/charts/stable/anonaddy/templates/common.yaml index 74884575af2..65b6d2f295f 100644 --- a/charts/stable/anonaddy/templates/common.yaml +++ b/charts/stable/anonaddy/templates/common.yaml @@ -1,9 +1,9 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render appkey for anonaddy */}} {{- include "anonaddy.appkey" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/anonaddy/values.yaml b/charts/stable/anonaddy/values.yaml index 38df2b2beee..b408178a81b 100644 --- a/charts/stable/anonaddy/values.yaml +++ b/charts/stable/anonaddy/values.yaml @@ -22,6 +22,30 @@ env: ANONADDY_DOMAIN: chart-example.local DB_DATABASE: anonaddy DB_USERNAME: anonaddy + DB_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + DB_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-password + REDIS_HOST: + secretKeyRef: + name: rediscreds + key: plainhost + REDIS_PASSWORD: + secretKeyRef: + name: rediscreds + key: redis-password + APP_KEY: + secretKeyRef: + name: appkey + key: appkey + ANONADDY_SECRET: + secretKeyRef: + name: appkey + key: secret # -- Configures service settings for the chart. # @default -- See values.yaml @@ -48,33 +72,6 @@ persistence: enabled: true mountPath: "/config" -envValueFrom: - DB_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - DB_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - REDIS_HOST: - secretKeyRef: - name: rediscreds - key: plainhost - REDIS_PASSWORD: - secretKeyRef: - name: rediscreds - key: redis-password - APP_KEY: - secretKeyRef: - name: appkey - key: appkey - ANONADDY_SECRET: - secretKeyRef: - name: appkey - key: secret - - redis: enabled: true existingSecret: "rediscreds" diff --git a/charts/stable/apache-musicindex/Chart.yaml b/charts/stable/apache-musicindex/Chart.yaml index 781e3faad2b..9dc3a7246f5 100644 --- a/charts/stable/apache-musicindex/Chart.yaml +++ b/charts/stable/apache-musicindex/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.4.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Index and stream music using apache-musicindex and m3u playlists home: https://github.com/truecharts/apps/tree/master/charts/stable/apache-musicindex icon: https://truecharts.org/_static/img/appicons/apache-musicindex.png @@ -20,7 +20,7 @@ maintainers: name: apache-musicindex sources: - http://hacks.slashdirt.org/sw/musicindex/ -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/apache-musicindex/SCALE/migrations/migrate b/charts/stable/apache-musicindex/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/apache-musicindex/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/apache-musicindex/templates/common.yaml b/charts/stable/apache-musicindex/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/apache-musicindex/templates/common.yaml +++ b/charts/stable/apache-musicindex/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/appdaemon/Chart.yaml b/charts/stable/appdaemon/Chart.yaml index b6011022847..aab7db7a17a 100644 --- a/charts/stable/appdaemon/Chart.yaml +++ b/charts/stable/appdaemon/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.2.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: AppDaemon is a loosely coupled, multithreaded, sandboxed python execution environment for writing automation apps for Home Assistant home automation software. @@ -26,7 +26,7 @@ name: appdaemon sources: - https://github.com/AppDaemon/appdaemon type: application -version: 8.0.19 +version: 9.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/appdaemon/SCALE/migrations/migrate b/charts/stable/appdaemon/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/appdaemon/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/appdaemon/questions.yaml b/charts/stable/appdaemon/questions.yaml index c643656ba5d..af910eecd8e 100644 --- a/charts/stable/appdaemon/questions.yaml +++ b/charts/stable/appdaemon/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/appdaemon/templates/common.yaml b/charts/stable/appdaemon/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/appdaemon/templates/common.yaml +++ b/charts/stable/appdaemon/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/aria2/Chart.yaml b/charts/stable/aria2/Chart.yaml index cc4084cbcf5..453a1899bf5 100644 --- a/charts/stable/aria2/Chart.yaml +++ b/charts/stable/aria2/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: aria server for downloading web content home: https://github.com/truecharts/apps/tree/master/charts/stable/aria2 icon: https://truecharts.org/_static/img/appicons/aria2.png @@ -17,7 +17,7 @@ maintainers: name: aria2 sources: - https://github.com/P3TERX/Aria2-Pro-Docker -version: 4.0.19 +version: 5.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/aria2/SCALE/migrations/migrate b/charts/stable/aria2/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/aria2/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/aria2/questions.yaml b/charts/stable/aria2/questions.yaml index d70350d8065..bed5c0970af 100644 --- a/charts/stable/aria2/questions.yaml +++ b/charts/stable/aria2/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/aria2/templates/common.yaml b/charts/stable/aria2/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/aria2/templates/common.yaml +++ b/charts/stable/aria2/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/aria2/values.yaml b/charts/stable/aria2/values.yaml index b85841105bf..1f1369eefd8 100644 --- a/charts/stable/aria2/values.yaml +++ b/charts/stable/aria2/values.yaml @@ -6,7 +6,7 @@ image: # -- image pull policy pullPolicy: IfNotPresent -secret: +secretEnv: RPC_SECRET: "ChangemeNow" # -- environment variables. See more environment variables in the [Aria2c documentation](https://github.com/P3TERX/Aria2-Pro-Docker). # @default -- See below diff --git a/charts/stable/audacity/Chart.yaml b/charts/stable/audacity/Chart.yaml index 4a07d7894bc..2a77e1c8a45 100644 --- a/charts/stable/audacity/Chart.yaml +++ b/charts/stable/audacity/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.0.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An easy-to-use, multi-track audio editor and recorder home: https://github.com/truecharts/apps/tree/master/charts/stable/audacity icon: https://truecharts.org/_static/img/appicons/audacity.png @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-audacity - https://www.audacityteam.org/ type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/audacity/SCALE/migrations/migrate b/charts/stable/audacity/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/audacity/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/audacity/templates/common.yaml b/charts/stable/audacity/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/audacity/templates/common.yaml +++ b/charts/stable/audacity/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/audiobookshelf/Chart.yaml b/charts/stable/audiobookshelf/Chart.yaml index 537e1093a9d..0e008c3cfed 100644 --- a/charts/stable/audiobookshelf/Chart.yaml +++ b/charts/stable/audiobookshelf/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.0.18" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Audiobookshelf is a self-hosted audiobook server for managing and playing your audiobooks. home: https://github.com/truecharts/apps/tree/master/charts/stable/audiobookshelf icon: https://truecharts.org/_static/img/appicons/audiobookshelf.png @@ -18,7 +18,7 @@ name: audiobookshelf sources: - https://hub.docker.com/r/advplyr/audiobookshelf - https://github.com/advplyr/audiobookshelf -version: 1.0.19 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/audiobookshelf/SCALE/migrations/migrate b/charts/stable/audiobookshelf/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/audiobookshelf/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/audiobookshelf/templates/common.yaml b/charts/stable/audiobookshelf/templates/common.yaml index 5eee2f50806..1bb6fee6ff7 100644 --- a/charts/stable/audiobookshelf/templates/common.yaml +++ b/charts/stable/audiobookshelf/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for audiobookshelf */}} {{- include "audiobookshelf.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/audiobookshelf/values.yaml b/charts/stable/audiobookshelf/values.yaml index 8f568ab358f..2cd21e0b217 100644 --- a/charts/stable/audiobookshelf/values.yaml +++ b/charts/stable/audiobookshelf/values.yaml @@ -1,14 +1,12 @@ image: repository: tccr.io/truecharts/audiobookshelf - tag: v2.0.18@sha256:c183a5d2dffff2dd8bc4fbe5978020d377a3c8b3b4af6d82fa3ffca2b3e60244 + tag: v2.0.20@sha256:4f51b1d78d44957db204132c36c43972d1443421b7b3bb8abfa0ae0075997b99 pullPolicy: IfNotPresent env: AUDIOBOOKSHELF_UID: "{{ .Values.security.PUID }}" AUDIOBOOKSHELF_GID: "{{ .Values.podSecurityContext.fsGroup }}" PORT: "{{ .Values.service.main.ports.main.port }}" - -envValueFrom: TOKEN_SECRET: secretKeyRef: name: audiobookshelf-secrets diff --git a/charts/stable/authelia/Chart.yaml b/charts/stable/authelia/Chart.yaml index 60a6f01ef52..56306428aea 100644 --- a/charts/stable/authelia/Chart.yaml +++ b/charts/stable/authelia/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.35.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -38,7 +38,7 @@ sources: - https://github.com/authelia/chartrepo - https://github.com/authelia/authelia type: application -version: 9.0.33 +version: 10.0.0 annotations: truecharts.org/catagories: | - security diff --git a/charts/stable/authelia/SCALE/migrations/migrate b/charts/stable/authelia/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/authelia/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/authelia/templates/common.yaml b/charts/stable/authelia/templates/common.yaml index 3f671a99728..614b468adf3 100644 --- a/charts/stable/authelia/templates/common.yaml +++ b/charts/stable/authelia/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for authelia */}} {{- include "authelia.configmap" . }} @@ -71,4 +71,4 @@ volumeSpec: {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/automatic-music-downloader/Chart.yaml b/charts/stable/automatic-music-downloader/Chart.yaml index 91a366c5532..94126e3d9f5 100644 --- a/charts/stable/automatic-music-downloader/Chart.yaml +++ b/charts/stable/automatic-music-downloader/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A Lidarr companion script to automatically download music for Lidarr. home: https://github.com/truecharts/apps/tree/master/charts/stable/automatic-music-downloader @@ -23,7 +23,7 @@ sources: - https://github.com/RandomNinjaAtk/docker-amd - https://hub.docker.com/r/randomninjaatk/amd type: application -version: 1.1.9 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/automatic-music-downloader/SCALE/migrations/migrate b/charts/stable/automatic-music-downloader/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/automatic-music-downloader/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/automatic-music-downloader/questions.yaml b/charts/stable/automatic-music-downloader/questions.yaml index 8a17a7f6419..c39c3cce15e 100644 --- a/charts/stable/automatic-music-downloader/questions.yaml +++ b/charts/stable/automatic-music-downloader/questions.yaml @@ -1,7 +1,7 @@ # Include{groups} portals: {} questions: - # Include{global} +# Include{global} - variable: controller group: "Controller" label: "" @@ -51,7 +51,7 @@ questions: description: "RollingUpdate: Create new pods and then kill old ones" - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" - # Include{controllerExpert} +# Include{controllerExpert} - variable: env group: "Container Configuration" @@ -274,7 +274,7 @@ questions: schema: type: int default: 1 - # Include{containerConfig} +# Include{containerConfig} - variable: serviceexpert @@ -292,9 +292,9 @@ questions: type: boolean default: false - # Include{serviceExpert} +# Include{serviceExpert} - # Include{serviceList} +# Include{serviceList} - variable: persistence label: "Integrated Persistent Storage" @@ -311,42 +311,8 @@ questions: additional_attrs: true type: dict attrs: - - variable: type - label: "Type of Storage" - description: "Sets the persistence type, Anything other than PVC could break rollback!" - schema: - type: string - default: "simplePVC" - enum: - - value: "simplePVC" - description: "PVC (simple)" - - value: "simpleHP" - description: "HostPath (simple)" - - value: "emptyDir" - description: "emptyDir" - - value: "pvc" - description: "pvc" - - value: "hostPath" - description: "hostPath" - # Include{persistenceBasic} - - variable: hostPath - label: "hostPath" - description: "Path inside the container the storage is mounted" - schema: - show_if: [["type", "=", "hostPath"]] - type: hostpath - - variable: medium - label: "EmptyDir Medium" - schema: - show_if: [["type", "=", "emptyDir"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "Memory" - description: "Memory" - # Include{persistenceAdvanced} +# Include{persistenceBasic} +# Include{persistenceAdvanced} - variable: data label: "App Data Storage" description: "Stores the Application Data." @@ -354,46 +320,12 @@ questions: additional_attrs: true type: dict attrs: - - variable: type - label: "Type of Storage" - description: "Sets the persistence type, Anything other than PVC could break rollback!" - schema: - type: string - default: "simplePVC" - enum: - - value: "simplePVC" - description: "PVC (simple)" - - value: "simpleHP" - description: "HostPath (simple)" - - value: "emptyDir" - description: "emptyDir" - - value: "pvc" - description: "pvc" - - value: "hostPath" - description: "hostPath" - # Include{persistenceBasic} - - variable: hostPath - label: "hostPath" - description: "Path inside the container the storage is mounted" - schema: - show_if: [["type", "=", "hostPath"]] - type: hostpath - - variable: medium - label: "EmptyDir Medium" - schema: - show_if: [["type", "=", "emptyDir"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "Memory" - description: "Memory" - # Include{persistenceAdvanced} - # Include{persistenceList} +# Include{persistenceBasic} +# Include{persistenceAdvanced} +# Include{persistenceList} - # Include{ingressList} +# Include{ingressList} # Include{security} - variable: advancedSecurity @@ -430,7 +362,7 @@ questions: schema: type: boolean default: false - # Include{securityContextAdvanced} +# Include{securityContextAdvanced} - variable: podSecurityContext group: "Security and Permissions" diff --git a/charts/stable/automatic-music-downloader/templates/common.yaml b/charts/stable/automatic-music-downloader/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/automatic-music-downloader/templates/common.yaml +++ b/charts/stable/automatic-music-downloader/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/babybuddy/Chart.yaml b/charts/stable/babybuddy/Chart.yaml index 9ce7c26dbff..582a2dfc8f6 100644 --- a/charts/stable/babybuddy/Chart.yaml +++ b/charts/stable/babybuddy/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 appVersion: "1.11.0" kubeVersion: '>=1.16.0-0' -version: 6.0.35 +version: 7.0.0 name: babybuddy description: Helps caregivers track sleep, feedings, diaper changes, tummy time and more to learn about and predict baby's needs without (as much) guess work. type: application @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/babybuddy/SCALE/migrations/migrate b/charts/stable/babybuddy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/babybuddy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/babybuddy/templates/common.yaml b/charts/stable/babybuddy/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/babybuddy/templates/common.yaml +++ b/charts/stable/babybuddy/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/babybuddy/values.yaml b/charts/stable/babybuddy/values.yaml index b251f3d5ce9..f00d989841c 100644 --- a/charts/stable/babybuddy/values.yaml +++ b/charts/stable/babybuddy/values.yaml @@ -1,15 +1,13 @@ image: repository: tccr.io/truecharts/babybuddy pullPolicy: IfNotPresent - tag: v1.11.0@sha256:45733fc8bb55e840ca42e7648fb715931e199049c094d6fb280f1e8e0ebd0880 + tag: v1.11.0@sha256:9721f267b7534ec97c2ebf554bdda26c3c1332d21670b5757da8925c8326102d env: DB_ENGINE: "django.db.backends.postgresql" DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" DB_PORT: "5432" - -envValueFrom: DB_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/baserow/Chart.yaml b/charts/stable/baserow/Chart.yaml index 4d7a8aae129..5c661984160 100644 --- a/charts/stable/baserow/Chart.yaml +++ b/charts/stable/baserow/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.10.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ name: baserow sources: - https://hub.docker.com/r/baserow/baserow - https://gitlab.com/bramw/baserow/ -version: 1.0.1 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/baserow/SCALE/migrations/migrate b/charts/stable/baserow/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/baserow/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/baserow/templates/common.yaml b/charts/stable/baserow/templates/common.yaml index 203f0f2f81f..0d79a65241f 100644 --- a/charts/stable/baserow/templates/common.yaml +++ b/charts/stable/baserow/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for baserow */}} {{- include "baserow.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/baserow/values.yaml b/charts/stable/baserow/values.yaml index da1a09464a2..0619bbf4d7f 100644 --- a/charts/stable/baserow/values.yaml +++ b/charts/stable/baserow/values.yaml @@ -21,8 +21,6 @@ env: BASEROW_CADDY_ADDRESSES: ":{{ .Values.service.main.ports.main.port }}" # User Defined BASEROW_PUBLIC_URL: "http://localhost:10228" - -envValueFrom: DATABASE_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/bazarr/Chart.yaml b/charts/stable/bazarr/Chart.yaml index 2ca8f356cb8..7a6f0e95ddf 100644 --- a/charts/stable/bazarr/Chart.yaml +++ b/charts/stable/bazarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements @@ -26,7 +26,7 @@ sources: - https://github.com/morpheus65535/bazarr - https://hub.docker.com/r/linuxserver/bazarr type: application -version: 10.0.21 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/bazarr/SCALE/migrations/migrate b/charts/stable/bazarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/bazarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/bazarr/templates/common.yaml b/charts/stable/bazarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/bazarr/templates/common.yaml +++ b/charts/stable/bazarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/beets/Chart.yaml b/charts/stable/beets/Chart.yaml index 619e5da9aec..9df520f832a 100644 --- a/charts/stable/beets/Chart.yaml +++ b/charts/stable/beets/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.6.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A music library manager and not, for the most part, a music player. home: https://github.com/truecharts/apps/tree/master/charts/stable/beets icon: https://truecharts.org/_static/img/appicons/beets.png @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-beets - https://beets.io/ type: application -version: 3.0.31 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/beets/SCALE/migrations/migrate b/charts/stable/beets/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/beets/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/beets/templates/common.yaml b/charts/stable/beets/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/beets/templates/common.yaml +++ b/charts/stable/beets/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/blog/Chart.yaml b/charts/stable/blog/Chart.yaml index 0100abc456a..6dc2d1d43df 100644 --- a/charts/stable/blog/Chart.yaml +++ b/charts/stable/blog/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ name: blog sources: - https://github.com/m1k1o/blog - https://github.com/nicholaswilde/docker-blog -version: 1.0.23 +version: 2.0.0 annotations: truecharts.org/catagories: | - hosting diff --git a/charts/stable/blog/SCALE/migrations/migrate b/charts/stable/blog/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/blog/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/blog/templates/common.yaml b/charts/stable/blog/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/blog/templates/common.yaml +++ b/charts/stable/blog/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/blog/values.yaml b/charts/stable/blog/values.yaml index 8e4a94f6816..c15558c8b77 100644 --- a/charts/stable/blog/values.yaml +++ b/charts/stable/blog/values.yaml @@ -3,7 +3,7 @@ image: pullPolicy: IfNotPresent tag: latest@sha256:8928fcf62413459ea8fc5236a1eea28d8a15404f3fc9d0bee154c552000a871b -secret: +secretEnv: BLOG_NICK: username BLOG_PASS: password @@ -25,6 +25,14 @@ env: BLOG_POSTGRES_USER: blog BLOG_POSTGRES_PORT: 5432 BLOG_DB_NAME: blog + BLOG_POSTGRES_PASS: + secretKeyRef: + name: dbcreds + key: postgresql-password + BLOG_POSTGRES_HOST: + secretKeyRef: + name: dbcreds + key: plainhost service: main: @@ -38,16 +46,6 @@ persistence: enabled: true mountPath: "/var/www/html/data" -envValueFrom: - BLOG_POSTGRES_PASS: - secretKeyRef: - name: dbcreds - key: postgresql-password - BLOG_POSTGRES_HOST: - secretKeyRef: - name: dbcreds - key: plainhost - # Enabled postgres postgresql: enabled: true diff --git a/charts/stable/boinc/Chart.yaml b/charts/stable/boinc/Chart.yaml index e33e099ea18..18f5ca59ec3 100644 --- a/charts/stable/boinc/Chart.yaml +++ b/charts/stable/boinc/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: boinc -version: 1.0.33 +version: 2.0.0 appVersion: "latest" description: BOINC is a platform for high-throughput computing on a large scale (thousands or millions of computers). type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/boinc/SCALE/migrations/migrate b/charts/stable/boinc/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/boinc/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/boinc/questions.yaml b/charts/stable/boinc/questions.yaml index e8183b4ba57..7e97a9c2adf 100644 --- a/charts/stable/boinc/questions.yaml +++ b/charts/stable/boinc/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/boinc/templates/common.yaml b/charts/stable/boinc/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/boinc/templates/common.yaml +++ b/charts/stable/boinc/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/booksonic-air/Chart.yaml b/charts/stable/booksonic-air/Chart.yaml index 7feea4ab948..ba1a033c3e7 100644 --- a/charts/stable/booksonic-air/Chart.yaml +++ b/charts/stable/booksonic-air/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2201.1.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Booksonic is a platform for accessing the audibooks you own wherever you are home: https://github.com/truecharts/apps/tree/master/charts/stable/booksonic-air @@ -20,7 +20,7 @@ name: booksonic-air sources: - https://github.com/popeen/Booksonic-Air - https://hub.docker.com/r/linuxserver/booksonic-air -version: 5.0.29 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/booksonic-air/SCALE/migrations/migrate b/charts/stable/booksonic-air/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/booksonic-air/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/booksonic-air/templates/common.yaml b/charts/stable/booksonic-air/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/booksonic-air/templates/common.yaml +++ b/charts/stable/booksonic-air/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/booksonic-air/values.yaml b/charts/stable/booksonic-air/values.yaml index 7d7d8592ed1..ea8bc6c4a4a 100644 --- a/charts/stable/booksonic-air/values.yaml +++ b/charts/stable/booksonic-air/values.yaml @@ -4,7 +4,7 @@ image: # -- image pull policy pullPolicy: IfNotPresent # -- image tag - tag: v2201.1.0@sha256:9e54959c347c6027ee4bdef8b8b1f9f799a6b33182dac75d5e13298f7d1e9f33 + tag: v2201.1.0@sha256:f7c9907522bd37d041a78cbd6e946b1aae7da907a5700c1b3385784aad6850bc securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/bookstack/Chart.yaml b/charts/stable/bookstack/Chart.yaml index d38c34ef687..55dee742ec7 100644 --- a/charts/stable/bookstack/Chart.yaml +++ b/charts/stable/bookstack/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "22.04.2022" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -27,7 +27,7 @@ name: bookstack sources: - https://www.bookstackapp.com/ - https://hub.docker.com/r/linuxserver/bookstack -version: 1.1.22 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/bookstack/SCALE/migrations/migrate b/charts/stable/bookstack/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/bookstack/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/bookstack/templates/common.yaml b/charts/stable/bookstack/templates/common.yaml index 77eb3a9cacc..0ba33776fff 100644 --- a/charts/stable/bookstack/templates/common.yaml +++ b/charts/stable/bookstack/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for bookstack */}} {{- include "bookstack.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/bookstack/values.yaml b/charts/stable/bookstack/values.yaml index 6c0c1089c0d..a00ddd13e4f 100644 --- a/charts/stable/bookstack/values.yaml +++ b/charts/stable/bookstack/values.yaml @@ -6,6 +6,18 @@ image: env: DB_USER: "{{ .Values.mariadb.mariadbUsername }}" DB_DATABASE: "{{ .Values.mariadb.mariadbDatabase }}" + DB_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + DB_PASS: + secretKeyRef: + name: mariadbcreds + key: mariadb-password + APP_KEY: + secretKeyRef: + name: bookstack-secrets + key: APP_KEY securityContext: readOnlyRootFilesystem: false @@ -29,19 +41,6 @@ persistence: enabled: true mountPath: "/config" -envValueFrom: - DB_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - DB_PASS: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - APP_KEY: - secretKeyRef: - name: bookstack-secrets - key: APP_KEY mariadb: enabled: true diff --git a/charts/stable/browserless-chrome/Chart.yaml b/charts/stable/browserless-chrome/Chart.yaml index 72706596e59..88495b7e65f 100644 --- a/charts/stable/browserless-chrome/Chart.yaml +++ b/charts/stable/browserless-chrome/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.53.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Browserless is a web-service that allows for remote clients to connect, drive, and execute headless work home: https://github.com/truecharts/apps/tree/master/charts/stable/browserless-chrome icon: https://truecharts.org/_static/img/appicons/browserless-chrome.png @@ -20,7 +20,7 @@ name: browserless-chrome sources: - https://docs.browserless.io/docs/docker.html - https://hub.docker.com/r/browserless/chrome/ -version: 1.0.17 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/browserless-chrome/SCALE/migrations/migrate b/charts/stable/browserless-chrome/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/browserless-chrome/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/browserless-chrome/questions.yaml b/charts/stable/browserless-chrome/questions.yaml index 9814675b787..6f75a823fe9 100644 --- a/charts/stable/browserless-chrome/questions.yaml +++ b/charts/stable/browserless-chrome/questions.yaml @@ -93,7 +93,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/browserless-chrome/templates/common.yaml b/charts/stable/browserless-chrome/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/browserless-chrome/templates/common.yaml +++ b/charts/stable/browserless-chrome/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/browserless-chrome/values.yaml b/charts/stable/browserless-chrome/values.yaml index 45b365b4a22..2802b90f134 100644 --- a/charts/stable/browserless-chrome/values.yaml +++ b/charts/stable/browserless-chrome/values.yaml @@ -10,7 +10,7 @@ imagePuppeteer: imageSelector: "image" -secret: +secretEnv: TOKEN: "" env: diff --git a/charts/stable/budge/Chart.yaml b/charts/stable/budge/Chart.yaml index ebd57406e68..1d30748cc7f 100644 --- a/charts/stable/budge/Chart.yaml +++ b/charts/stable/budge/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.0.9" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Budge is an open source 'budgeting with envelopes' personal finance app. home: https://github.com/truecharts/apps/tree/master/charts/stable/budge icon: https://truecharts.org/_static/img/appicons/budge.png @@ -19,7 +19,7 @@ name: budge sources: - https://github.com/linuxserver/budge - https://github.com/linuxserver/docker-BudgE -version: 1.0.33 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/budge/SCALE/migrations/migrate b/charts/stable/budge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/budge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/budge/templates/common.yaml b/charts/stable/budge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/budge/templates/common.yaml +++ b/charts/stable/budge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/calibre-web/Chart.yaml b/charts/stable/calibre-web/Chart.yaml index 32dca806167..93ac2e04c5d 100644 --- a/charts/stable/calibre-web/Chart.yaml +++ b/charts/stable/calibre-web/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.6.18" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/linuxserver/calibre-web/ - https://github.com/janeczku/calibre-web type: application -version: 10.0.29 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/calibre-web/SCALE/migrations/migrate b/charts/stable/calibre-web/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/calibre-web/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/calibre-web/templates/common.yaml b/charts/stable/calibre-web/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/calibre-web/templates/common.yaml +++ b/charts/stable/calibre-web/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/calibre/Chart.yaml b/charts/stable/calibre/Chart.yaml index 505d80171fa..df9c9ccd65a 100644 --- a/charts/stable/calibre/Chart.yaml +++ b/charts/stable/calibre/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.43.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Calibre is a powerful and easy to use e-book manager. home: https://github.com/truecharts/apps/tree/master/charts/stable/calibre icon: https://truecharts.org/_static/img/appicons/calibre.png @@ -18,7 +18,7 @@ name: calibre sources: - https://hub.docker.com/r/linuxserver/calibre/ - https://github.com/kovidgoyal/calibre/ -version: 6.0.30 +version: 7.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/calibre/SCALE/migrations/migrate b/charts/stable/calibre/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/calibre/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/calibre/questions.yaml b/charts/stable/calibre/questions.yaml index 41ccacfbcd3..5f36233b181 100644 --- a/charts/stable/calibre/questions.yaml +++ b/charts/stable/calibre/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/calibre/templates/common.yaml b/charts/stable/calibre/templates/common.yaml index c53fdc73fbd..e311a08fdae 100644 --- a/charts/stable/calibre/templates/common.yaml +++ b/charts/stable/calibre/templates/common.yaml @@ -1,3 +1,3 @@ --- -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/calibre/values.yaml b/charts/stable/calibre/values.yaml index 392c3ad6cb3..4eee4153697 100644 --- a/charts/stable/calibre/values.yaml +++ b/charts/stable/calibre/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: PASSWORD: "" env: diff --git a/charts/stable/chevereto/Chart.yaml b/charts/stable/chevereto/Chart.yaml index 76458cacb9d..070fff77382 100644 --- a/charts/stable/chevereto/Chart.yaml +++ b/charts/stable/chevereto/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: chevereto -version: 1.0.15 +version: 2.0.0 appVersion: "1.6.2" description: Chevereto is an image hosting software that allows you to create a beautiful and full-featured image hosting website on your own server. type: application @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ diff --git a/charts/stable/chevereto/SCALE/migrations/migrate b/charts/stable/chevereto/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/chevereto/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/chevereto/templates/common.yaml b/charts/stable/chevereto/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/chevereto/templates/common.yaml +++ b/charts/stable/chevereto/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/chevereto/values.yaml b/charts/stable/chevereto/values.yaml index 702ff728197..727a9bd9c2d 100644 --- a/charts/stable/chevereto/values.yaml +++ b/charts/stable/chevereto/values.yaml @@ -18,10 +18,18 @@ env: CHEVERETO_DB_USER: "{{ .Values.mariadb.mariadbDatabase }}" CHEVERETO_DB_PORT: "3306" CHEVERETO_TAG: "free" + CHEVERETO_DB_HOST: + secretKeyRef: + name: mariadbcreds + key: plainporthost + CHEVERETO_DB_PASS: + secretKeyRef: + name: mariadbcreds + key: mariadb-password envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-chevereto' + name: '{{ include "tc.common.names.fullname" . }}-chevereto' chevereto: https: false @@ -36,16 +44,6 @@ configmap: CHEVERETO_DISABLE_UPDATE_HTTP: "{{ ternary \"1\" \"0\" .Values.chevereto.disable_update_http }}" CHEVERETO_DISABLE_UPDATE_CLI: "{{ ternary \"1\" \"0\" .Values.chevereto.disable_update_cli }}" -envValueFrom: - CHEVERETO_DB_HOST: - secretKeyRef: - name: mariadbcreds - key: plainporthost - CHEVERETO_DB_PASS: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - service: main: ports: diff --git a/charts/stable/clamav/Chart.yaml b/charts/stable/clamav/Chart.yaml index a6706d4edca..80f29faf2e2 100644 --- a/charts/stable/clamav/Chart.yaml +++ b/charts/stable/clamav/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.105.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: ClamAV® is an open source antivirus engine for detecting trojans, viruses, malware & other malicious threats. home: https://github.com/truecharts/apps/tree/master/charts/stable/clamav icon: https://truecharts.org/_static/img/appicons/clamav.png @@ -21,7 +21,7 @@ sources: - https://hub.docker.com/r/clamav/clamav - https://docs.clamav.net/ type: application -version: 2.1.20 +version: 3.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/clamav/SCALE/migrations/migrate b/charts/stable/clamav/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/clamav/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/clamav/templates/_cronjob.tpl b/charts/stable/clamav/templates/_cronjob.tpl index e9ac6804584..d4dccb6c248 100644 --- a/charts/stable/clamav/templates/_cronjob.tpl +++ b/charts/stable/clamav/templates/_cronjob.tpl @@ -1,6 +1,6 @@ {{/* Define the cronjob */}} {{- define "clamav.cronjob" -}} -{{- $jobName := include "common.names.fullname" . }} +{{- $jobName := include "tc.common.names.fullname" . }} --- apiVersion: batch/v1beta1 @@ -8,7 +8,7 @@ kind: CronJob metadata: name: {{ printf "%s-cronjob" $jobName }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} spec: schedule: "{{ .Values.clamav.cron_schedule }}" concurrencyPolicy: Forbid @@ -25,7 +25,7 @@ spec: metadata: spec: restartPolicy: Never - {{- with (include "common.controller.volumes" . | trim) }} + {{- with (include "tc.common.controller.volumes" . | trim) }} volumes: {{- nindent 12 . }} {{- end }} @@ -76,7 +76,7 @@ spec: else echo "Exit Status: $status."; fi; - {{- with (include "common.controller.volumeMounts" . | trim) }} + {{- with (include "tc.common.controller.volumeMounts" . | trim) }} volumeMounts: {{ nindent 16 . }} {{- end }} diff --git a/charts/stable/clamav/templates/common.yaml b/charts/stable/clamav/templates/common.yaml index 2a6d613a928..af85bfa2b33 100644 --- a/charts/stable/clamav/templates/common.yaml +++ b/charts/stable/clamav/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{- if and .Values.clamav.cron_enabled .Values.clamav.cron_schedule}} {{/* Render cronjob for clamav */}} @@ -7,4 +7,4 @@ {{- end -}} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/clarkson/Chart.yaml b/charts/stable/clarkson/Chart.yaml index b95c4ca6047..b6383fc1313 100644 --- a/charts/stable/clarkson/Chart.yaml +++ b/charts/stable/clarkson/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.1.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ name: clarkson sources: - https://github.com/linuxserver/Clarkson - https://hub.docker.com/r/linuxserver/clarkson -version: 1.0.25 +version: 2.0.0 annotations: truecharts.org/catagories: | - vehicle diff --git a/charts/stable/clarkson/SCALE/migrations/migrate b/charts/stable/clarkson/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/clarkson/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/clarkson/templates/common.yaml b/charts/stable/clarkson/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/clarkson/templates/common.yaml +++ b/charts/stable/clarkson/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/clarkson/values.yaml b/charts/stable/clarkson/values.yaml index 4ba04cd049e..35a2b16008b 100644 --- a/charts/stable/clarkson/values.yaml +++ b/charts/stable/clarkson/values.yaml @@ -24,8 +24,6 @@ service: env: MYSQL_USERNAME: "{{ .Values.mariadb.mariadbUsername }}" - -envValueFrom: MYSQL_HOST: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/cloud9/Chart.yaml b/charts/stable/cloud9/Chart.yaml index 41d9e1ebafb..a9e7f537daf 100644 --- a/charts/stable/cloud9/Chart.yaml +++ b/charts/stable/cloud9/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.29.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A complete web based IDE with terminal access home: https://github.com/truecharts/apps/tree/master/charts/stable/cloud9 icon: https://truecharts.org/_static/img/appicons/cloud9.png @@ -23,7 +23,7 @@ sources: - https://github.com/c9/core - https://hub.docker.com/r/linuxserver/cloud9 type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/cloud9/SCALE/migrations/migrate b/charts/stable/cloud9/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/cloud9/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/cloud9/templates/common.yaml b/charts/stable/cloud9/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/cloud9/templates/common.yaml +++ b/charts/stable/cloud9/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/code-server/Chart.yaml b/charts/stable/code-server/Chart.yaml index 3f29ff4ee9d..2d34afa17ec 100644 --- a/charts/stable/code-server/Chart.yaml +++ b/charts/stable/code-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.4.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Run VS Code on any machine anywhere and access it in the browser. home: https://github.com/truecharts/apps/tree/master/charts/stable/code-server icon: https://truecharts.org/_static/img/appicons/codeserver.png @@ -21,7 +21,7 @@ name: code-server sources: - https://github.com/cdr/code-server type: application -version: 3.0.24 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/code-server/SCALE/migrations/migrate b/charts/stable/code-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/code-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/code-server/templates/common.yaml b/charts/stable/code-server/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/code-server/templates/common.yaml +++ b/charts/stable/code-server/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml index 20d736af501..0c6da9ab911 100644 --- a/charts/stable/collabora-online/Chart.yaml +++ b/charts/stable/collabora-online/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "21.11.5.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "Collabora Online Development Edition \u2013 an awesome, Online Office\ \ suite image suitable for home use." @@ -22,7 +22,7 @@ sources: - https://sdk.collaboraonline.com/contents.html - https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm type: application -version: 11.0.27 +version: 12.0.0 annotations: truecharts.org/catagories: | - office diff --git a/charts/stable/collabora-online/SCALE/migrations/migrate b/charts/stable/collabora-online/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/collabora-online/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/collabora-online/questions.yaml b/charts/stable/collabora-online/questions.yaml index 4476f4ba6f0..aced1fbad84 100644 --- a/charts/stable/collabora-online/questions.yaml +++ b/charts/stable/collabora-online/questions.yaml @@ -83,7 +83,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/collabora-online/templates/common.yaml b/charts/stable/collabora-online/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/collabora-online/templates/common.yaml +++ b/charts/stable/collabora-online/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/collabora-online/values.yaml b/charts/stable/collabora-online/values.yaml index 0441461682b..169d1dd78a3 100644 --- a/charts/stable/collabora-online/values.yaml +++ b/charts/stable/collabora-online/values.yaml @@ -17,7 +17,7 @@ service: main: port: 10105 targetPort: 9980 -secret: +secretEnv: username: admin password: changeme diff --git a/charts/stable/commento-plusplus/Chart.yaml b/charts/stable/commento-plusplus/Chart.yaml index 22991eceedb..123798b74a2 100644 --- a/charts/stable/commento-plusplus/Chart.yaml +++ b/charts/stable/commento-plusplus/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.8.7" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -22,7 +22,7 @@ name: commento-plusplus sources: - https://github.com/souramoo/commentoplusplus - https://hub.docker.com/r/caroga/commentoplusplus -version: 1.0.2 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/commento-plusplus/SCALE/migrations/migrate b/charts/stable/commento-plusplus/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/commento-plusplus/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/commento-plusplus/templates/common.yaml b/charts/stable/commento-plusplus/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/commento-plusplus/templates/common.yaml +++ b/charts/stable/commento-plusplus/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/commento-plusplus/values.yaml b/charts/stable/commento-plusplus/values.yaml index 563b6c2d6cc..453a4cfcef8 100644 --- a/charts/stable/commento-plusplus/values.yaml +++ b/charts/stable/commento-plusplus/values.yaml @@ -11,8 +11,6 @@ env: COMMENTO_ORIGIN: "http://localhost:8080" COMMENTO_ENABLE_WILDCARDS: true COMMENTO_ENABLE_LOGGING: false - -envValueFrom: COMMENTO_POSTGRES: secretKeyRef: name: dbcreds diff --git a/charts/stable/couchpotato/Chart.yaml b/charts/stable/couchpotato/Chart.yaml index 80073afbe9f..790bda5f14a 100644 --- a/charts/stable/couchpotato/Chart.yaml +++ b/charts/stable/couchpotato/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: couchpotato -version: 1.0.19 +version: 2.0.0 appVersion: "2021.11.22" description: Couchpotato is an automatic NZB and torrent downloader. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/couchpotato/SCALE/migrations/migrate b/charts/stable/couchpotato/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/couchpotato/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/couchpotato/templates/common.yaml b/charts/stable/couchpotato/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/couchpotato/templates/common.yaml +++ b/charts/stable/couchpotato/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/cryptofolio/Chart.yaml b/charts/stable/cryptofolio/Chart.yaml index 81fd96c7a3c..9f4b66e68b3 100644 --- a/charts/stable/cryptofolio/Chart.yaml +++ b/charts/stable/cryptofolio/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.2.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Track your cryptocurrency holdings/portfolio home: https://github.com/truecharts/apps/tree/master/charts/stable/cryptofolio icon: https://truecharts.org/_static/img/appicons/cryptofolio.png @@ -17,7 +17,7 @@ maintainers: name: cryptofolio sources: - https://github.com/Xtrendence/cryptofolio -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/cryptofolio/SCALE/migrations/migrate b/charts/stable/cryptofolio/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/cryptofolio/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/cryptofolio/templates/common.yaml b/charts/stable/cryptofolio/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/cryptofolio/templates/common.yaml +++ b/charts/stable/cryptofolio/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/custom-app/Chart.yaml b/charts/stable/custom-app/Chart.yaml index 0c5334d35b2..4bd5aa92abe 100644 --- a/charts/stable/custom-app/Chart.yaml +++ b/charts/stable/custom-app/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.20.1144" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Advanced tool to create your own TrueCharts-based App home: https://github.com/truecharts/apps/tree/master/charts/stable/custom-app @@ -19,7 +19,7 @@ name: custom-app sources: - https://github.com/truecharts/apps/tree/master/charts/stable/custom-app type: application -version: 4.0.54 +version: 5.0.0 annotations: truecharts.org/catagories: | - custom diff --git a/charts/stable/custom-app/SCALE/migrations/migrate b/charts/stable/custom-app/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/custom-app/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/custom-app/ci/test-values.yaml b/charts/stable/custom-app/ci/test-values.yaml index 50d41ab3fb4..7ec560a0446 100644 --- a/charts/stable/custom-app/ci/test-values.yaml +++ b/charts/stable/custom-app/ci/test-values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/jackett pullPolicy: IfNotPresent - tag: v0.20.1144@sha256:3bc1ad9b684adcceb56990c9478b54e41094f524b7a894d6a37ae5d05f55643a + tag: v0.20.1150@sha256:b7d568151ce4cafff789929056471ee9d1884c667983190d555c8769d66288fc securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/custom-app/templates/common.yaml b/charts/stable/custom-app/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/custom-app/templates/common.yaml +++ b/charts/stable/custom-app/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/custom-app/values.yaml b/charts/stable/custom-app/values.yaml index 54ce7da7098..40744ed617a 100644 --- a/charts/stable/custom-app/values.yaml +++ b/charts/stable/custom-app/values.yaml @@ -1,4 +1,4 @@ image: repository: tccr.io/truecharts/jackett pullPolicy: IfNotPresent - tag: v0.20.1144@sha256:3bc1ad9b684adcceb56990c9478b54e41094f524b7a894d6a37ae5d05f55643a + tag: v0.20.1150@sha256:b7d568151ce4cafff789929056471ee9d1884c667983190d555c8769d66288fc diff --git a/charts/stable/cyberchef/Chart.yaml b/charts/stable/cyberchef/Chart.yaml index 90bda73f948..162707634c5 100644 --- a/charts/stable/cyberchef/Chart.yaml +++ b/charts/stable/cyberchef/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "9.38.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: CyberChef is a simple, intuitive web app for carrying out all manner of "cyber" operations within a web browser. home: https://github.com/truecharts/apps/tree/master/charts/stable/cyberchef icon: https://truecharts.org/_static/img/appicons/cyberchef.png @@ -17,7 +17,7 @@ maintainers: name: cyberchef sources: - https://hub.docker.com/r/mpepping/cyberchef -version: 1.0.31 +version: 2.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/cyberchef/SCALE/migrations/migrate b/charts/stable/cyberchef/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/cyberchef/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/cyberchef/templates/common.yaml b/charts/stable/cyberchef/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/cyberchef/templates/common.yaml +++ b/charts/stable/cyberchef/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/cyberchef/values.yaml b/charts/stable/cyberchef/values.yaml index 05f1b7e71dc..de59a7eb90d 100644 --- a/charts/stable/cyberchef/values.yaml +++ b/charts/stable/cyberchef/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/cyberchef - tag: v9.38.6@sha256:f70a91018cfdd3d5fad2fb1c172b72a5f3ecdeae9b25e0515027a06a18ac5ff5 + tag: v9.38.6@sha256:cd76518bb58a63bb97d8cac8b8dd51196ad88da0a961241df14ffa4d892a83f1 pullPolicy: IfNotPresent securityContext: diff --git a/charts/stable/darktable/Chart.yaml b/charts/stable/darktable/Chart.yaml index 7c9a69adb36..5a992f4c3b6 100644 --- a/charts/stable/darktable/Chart.yaml +++ b/charts/stable/darktable/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: darktable -version: 2.0.19 +version: 3.0.0 appVersion: "3.6.1" description: Darktable is an open source photography workflow application and raw developer. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/darktable/SCALE/migrations/migrate b/charts/stable/darktable/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/darktable/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/darktable/templates/common.yaml b/charts/stable/darktable/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/darktable/templates/common.yaml +++ b/charts/stable/darktable/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/davos/Chart.yaml b/charts/stable/davos/Chart.yaml index 2f5f67edb33..c0b02999e52 100644 --- a/charts/stable/davos/Chart.yaml +++ b/charts/stable/davos/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.2.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An FTP automation tool that periodically scans given host locations for new files. home: https://github.com/truecharts/apps/tree/master/charts/stable/davos @@ -22,7 +22,7 @@ sources: - https://github.com/linuxserver/docker-davos - https://github.com/linuxserver/davos/ type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/davos/SCALE/migrations/migrate b/charts/stable/davos/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/davos/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/davos/templates/common.yaml b/charts/stable/davos/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/davos/templates/common.yaml +++ b/charts/stable/davos/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ddclient/Chart.yaml b/charts/stable/ddclient/Chart.yaml index 90c5c689b4e..3c12edc4887 100644 --- a/charts/stable/ddclient/Chart.yaml +++ b/charts/stable/ddclient/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ddclient -version: 1.0.19 +version: 2.0.0 appVersion: "3.9.1" description: Ddclient is a Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Provider. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/ddclient/SCALE/migrations/migrate b/charts/stable/ddclient/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ddclient/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ddclient/templates/common.yaml b/charts/stable/ddclient/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ddclient/templates/common.yaml +++ b/charts/stable/ddclient/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ddns-go/Chart.yaml b/charts/stable/ddns-go/Chart.yaml index c7f8b0a762a..d2ce3b822d5 100644 --- a/charts/stable/ddns-go/Chart.yaml +++ b/charts/stable/ddns-go/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ddns-go -version: 1.0.25 +version: 2.0.0 appVersion: "3.7.1" description: Automatically obtain your public network IPv4 or IPv6 address and resolve it to the corresponding domain name service type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/ddns-go/SCALE/migrations/migrate b/charts/stable/ddns-go/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ddns-go/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ddns-go/templates/common.yaml b/charts/stable/ddns-go/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ddns-go/templates/common.yaml +++ b/charts/stable/ddns-go/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ddns-updater/Chart.yaml b/charts/stable/ddns-updater/Chart.yaml index 808dadaa0c5..bb597415185 100644 --- a/charts/stable/ddns-updater/Chart.yaml +++ b/charts/stable/ddns-updater/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.4.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Light container updating DNS A and/or AAAA records periodically for multiple DNS providers home: https://github.com/truecharts/apps/tree/master/charts/stable/ddns-updater icon: https://truecharts.org/_static/img/appicons/ddns-updater.png @@ -18,7 +18,7 @@ name: ddns-updater sources: - https://github.com/qdm12/ddns-updater - https://hub.docker.com/r/qmcgaw/ddns-updater -version: 1.0.10 +version: 2.0.0 annotations: truecharts.org/catagories: | - network diff --git a/charts/stable/ddns-updater/SCALE/migrations/migrate b/charts/stable/ddns-updater/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ddns-updater/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ddns-updater/templates/common.yaml b/charts/stable/ddns-updater/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ddns-updater/templates/common.yaml +++ b/charts/stable/ddns-updater/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/deconz/Chart.yaml b/charts/stable/deconz/Chart.yaml index 9b637292ede..e24b1112e40 100644 --- a/charts/stable/deconz/Chart.yaml +++ b/charts/stable/deconz/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.16.01" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: deCONZ is an easy to use control software, with which you can set up and control Zigbee networks of any size without further programming effort. home: https://github.com/truecharts/apps/tree/master/charts/stable/deconz @@ -22,7 +22,7 @@ name: deconz sources: - https://github.com/dresden-elektronik/deconz-rest-plugin - https://github.com/marthoc/docker-deconz -version: 7.0.29 +version: 8.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/deconz/SCALE/migrations/migrate b/charts/stable/deconz/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/deconz/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/deconz/questions.yaml b/charts/stable/deconz/questions.yaml index d566837c9e3..7c6084bfac1 100644 --- a/charts/stable/deconz/questions.yaml +++ b/charts/stable/deconz/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/deconz/templates/common.yaml b/charts/stable/deconz/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/deconz/templates/common.yaml +++ b/charts/stable/deconz/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/deconz/values.yaml b/charts/stable/deconz/values.yaml index e85dd66f227..945b6e04351 100644 --- a/charts/stable/deconz/values.yaml +++ b/charts/stable/deconz/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: DECONZ_VNC_PASSWORD: "" env: diff --git a/charts/stable/deemix/Chart.yaml b/charts/stable/deemix/Chart.yaml index b3ef430d01f..4678846cd1e 100644 --- a/charts/stable/deemix/Chart.yaml +++ b/charts/stable/deemix/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: deemix is a deezer downloader built from the ashes of Deezloader Remix. home: https://github.com/truecharts/apps/tree/master/charts/stable/deemix @@ -22,7 +22,7 @@ sources: - https://gitlab.com/Bockiii/deemix-docker.git - https://git.freezerapp.xyz/RemixDev/deemix-py type: application -version: 2.0.16 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/deemix/SCALE/migrations/migrate b/charts/stable/deemix/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/deemix/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/deemix/templates/common.yaml b/charts/stable/deemix/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/deemix/templates/common.yaml +++ b/charts/stable/deemix/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/deepstack/Chart.yaml b/charts/stable/deepstack/Chart.yaml index 40ca8512207..ac342cef2fe 100644 --- a/charts/stable/deepstack/Chart.yaml +++ b/charts/stable/deepstack/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.01.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: DeepStack AI provides AI features including Face Recognition, Object Detection, Scene Recognition and custom AI Models @@ -22,7 +22,7 @@ sources: - https://hub.docker.com/r/deepquestai/deepstack - https://www.deepstack.cc/ type: application -version: 3.0.21 +version: 4.0.0 annotations: truecharts.org/catagories: | - AI diff --git a/charts/stable/deepstack/SCALE/migrations/migrate b/charts/stable/deepstack/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/deepstack/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/games/impostor-server/ci/base-values.yaml b/charts/stable/deepstack/ci/basic-values.yaml similarity index 100% rename from charts/games/impostor-server/ci/base-values.yaml rename to charts/stable/deepstack/ci/basic-values.yaml diff --git a/charts/stable/deepstack/questions.yaml b/charts/stable/deepstack/questions.yaml index 9a9eb94ff21..8077b290fcc 100644 --- a/charts/stable/deepstack/questions.yaml +++ b/charts/stable/deepstack/questions.yaml @@ -87,7 +87,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/deepstack/templates/common.yaml b/charts/stable/deepstack/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/deepstack/templates/common.yaml +++ b/charts/stable/deepstack/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/deepstack/values.yaml b/charts/stable/deepstack/values.yaml index c4c547b8e48..a17de818eb7 100644 --- a/charts/stable/deepstack/values.yaml +++ b/charts/stable/deepstack/values.yaml @@ -25,7 +25,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: API-KEY: "" ADMIN-KEY: "" @@ -38,7 +38,7 @@ env: envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-deepstack' + name: '{{ include "tc.common.names.fullname" . }}-deepstack' deepstack: vision_face: true diff --git a/charts/stable/deluge/Chart.yaml b/charts/stable/deluge/Chart.yaml index e1060ab0e16..c0fc148129a 100644 --- a/charts/stable/deluge/Chart.yaml +++ b/charts/stable/deluge/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.0.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Deluge App for TrueNAS SCALE home: https://github.com/truecharts/apps/tree/master/charts/stable/deluge @@ -21,7 +21,7 @@ name: deluge sources: - https://github.com/deluge-torrent/deluge type: application -version: 10.0.23 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/deluge/SCALE/migrations/migrate b/charts/stable/deluge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/deluge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/deluge/templates/common.yaml b/charts/stable/deluge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/deluge/templates/common.yaml +++ b/charts/stable/deluge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/digikam/Chart.yaml b/charts/stable/digikam/Chart.yaml index e0338dbee1c..e553166c2af 100644 --- a/charts/stable/digikam/Chart.yaml +++ b/charts/stable/digikam/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "7.3.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Professional Photo Management with the Power of Open Source home: https://github.com/truecharts/apps/tree/master/charts/stable/digikam icon: https://truecharts.org/_static/img/appicons/digikam.png @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-digikam - https://www.digikam.org/ type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/digikam/SCALE/migrations/migrate b/charts/stable/digikam/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/digikam/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/digikam/templates/common.yaml b/charts/stable/digikam/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/digikam/templates/common.yaml +++ b/charts/stable/digikam/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/dillinger/Chart.yaml b/charts/stable/dillinger/Chart.yaml index d33255757bf..169e3842a78 100644 --- a/charts/stable/dillinger/Chart.yaml +++ b/charts/stable/dillinger/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: dillinger -version: 1.0.19 +version: 2.0.0 appVersion: "3.39.1" description: Dillinger is a cloud-enabled, mobile-ready, offline-storage, AngularJS powered HTML5 Markdown editor. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/dillinger/SCALE/migrations/migrate b/charts/stable/dillinger/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/dillinger/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/dillinger/templates/common.yaml b/charts/stable/dillinger/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/dillinger/templates/common.yaml +++ b/charts/stable/dillinger/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/dizquetv/Chart.yaml b/charts/stable/dizquetv/Chart.yaml index 812d99f72ff..f32fd8b35b0 100644 --- a/charts/stable/dizquetv/Chart.yaml +++ b/charts/stable/dizquetv/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.5.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Create live TV channel streams from media on your Plex servers. home: https://github.com/truecharts/apps/tree/master/charts/stable/dizquetv icon: https://truecharts.org/_static/img/appicons/dizquetv.png @@ -19,7 +19,7 @@ name: dizquetv sources: - https://github.com/vexorian/dizquetv - https://hub.docker.com/r/vexorian/dizquetv -version: 6.0.19 +version: 7.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/dizquetv/SCALE/migrations/migrate b/charts/stable/dizquetv/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/dizquetv/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/dizquetv/templates/common.yaml b/charts/stable/dizquetv/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/dizquetv/templates/common.yaml +++ b/charts/stable/dizquetv/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/core/docker-compose/.helmignore b/charts/stable/docker-compose/.helmignore similarity index 100% rename from charts/core/docker-compose/.helmignore rename to charts/stable/docker-compose/.helmignore diff --git a/charts/core/docker-compose/CHANGELOG.md b/charts/stable/docker-compose/CHANGELOG.md similarity index 100% rename from charts/core/docker-compose/CHANGELOG.md rename to charts/stable/docker-compose/CHANGELOG.md diff --git a/charts/core/amd-gpu-plugin/CONFIG.md b/charts/stable/docker-compose/CONFIG.md similarity index 100% rename from charts/core/amd-gpu-plugin/CONFIG.md rename to charts/stable/docker-compose/CONFIG.md diff --git a/charts/core/docker-compose/Chart.yaml b/charts/stable/docker-compose/Chart.yaml similarity index 95% rename from charts/core/docker-compose/Chart.yaml rename to charts/stable/docker-compose/Chart.yaml index 777203ab662..5840617ebaa 100644 --- a/charts/core/docker-compose/Chart.yaml +++ b/charts/stable/docker-compose/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "20.10.16" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Dedicated App for using Docker-Compose on TrueNAS SCALE home: https://github.com/truecharts/apps/tree/master/charts/core/docker-compose @@ -20,7 +20,7 @@ name: docker-compose sources: - https://hub.docker.com/_/docker type: application -version: 1.0.30 +version: 2.0.0 annotations: truecharts.org/catagories: | - docker diff --git a/charts/core/docker-compose/README.md b/charts/stable/docker-compose/README.md similarity index 100% rename from charts/core/docker-compose/README.md rename to charts/stable/docker-compose/README.md diff --git a/charts/core/docker-compose/helm-values.md b/charts/stable/docker-compose/helm-values.md similarity index 100% rename from charts/core/docker-compose/helm-values.md rename to charts/stable/docker-compose/helm-values.md diff --git a/charts/core/docker-compose/questions.yaml b/charts/stable/docker-compose/questions.yaml similarity index 100% rename from charts/core/docker-compose/questions.yaml rename to charts/stable/docker-compose/questions.yaml diff --git a/charts/core/docker-compose/security.md b/charts/stable/docker-compose/security.md similarity index 100% rename from charts/core/docker-compose/security.md rename to charts/stable/docker-compose/security.md diff --git a/charts/stable/docker-compose/templates/common.yaml b/charts/stable/docker-compose/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/docker-compose/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/core/docker-compose/values.yaml b/charts/stable/docker-compose/values.yaml similarity index 100% rename from charts/core/docker-compose/values.yaml rename to charts/stable/docker-compose/values.yaml diff --git a/charts/stable/dokuwiki/Chart.yaml b/charts/stable/dokuwiki/Chart.yaml index 690548f553f..5e5687dad74 100644 --- a/charts/stable/dokuwiki/Chart.yaml +++ b/charts/stable/dokuwiki/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: dokuwiki -version: 2.0.33 +version: 3.0.0 appVersion: "20200729.0" description: Dokuwiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/dokuwiki/SCALE/migrations/migrate b/charts/stable/dokuwiki/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/dokuwiki/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/dokuwiki/questions.yaml b/charts/stable/dokuwiki/questions.yaml index 54341404a00..ed057a7f9ef 100644 --- a/charts/stable/dokuwiki/questions.yaml +++ b/charts/stable/dokuwiki/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/dokuwiki/templates/common.yaml b/charts/stable/dokuwiki/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/dokuwiki/templates/common.yaml +++ b/charts/stable/dokuwiki/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/dokuwiki/values.yaml b/charts/stable/dokuwiki/values.yaml index eeee99e2189..843e9d91108 100644 --- a/charts/stable/dokuwiki/values.yaml +++ b/charts/stable/dokuwiki/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/dokuwiki pullPolicy: IfNotPresent - tag: v20200729.0.0@sha256:3c2d0aae67f180a5d480289eca4f091d8687d3995d7c9d3cfd09045d41e3a9a3 + tag: v20200729.0.0@sha256:a8266c85bad03dd062683b5c68d3432c57bdce9a8f35ad7719dd9141ccb336fc securityContext: runAsNonRoot: false @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: DOKUWIKI_USERNAME: "admin" DOKUWIKI_PASSWORD: "supersecret" DOKUWIKI_FULL_NAME: "Super Admin" diff --git a/charts/stable/domoticz/Chart.yaml b/charts/stable/domoticz/Chart.yaml index 0534d0183c2..dd8e3a80238 100644 --- a/charts/stable/domoticz/Chart.yaml +++ b/charts/stable/domoticz/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: domoticz -version: 1.0.26 +version: 2.0.0 appVersion: "2022.1.202" description: "Domoticz is a Home Automation System that lets you monitor and configure various devices like Lights, Switches and much more." type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/domoticz/SCALE/migrations/migrate b/charts/stable/domoticz/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/domoticz/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/domoticz/templates/common.yaml b/charts/stable/domoticz/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/domoticz/templates/common.yaml +++ b/charts/stable/domoticz/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/doplarr/Chart.yaml b/charts/stable/doplarr/Chart.yaml index aa895617514..19354b56095 100644 --- a/charts/stable/doplarr/Chart.yaml +++ b/charts/stable/doplarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.5.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An *arr Request Bot for Discord home: https://github.com/truecharts/apps/tree/master/charts/stable/doplarr icon: https://truecharts.org/_static/img/appicons/doplarr.png @@ -17,7 +17,7 @@ maintainers: name: doplarr sources: - https://github.com/kiranshila/Doplarr -version: 1.0.17 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/doplarr/SCALE/migrations/migrate b/charts/stable/doplarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/doplarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/doplarr/questions.yaml b/charts/stable/doplarr/questions.yaml index 5c334bfa3df..ae23b248e25 100644 --- a/charts/stable/doplarr/questions.yaml +++ b/charts/stable/doplarr/questions.yaml @@ -52,7 +52,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/doplarr/templates/common.yaml b/charts/stable/doplarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/doplarr/templates/common.yaml +++ b/charts/stable/doplarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/doplarr/values.yaml b/charts/stable/doplarr/values.yaml index 946a3c59d96..97280a61756 100644 --- a/charts/stable/doplarr/values.yaml +++ b/charts/stable/doplarr/values.yaml @@ -3,7 +3,7 @@ image: tag: v3.5.0@sha256:6ae229bab8495deaf76295a42d073c2d8e53f331b594b9f50a4b36466b374a9d pullPolicy: IfNotPresent -secret: +secretEnv: OVERSEERR__API: "" OVERSEERR__DEFAULT_ID: "" SONARR__API: "" diff --git a/charts/stable/double-take/Chart.yaml b/charts/stable/double-take/Chart.yaml index 38a6bb7c15f..46c05c74049 100644 --- a/charts/stable/double-take/Chart.yaml +++ b/charts/stable/double-take/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: double-take -version: 1.0.18 +version: 2.0.0 appVersion: "1.11.0" description: Unified UI and API for processing and training images for facial recognition type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/double-take/SCALE/migrations/migrate b/charts/stable/double-take/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/double-take/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/double-take/templates/common.yaml b/charts/stable/double-take/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/double-take/templates/common.yaml +++ b/charts/stable/double-take/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/doublecommander/Chart.yaml b/charts/stable/doublecommander/Chart.yaml index 776e93f9a84..d6b17b82f35 100644 --- a/charts/stable/doublecommander/Chart.yaml +++ b/charts/stable/doublecommander/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.8.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A free cross platform open source file manager with two panels side by side. home: https://github.com/truecharts/apps/tree/master/charts/stable/doublecommander @@ -22,7 +22,7 @@ sources: - https://github.com/linuxserver/docker-doublecommander - https://doublecmd.sourceforge.io/ type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/doublecommander/SCALE/migrations/migrate b/charts/stable/doublecommander/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/doublecommander/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/doublecommander/templates/common.yaml b/charts/stable/doublecommander/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/doublecommander/templates/common.yaml +++ b/charts/stable/doublecommander/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/drawio/Chart.yaml b/charts/stable/drawio/Chart.yaml index 2170bf7035c..d804bd7c9d9 100644 --- a/charts/stable/drawio/Chart.yaml +++ b/charts/stable/drawio/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "18.1.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Drawio is free online diagram software. home: https://github.com/truecharts/apps/tree/master/charts/stable/drawio icon: https://truecharts.org/_static/img/appicons/drawio.png @@ -18,7 +18,7 @@ name: drawio sources: - https://hub.docker.com/r/jgraph/drawio - https://github.com/jgraph/drawio -version: 1.0.20 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/drawio/SCALE/migrations/migrate b/charts/stable/drawio/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/drawio/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/drawio/templates/common.yaml b/charts/stable/drawio/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/drawio/templates/common.yaml +++ b/charts/stable/drawio/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/dsmr-reader/Chart.yaml b/charts/stable/dsmr-reader/Chart.yaml index ea00ee6be74..d6bc15eda60 100644 --- a/charts/stable/dsmr-reader/Chart.yaml +++ b/charts/stable/dsmr-reader/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2021.09.02" description: DSMR-protocol reader, telegram data storage and energy consumption visualizer. name: dsmr-reader -version: 6.0.24 +version: 7.0.0 kubeVersion: ">=1.16.0-0" keywords: - dsmr-reader @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/dsmr-reader/SCALE/migrations/migrate b/charts/stable/dsmr-reader/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/dsmr-reader/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/dsmr-reader/templates/common.yaml b/charts/stable/dsmr-reader/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/dsmr-reader/templates/common.yaml +++ b/charts/stable/dsmr-reader/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/dsmr-reader/values.yaml b/charts/stable/dsmr-reader/values.yaml index 55ef097d02c..8487f6124b3 100644 --- a/charts/stable/dsmr-reader/values.yaml +++ b/charts/stable/dsmr-reader/values.yaml @@ -15,16 +15,6 @@ env: DJANGO_DATABASE_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" DJANGO_DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}" DJANGO_DATABASE_PORT: "5432" - -securityContext: - readOnlyRootFilesystem: false - runAsNonRoot: false - -podSecurityContext: - runAsUser: 0 - runAsGroup: 0 - -envValueFrom: DJANGO_DATABASE_PASSWORD: secretKeyRef: name: dbcreds @@ -34,6 +24,14 @@ envValueFrom: name: dbcreds key: plainhost +securityContext: + readOnlyRootFilesystem: false + runAsNonRoot: false + +podSecurityContext: + runAsUser: 0 + runAsGroup: 0 + # -- Configures service settings for the chart. # @default -- See values.yaml service: diff --git a/charts/stable/duckdns/Chart.yaml b/charts/stable/duckdns/Chart.yaml index 806a54b296f..6df7600744d 100644 --- a/charts/stable/duckdns/Chart.yaml +++ b/charts/stable/duckdns/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: duckdns -version: 1.0.24 +version: 2.0.0 appVersion: "latest" description: Duckdns is a free service which will point a DNS (sub domains of duckdns.org) to an IP of your choice. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/duckdns/SCALE/migrations/migrate b/charts/stable/duckdns/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/duckdns/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/duckdns/questions.yaml b/charts/stable/duckdns/questions.yaml index f24937a73b1..ce0ba423ca2 100644 --- a/charts/stable/duckdns/questions.yaml +++ b/charts/stable/duckdns/questions.yaml @@ -53,7 +53,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/duckdns/templates/common.yaml b/charts/stable/duckdns/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/duckdns/templates/common.yaml +++ b/charts/stable/duckdns/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/duckdns/values.yaml b/charts/stable/duckdns/values.yaml index fecbcfcdaed..563b62d24cc 100644 --- a/charts/stable/duckdns/values.yaml +++ b/charts/stable/duckdns/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: TOKEN: "" env: diff --git a/charts/stable/duplicati/Chart.yaml b/charts/stable/duplicati/Chart.yaml index 6eb77a1ac37..2e6a4ea55b5 100644 --- a/charts/stable/duplicati/Chart.yaml +++ b/charts/stable/duplicati/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Store securely encrypted backups on cloud storage services! home: https://github.com/truecharts/apps/tree/master/charts/stable/duplicati icon: https://truecharts.org/_static/img/appicons/duplicati.png @@ -18,7 +18,7 @@ name: duplicati sources: - https://hub.docker.com/r/linuxserver/duplicati/ - https://github.com/duplicati/duplicati -version: 5.0.22 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/duplicati/SCALE/migrations/migrate b/charts/stable/duplicati/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/duplicati/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/duplicati/templates/common.yaml b/charts/stable/duplicati/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/duplicati/templates/common.yaml +++ b/charts/stable/duplicati/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/emby/Chart.yaml b/charts/stable/emby/Chart.yaml index 25ca92bd1f8..e8752f6624f 100644 --- a/charts/stable/emby/Chart.yaml +++ b/charts/stable/emby/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.6.7.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Emby Server is a home media server home: https://github.com/truecharts/apps/tree/master/charts/stable/emby @@ -22,7 +22,7 @@ sources: - https://hub.docker.com/r/linuxserver/emby - https://github.com/linuxserver/docker-emby.git type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/emby/SCALE/migrations/migrate b/charts/stable/emby/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/emby/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/emby/templates/common.yaml b/charts/stable/emby/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/emby/templates/common.yaml +++ b/charts/stable/emby/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/embystat/Chart.yaml b/charts/stable/embystat/Chart.yaml index 028b20c9710..1d9108edd6a 100644 --- a/charts/stable/embystat/Chart.yaml +++ b/charts/stable/embystat/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: embystat -version: 1.0.19 +version: 2.0.0 appVersion: "0.2.0" description: Embystat is a personal web server that can calculate all kinds of statistics from your (local) Emby server. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/embystat/SCALE/migrations/migrate b/charts/stable/embystat/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/embystat/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/embystat/templates/common.yaml b/charts/stable/embystat/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/embystat/templates/common.yaml +++ b/charts/stable/embystat/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/emulatorjs/Chart.yaml b/charts/stable/emulatorjs/Chart.yaml index 07cd21ad939..ed681e87e98 100644 --- a/charts/stable/emulatorjs/Chart.yaml +++ b/charts/stable/emulatorjs/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: emulatorjs -version: 1.0.21 +version: 2.0.0 appVersion: "1.7.1" description: Emulatorjs - In browser web based emulation portable to nearly any device for many retro consoles. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/emulatorjs/SCALE/migrations/migrate b/charts/stable/emulatorjs/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/emulatorjs/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/emulatorjs/templates/common.yaml b/charts/stable/emulatorjs/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/emulatorjs/templates/common.yaml +++ b/charts/stable/emulatorjs/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/endlessh/Chart.yaml b/charts/stable/endlessh/Chart.yaml index d91805012de..1240b37a935 100644 --- a/charts/stable/endlessh/Chart.yaml +++ b/charts/stable/endlessh/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: endlessh -version: 1.0.19 +version: 2.0.0 appVersion: "2021.11.21" description: Endlessh is an SSH tarpit that very slowly sends an endless, random SSH banner. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/endlessh/SCALE/migrations/migrate b/charts/stable/endlessh/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/endlessh/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/endlessh/templates/common.yaml b/charts/stable/endlessh/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/endlessh/templates/common.yaml +++ b/charts/stable/endlessh/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/esphome/Chart.yaml b/charts/stable/esphome/Chart.yaml index 513ec852f0b..c0e01763e64 100644 --- a/charts/stable/esphome/Chart.yaml +++ b/charts/stable/esphome/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.5.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems. @@ -21,7 +21,7 @@ sources: - https://github.com/esphome/esphome - https://hub.docker.com/u/esphome type: application -version: 10.0.26 +version: 11.0.0 annotations: truecharts.org/catagories: | - tools diff --git a/charts/stable/esphome/SCALE/migrations/migrate b/charts/stable/esphome/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/esphome/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/esphome/templates/common.yaml b/charts/stable/esphome/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/esphome/templates/common.yaml +++ b/charts/stable/esphome/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/etherpad/Chart.yaml b/charts/stable/etherpad/Chart.yaml index 1aa3be1b276..0da28f45998 100644 --- a/charts/stable/etherpad/Chart.yaml +++ b/charts/stable/etherpad/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "1.8.14" -version: 6.0.23 +version: 7.0.0 kubeVersion: '>=1.16.0-0' name: etherpad description: A real-time collaborative editor scalable to thousands of simultaneous real time users. @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/etherpad/SCALE/migrations/migrate b/charts/stable/etherpad/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/etherpad/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/etherpad/templates/common.yaml b/charts/stable/etherpad/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/etherpad/templates/common.yaml +++ b/charts/stable/etherpad/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/etherpad/values.yaml b/charts/stable/etherpad/values.yaml index 1f83da2631b..c98ef44c963 100644 --- a/charts/stable/etherpad/values.yaml +++ b/charts/stable/etherpad/values.yaml @@ -3,7 +3,7 @@ image: pullPolicy: IfNotPresent tag: version-1.8.14@sha256:4900f0e787ca22cf93090ae44ecceb5689d4427c739e1eb637a6e3a913161bf8 -secret: {} +secretEnv: {} # See more environment variables in the etherpad documentation # https://github.com/ether/etherpad-lite/blob/develop/doc/docker.md @@ -13,8 +13,6 @@ env: DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" DB_PORT: "5432" - -envValueFrom: DB_PASS: secretKeyRef: name: dbcreds diff --git a/charts/core/external-service/.helmignore b/charts/stable/external-service/.helmignore similarity index 100% rename from charts/core/external-service/.helmignore rename to charts/stable/external-service/.helmignore diff --git a/charts/core/external-service/CHANGELOG.md b/charts/stable/external-service/CHANGELOG.md similarity index 100% rename from charts/core/external-service/CHANGELOG.md rename to charts/stable/external-service/CHANGELOG.md diff --git a/charts/core/docker-compose/CONFIG.md b/charts/stable/external-service/CONFIG.md similarity index 100% rename from charts/core/docker-compose/CONFIG.md rename to charts/stable/external-service/CONFIG.md diff --git a/charts/core/external-service/Chart.yaml b/charts/stable/external-service/Chart.yaml similarity index 95% rename from charts/core/external-service/Chart.yaml rename to charts/stable/external-service/Chart.yaml index 4b316ad6327..d85b7b2a5b2 100644 --- a/charts/core/external-service/Chart.yaml +++ b/charts/stable/external-service/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.66.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Allow external services to be used like Apps. home: https://github.com/truecharts/apps/tree/master/charts/core/external-service @@ -20,7 +20,7 @@ name: external-service sources: - https://github.com/truecharts/apps/tree/master/charts/stable/external-service type: application -version: 5.0.20 +version: 6.0.0 annotations: truecharts.org/catagories: | - networking diff --git a/charts/core/external-service/README.md b/charts/stable/external-service/README.md similarity index 100% rename from charts/core/external-service/README.md rename to charts/stable/external-service/README.md diff --git a/charts/core/external-service/helm-values.md b/charts/stable/external-service/helm-values.md similarity index 100% rename from charts/core/external-service/helm-values.md rename to charts/stable/external-service/helm-values.md diff --git a/charts/core/external-service/questions.yaml b/charts/stable/external-service/questions.yaml similarity index 100% rename from charts/core/external-service/questions.yaml rename to charts/stable/external-service/questions.yaml diff --git a/charts/core/external-service/security.md b/charts/stable/external-service/security.md similarity index 100% rename from charts/core/external-service/security.md rename to charts/stable/external-service/security.md diff --git a/charts/stable/external-service/templates/common.yaml b/charts/stable/external-service/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/external-service/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/core/external-service/values.yaml b/charts/stable/external-service/values.yaml similarity index 100% rename from charts/core/external-service/values.yaml rename to charts/stable/external-service/values.yaml diff --git a/charts/stable/ferdi-server/Chart.yaml b/charts/stable/ferdi-server/Chart.yaml index fdf509fbfb7..c42e8d23fe6 100644 --- a/charts/stable/ferdi-server/Chart.yaml +++ b/charts/stable/ferdi-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.3.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -21,7 +21,7 @@ maintainers: name: ferdi-server sources: - https://github.com/getferdi/server -version: 1.0.12 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/ferdi-server/SCALE/migrations/migrate b/charts/stable/ferdi-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ferdi-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ferdi-server/templates/common.yaml b/charts/stable/ferdi-server/templates/common.yaml index 743f821766b..204f8e6a675 100644 --- a/charts/stable/ferdi-server/templates/common.yaml +++ b/charts/stable/ferdi-server/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for ferdi-server */}} {{- include "ferdi-server.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/ferdi-server/values.yaml b/charts/stable/ferdi-server/values.yaml index e8311252ad4..c1d97da83ec 100644 --- a/charts/stable/ferdi-server/values.yaml +++ b/charts/stable/ferdi-server/values.yaml @@ -36,8 +36,6 @@ env: # MAILGUN_DOMAIN: "" # MAILGUN_API_REGION: "" # MAILGUN_API_KEY: "" - -envValueFrom: DB_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/filebrowser/Chart.yaml b/charts/stable/filebrowser/Chart.yaml index baad40f387d..f7cab5ca822 100644 --- a/charts/stable/filebrowser/Chart.yaml +++ b/charts/stable/filebrowser/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.22.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Filebrowser provides a file managing interface within a specified directory home: https://github.com/truecharts/apps/tree/master/charts/stable/filebrowser @@ -21,7 +21,7 @@ sources: - https://filebrowser.org/cli/filebrowser - https://hub.docker.com/r/filebrowser/filebrowser type: application -version: 1.0.19 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/filebrowser/SCALE/migrations/migrate b/charts/stable/filebrowser/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/filebrowser/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/filebrowser/templates/common.yaml b/charts/stable/filebrowser/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/stable/filebrowser/templates/common.yaml +++ b/charts/stable/filebrowser/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/stable/fileflows/Chart.yaml b/charts/stable/fileflows/Chart.yaml index 04ff2814c78..7c7cc1a13fb 100644 --- a/charts/stable/fileflows/Chart.yaml +++ b/charts/stable/fileflows/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.6.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An application that lets you automatically process files through a simple rule flow. home: https://github.com/truecharts/apps/tree/master/charts/stable/fileflows icon: https://truecharts.org/_static/img/appicons/fileflows.png @@ -18,7 +18,7 @@ name: fileflows sources: - https://github.com/revenz/FileFlows - https://hub.docker.com/r/revenz/fileflows -version: 1.0.2 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/fileflows/SCALE/migrations/migrate b/charts/stable/fileflows/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/fileflows/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/fileflows/templates/common.yaml b/charts/stable/fileflows/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/fileflows/templates/common.yaml +++ b/charts/stable/fileflows/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/fileflows/values.yaml b/charts/stable/fileflows/values.yaml index 65b5fb199e6..1012ce9d065 100644 --- a/charts/stable/fileflows/values.yaml +++ b/charts/stable/fileflows/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/fileflows - tag: v0.6.2@sha256:dc9e6b7af9339b4d269148fdf74270688ff4a61610a70731f4339ccd713fe70f + tag: v0.7.0@sha256:83d902f503ef269699a7407ed43e6050b74fc6e804bb2f59e74a7412478ef369 pullPolicy: IfNotPresent securityContext: diff --git a/charts/stable/filezilla/Chart.yaml b/charts/stable/filezilla/Chart.yaml index b65e80362e2..a298f100bc7 100644 --- a/charts/stable/filezilla/Chart.yaml +++ b/charts/stable/filezilla/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.55.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A Helm chart for Kubernetes home: https://github.com/truecharts/apps/tree/master/charts/stable/filezilla icon: https://truecharts.org/_static/img/appicons/filezilla.png @@ -23,7 +23,7 @@ sources: - https://filezilla-project.org/ - https://github.com/linuxserver/docker-filezilla type: application -version: 3.0.31 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/filezilla/SCALE/migrations/migrate b/charts/stable/filezilla/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/filezilla/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/filezilla/templates/common.yaml b/charts/stable/filezilla/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/filezilla/templates/common.yaml +++ b/charts/stable/filezilla/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/fireflyiii/Chart.yaml b/charts/stable/fireflyiii/Chart.yaml index 6c6d05cdfa2..fbf3ef4d5c3 100644 --- a/charts/stable/fireflyiii/Chart.yaml +++ b/charts/stable/fireflyiii/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.7.9" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -28,7 +28,7 @@ name: fireflyiii sources: - https://github.com/firefly-iii/firefly-iii/ type: application -version: 14.0.30 +version: 15.0.0 annotations: truecharts.org/catagories: | - finacial diff --git a/charts/stable/fireflyiii/SCALE/migrations/migrate b/charts/stable/fireflyiii/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/fireflyiii/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/fireflyiii/templates/_cronjob.tpl b/charts/stable/fireflyiii/templates/_cronjob.tpl index 422340d6090..cb8c902c952 100644 --- a/charts/stable/fireflyiii/templates/_cronjob.tpl +++ b/charts/stable/fireflyiii/templates/_cronjob.tpl @@ -1,6 +1,6 @@ {{/* Define the cronjob */}} {{- define "fireflyiii.cronjob" -}} -{{- $jobName := include "common.names.fullname" . }} +{{- $jobName := include "tc.common.names.fullname" . }} --- apiVersion: batch/v1 @@ -8,7 +8,7 @@ kind: CronJob metadata: name: {{ printf "%s-cronjob" $jobName }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} spec: schedule: "{{ .Values.cronjob.schedule }}" concurrencyPolicy: Forbid diff --git a/charts/stable/fireflyiii/templates/common.yaml b/charts/stable/fireflyiii/templates/common.yaml index a646e86ff5c..12e701a6af1 100644 --- a/charts/stable/fireflyiii/templates/common.yaml +++ b/charts/stable/fireflyiii/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for fireflyiii */}} {{- include "fireflyiii.secrets" . }} @@ -8,4 +8,4 @@ {{- include "fireflyiii.cronjob" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/fireflyiii/values.yaml b/charts/stable/fireflyiii/values.yaml index 3570a8a2a92..786a0a0006d 100644 --- a/charts/stable/fireflyiii/values.yaml +++ b/charts/stable/fireflyiii/values.yaml @@ -41,8 +41,6 @@ env: REDIS_PORT: 6379 APP_URL: "" TRUSTED_PROXIES: "172.16.0.0/16" - -envValueFrom: DB_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/firefox-syncserver/Chart.yaml b/charts/stable/firefox-syncserver/Chart.yaml index a76d10a1959..b587ef731d6 100644 --- a/charts/stable/firefox-syncserver/Chart.yaml +++ b/charts/stable/firefox-syncserver/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "1.8.0" -version: 7.0.5 +version: 8.0.0 kubeVersion: '>=1.16.0-0' name: firefox-syncserver description: This is an all-in-one package for running a self-hosted Firefox Sync server. @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/firefox-syncserver/SCALE/migrations/migrate b/charts/stable/firefox-syncserver/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/firefox-syncserver/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/firefox-syncserver/questions.yaml b/charts/stable/firefox-syncserver/questions.yaml index 8de8ca44a2f..f9780504f6c 100644 --- a/charts/stable/firefox-syncserver/questions.yaml +++ b/charts/stable/firefox-syncserver/questions.yaml @@ -75,7 +75,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/firefox-syncserver/templates/common.yaml b/charts/stable/firefox-syncserver/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/firefox-syncserver/templates/common.yaml +++ b/charts/stable/firefox-syncserver/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/firefox-syncserver/values.yaml b/charts/stable/firefox-syncserver/values.yaml index 1320f96c826..458291ccadb 100644 --- a/charts/stable/firefox-syncserver/values.yaml +++ b/charts/stable/firefox-syncserver/values.yaml @@ -4,7 +4,7 @@ image: # Overrides the image tag whose default is the chart appVersion. tag: v1.8.0@sha256:d0fbf65c8c7a99ad4ba7ffcfdad2e7b2555e0d829867c21cefc9314ace94f747 -secret: +secretEnv: FF_SYNCSERVER_SECRET: "changeme" securityContext: @@ -23,8 +23,6 @@ env: FF_SYNCSERVER_LOGLEVEL: "info" FF_SYNCSERVER_ALLOW_NEW_USERS: true FF_SYNCSERVER_FORWARDED_ALLOW_IPS: "*" - -envValueFrom: FF_SYNCSERVER_SQLURI: secretKeyRef: name: dbcreds diff --git a/charts/stable/firefox/Chart.yaml b/charts/stable/firefox/Chart.yaml index 608cafeb1cd..0d0615dc0f2 100644 --- a/charts/stable/firefox/Chart.yaml +++ b/charts/stable/firefox/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: firefox -version: 1.0.19 +version: 2.0.0 appVersion: "78.15.0" description: Firefox Browser, also known as Mozilla Firefox or simply Firefox, type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/firefox/SCALE/migrations/migrate b/charts/stable/firefox/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/firefox/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/firefox/templates/common.yaml b/charts/stable/firefox/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/firefox/templates/common.yaml +++ b/charts/stable/firefox/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/flaresolverr/Chart.yaml b/charts/stable/flaresolverr/Chart.yaml index d0adf3c0086..a76fc841257 100644 --- a/charts/stable/flaresolverr/Chart.yaml +++ b/charts/stable/flaresolverr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.2.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: FlareSolverr is a proxy server to bypass Cloudflare protection home: https://github.com/truecharts/apps/tree/master/charts/stable/flaresolverr icon: https://truecharts.org/_static/img/appicons/flaresolverr.png @@ -19,7 +19,7 @@ name: flaresolverr sources: - https://github.com/FlareSolverr/FlareSolverr - https://hub.docker.com/r/flaresolverr/flaresolverr -version: 5.0.21 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/flaresolverr/SCALE/migrations/migrate b/charts/stable/flaresolverr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/flaresolverr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/flaresolverr/templates/common.yaml b/charts/stable/flaresolverr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/flaresolverr/templates/common.yaml +++ b/charts/stable/flaresolverr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/fleet/Chart.yaml b/charts/stable/fleet/Chart.yaml index 94e8af1516e..f0c7746fd68 100644 --- a/charts/stable/fleet/Chart.yaml +++ b/charts/stable/fleet/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: fleet -version: 1.0.23 +version: 2.0.0 appVersion: "2.3.2" description: Fleet provides an online web interface which displays a set of maintained images from one or more owned repositories. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ diff --git a/charts/stable/fleet/SCALE/migrations/migrate b/charts/stable/fleet/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/fleet/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/fleet/questions.yaml b/charts/stable/fleet/questions.yaml index eb1f74387e9..59184ab0699 100644 --- a/charts/stable/fleet/questions.yaml +++ b/charts/stable/fleet/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/fleet/templates/common.yaml b/charts/stable/fleet/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/fleet/templates/common.yaml +++ b/charts/stable/fleet/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/fleet/values.yaml b/charts/stable/fleet/values.yaml index 89e5941978c..1b184060d5e 100644 --- a/charts/stable/fleet/values.yaml +++ b/charts/stable/fleet/values.yaml @@ -12,14 +12,12 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: # fleet_admin_secret: "" (Optional) env: fleet_admin_authentication_type: DATABASE fleet_database_username: fleet - -envValueFrom: fleet_database_url: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/flexget/Chart.yaml b/charts/stable/flexget/Chart.yaml index a34b4e1e56e..8b6ddc4da9d 100644 --- a/charts/stable/flexget/Chart.yaml +++ b/charts/stable/flexget/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.3.15" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: FlexGet is a multipurpose automation tool for all of your media home: https://github.com/truecharts/apps/tree/master/charts/stable/flexget @@ -21,7 +21,7 @@ sources: - https://hub.docker.com/r/wiserain/flexget - https://github.com/wiserain/docker-flexget type: application -version: 1.0.32 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/flexget/SCALE/migrations/migrate b/charts/stable/flexget/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/flexget/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/flexget/questions.yaml b/charts/stable/flexget/questions.yaml index ab2c5cd9b9a..1d7b0102442 100644 --- a/charts/stable/flexget/questions.yaml +++ b/charts/stable/flexget/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/flexget/templates/common.yaml b/charts/stable/flexget/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/flexget/templates/common.yaml +++ b/charts/stable/flexget/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/flexget/values.yaml b/charts/stable/flexget/values.yaml index d28e5414904..442d75756cf 100644 --- a/charts/stable/flexget/values.yaml +++ b/charts/stable/flexget/values.yaml @@ -22,7 +22,7 @@ env: FG_LOG_LEVEL: info FG_LOG_FILE: flexget.log -secret: +secretEnv: FG_WEBUI_PASSWD: "jLeT78KBDPW" diff --git a/charts/stable/flood/Chart.yaml b/charts/stable/flood/Chart.yaml index e5787906ddb..059a933a392 100644 --- a/charts/stable/flood/Chart.yaml +++ b/charts/stable/flood/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.7.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Flood is a monitoring service for various torrent clients home: https://github.com/truecharts/apps/tree/master/charts/stable/flood icon: https://truecharts.org/_static/img/appicons/flood.png @@ -21,7 +21,7 @@ name: flood sources: - https://github.com/jesec/flood - https://hub.docker.com/r/jesec/flood -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/flood/SCALE/migrations/migrate b/charts/stable/flood/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/flood/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/flood/templates/common.yaml b/charts/stable/flood/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/flood/templates/common.yaml +++ b/charts/stable/flood/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/fluidd/Chart.yaml b/charts/stable/fluidd/Chart.yaml index 3f2ed55f6e9..15a0c1097f6 100644 --- a/charts/stable/fluidd/Chart.yaml +++ b/charts/stable/fluidd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.18.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Fluidd is a free and open-source Klipper web interface for managing your 3d printer. home: https://github.com/truecharts/apps/tree/master/charts/stable/fluidd icon: https://truecharts.org/_static/img/appicons/fluidd.png @@ -18,7 +18,7 @@ name: fluidd sources: - https://github.com/fluidd-core/fluidd - https://hub.docker.com/r/cadriel/fluidd -version: 1.0.13 +version: 2.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/fluidd/SCALE/migrations/migrate b/charts/stable/fluidd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/fluidd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/fluidd/templates/common.yaml b/charts/stable/fluidd/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/fluidd/templates/common.yaml +++ b/charts/stable/fluidd/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/focalboard/Chart.yaml b/charts/stable/focalboard/Chart.yaml index 8c36582465d..7287fac1a15 100644 --- a/charts/stable/focalboard/Chart.yaml +++ b/charts/stable/focalboard/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.16.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ sources: - https://www.focalboard.com/ - https://github.com/mattermost/focalboard - https://github.com/FlipEnergy/container-images/blob/main/focalboard -version: 6.0.25 +version: 7.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/focalboard/SCALE/migrations/migrate b/charts/stable/focalboard/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/focalboard/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/focalboard/templates/_configmap.tpl b/charts/stable/focalboard/templates/_configmap.tpl index 9b0a0046acf..d00a7d80753 100644 --- a/charts/stable/focalboard/templates/_configmap.tpl +++ b/charts/stable/focalboard/templates/_configmap.tpl @@ -7,9 +7,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.names.fullname" . }}-install + name: {{ include "tc.common.names.fullname" . }}-install labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} data: focalboard-config: |- { diff --git a/charts/stable/focalboard/templates/common.yaml b/charts/stable/focalboard/templates/common.yaml index 472219255e8..9faa9d03b3b 100644 --- a/charts/stable/focalboard/templates/common.yaml +++ b/charts/stable/focalboard/templates/common.yaml @@ -1,4 +1,4 @@ -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Append the hardcoded settings */}} {{- define "focalboard.harcodedValues" -}} @@ -10,11 +10,11 @@ persistence: type: "custom" volumeSpec: configMap: - name: {{ printf "%v-install" (include "common.names.fullname" .) }} + name: {{ printf "%v-install" (include "tc.common.names.fullname" .) }} {{- end -}} {{- $_ := mergeOverwrite .Values (include "focalboard.harcodedValues" . | fromYaml) -}} {{- include "focalboard.configmap" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/foldingathome/Chart.yaml b/charts/stable/foldingathome/Chart.yaml index 5cf39fa093f..23e0d67f270 100644 --- a/charts/stable/foldingathome/Chart.yaml +++ b/charts/stable/foldingathome/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: foldingathome -version: 1.0.19 +version: 2.0.0 appVersion: "7.6.21" description: Folding@home is a distributed computing project for simulating protein dynamics, including the process of protein folding and the movements of proteins implicated in a variety of diseases. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/foldingathome/SCALE/migrations/migrate b/charts/stable/foldingathome/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/foldingathome/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/foldingathome/templates/common.yaml b/charts/stable/foldingathome/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/foldingathome/templates/common.yaml +++ b/charts/stable/foldingathome/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/fossil/Chart.yaml b/charts/stable/fossil/Chart.yaml index 9547b30d78d..2f0ab38140d 100644 --- a/charts/stable/fossil/Chart.yaml +++ b/charts/stable/fossil/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.15.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A simple, high-reliability, distributed software configuration management system home: https://github.com/truecharts/apps/tree/master/charts/stable/fossil @@ -20,7 +20,7 @@ name: fossil sources: - https://fossil-scm.org/ type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/fossil/SCALE/migrations/migrate b/charts/stable/fossil/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/fossil/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/fossil/templates/common.yaml b/charts/stable/fossil/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/fossil/templates/common.yaml +++ b/charts/stable/fossil/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/freeradius/Chart.yaml b/charts/stable/freeradius/Chart.yaml index f3bb208b2e4..e7d6854bc29 100644 --- a/charts/stable/freeradius/Chart.yaml +++ b/charts/stable/freeradius/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.0.25" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: OpenSource Radius implementation home: https://github.com/truecharts/apps/tree/master/charts/stable/freeradius @@ -21,7 +21,7 @@ sources: - https://hub.docker.com/r/freeradius/freeradius-server/ - https://freeradius.org/ type: application -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - auth diff --git a/charts/stable/freeradius/SCALE/migrations/migrate b/charts/stable/freeradius/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/freeradius/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/freeradius/templates/common.yaml b/charts/stable/freeradius/templates/common.yaml index da58e96d9e0..b9e7208f382 100644 --- a/charts/stable/freeradius/templates/common.yaml +++ b/charts/stable/freeradius/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/freshrss/Chart.yaml b/charts/stable/freshrss/Chart.yaml index 99c11544a3e..cf91d7e1660 100644 --- a/charts/stable/freshrss/Chart.yaml +++ b/charts/stable/freshrss/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.18.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: FreshRSS is a self-hosted RSS feed aggregator home: https://github.com/truecharts/apps/tree/master/charts/stable/freshrss @@ -21,7 +21,7 @@ sources: - https://github.com/FreshRSS/FreshRSS - https://hub.docker.com/r/linuxserver/freshrss type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/freshrss/SCALE/migrations/migrate b/charts/stable/freshrss/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/freshrss/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/freshrss/templates/common.yaml b/charts/stable/freshrss/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/freshrss/templates/common.yaml +++ b/charts/stable/freshrss/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/friendica/Chart.yaml b/charts/stable/friendica/Chart.yaml index e8da918ac97..f5589ee7da3 100644 --- a/charts/stable/friendica/Chart.yaml +++ b/charts/stable/friendica/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.03" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -27,7 +27,7 @@ name: friendica sources: - https://friendi.ca/ - https://hub.docker.com/_/friendica -version: 2.0.33 +version: 3.0.0 annotations: truecharts.org/catagories: | - social diff --git a/charts/stable/friendica/SCALE/migrations/migrate b/charts/stable/friendica/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/friendica/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/friendica/templates/common.yaml b/charts/stable/friendica/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/friendica/templates/common.yaml +++ b/charts/stable/friendica/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/friendica/values.yaml b/charts/stable/friendica/values.yaml index c0f28cf872a..6298a2eee04 100644 --- a/charts/stable/friendica/values.yaml +++ b/charts/stable/friendica/values.yaml @@ -26,6 +26,22 @@ env: FRIENDICA_UPGRADE: false PHP_MEMORY_LIMIT: "512M" PHP_UPLOAD_LIMIT: "512M" + MYSQL_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + MYSQL_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-password + REDIS_HOST: + secretKeyRef: + name: rediscreds + key: plainhost + REDIS_PW: + secretKeyRef: + name: rediscreds + key: redis-password service: main: @@ -52,24 +68,6 @@ persistence: enabled: true mountPath: "/data" -envValueFrom: - MYSQL_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - MYSQL_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - REDIS_HOST: - secretKeyRef: - name: rediscreds - key: plainhost - REDIS_PW: - secretKeyRef: - name: rediscreds - key: redis-password - redis: enabled: true existingSecret: "rediscreds" diff --git a/charts/stable/gaps/Chart.yaml b/charts/stable/gaps/Chart.yaml index 4b5badaee3f..283c1b2b150 100644 --- a/charts/stable/gaps/Chart.yaml +++ b/charts/stable/gaps/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.9.12" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Gaps searches through your Plex Server or local folders for all movies, then queries for known movies in the same collection. @@ -22,7 +22,7 @@ name: gaps sources: - https://github.com/JasonHHouse/gaps type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/gaps/SCALE/migrations/migrate b/charts/stable/gaps/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/gaps/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/gaps/templates/common.yaml b/charts/stable/gaps/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/gaps/templates/common.yaml +++ b/charts/stable/gaps/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/gitea/Chart.yaml b/charts/stable/gitea/Chart.yaml index 869cf055219..85b20fd09f1 100644 --- a/charts/stable/gitea/Chart.yaml +++ b/charts/stable/gitea/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.16.8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -34,7 +34,7 @@ sources: - https://github.com/go-gitea/gitea - https://hub.docker.com/r/gitea/gitea/ type: application -version: 6.0.29 +version: 7.0.0 annotations: truecharts.org/catagories: | - GIT diff --git a/charts/stable/gitea/SCALE/migrations/migrate b/charts/stable/gitea/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/gitea/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/gitea/templates/_secrets.tpl b/charts/stable/gitea/templates/_secrets.tpl index 93654646061..034f3de67da 100644 --- a/charts/stable/gitea/templates/_secrets.tpl +++ b/charts/stable/gitea/templates/_secrets.tpl @@ -11,9 +11,9 @@ apiVersion: v1 kind: Secret metadata: - name: {{ include "common.names.fullname" . }} + name: {{ include "tc.common.names.fullname" . }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} type: Opaque stringData: app.ini: |- @@ -114,9 +114,9 @@ stringData: apiVersion: v1 kind: Secret metadata: - name: {{ include "common.names.fullname" . }}-init + name: {{ include "tc.common.names.fullname" . }}-init labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} type: Opaque stringData: init_directory_structure.sh: |- diff --git a/charts/stable/gitea/templates/common.yaml b/charts/stable/gitea/templates/common.yaml index 703865da3de..eb5106bfa7b 100644 --- a/charts/stable/gitea/templates/common.yaml +++ b/charts/stable/gitea/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for gitea */}} {{- include "gitea.secrets" . }} @@ -15,7 +15,7 @@ readOnly: true type: "custom" volumeSpec: secret: - secretName: {{ include "common.names.fullname" . }}-init + secretName: {{ include "tc.common.names.fullname" . }}-init defaultMode: 0777 {{- end -}} @@ -27,7 +27,7 @@ readOnly: true type: "custom" volumeSpec: secret: - secretName: {{ include "common.names.fullname" . }} + secretName: {{ include "tc.common.names.fullname" . }} {{- end -}} {{- $_ := set .Values.persistence "init" (include "gitea.initvolume" . | fromYaml) -}} @@ -35,4 +35,4 @@ volumeSpec: {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/golinks/Chart.yaml b/charts/stable/golinks/Chart.yaml index 352c276c93f..eb6885b4e0e 100644 --- a/charts/stable/golinks/Chart.yaml +++ b/charts/stable/golinks/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "154c581" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A web app that allows you to create smart bookmarks, commands and aliases by pointing your web browser's default search engine at a running instance. home: https://github.com/truecharts/apps/tree/master/charts/stable/golinks @@ -24,7 +24,7 @@ sources: - https://github.com/prologic/golinks - https://github.com/nicholaswilde/docker-golinks type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/golinks/SCALE/migrations/migrate b/charts/stable/golinks/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/golinks/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/golinks/templates/common.yaml b/charts/stable/golinks/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/golinks/templates/common.yaml +++ b/charts/stable/golinks/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/gonic/Chart.yaml b/charts/stable/gonic/Chart.yaml index 962057beacf..991880a8973 100644 --- a/charts/stable/gonic/Chart.yaml +++ b/charts/stable/gonic/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.14.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Music streaming server / subsonic server API implementation home: https://github.com/truecharts/apps/tree/master/charts/stable/gonic icon: https://truecharts.org/_static/img/appicons/gonic.png @@ -19,7 +19,7 @@ name: gonic sources: - https://github.com/sentriz/gonic - https://hub.docker.com/r/sentriz/gonic -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/gonic/SCALE/migrations/migrate b/charts/stable/gonic/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/gonic/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/gonic/templates/common.yaml b/charts/stable/gonic/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/gonic/templates/common.yaml +++ b/charts/stable/gonic/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/gotify/Chart.yaml b/charts/stable/gotify/Chart.yaml index 51cb216b213..fc3df1b36a3 100644 --- a/charts/stable/gotify/Chart.yaml +++ b/charts/stable/gotify/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "2.1.4" -version: 6.0.23 +version: 7.0.0 kubeVersion: '>=1.16.0-0' name: gotify description: a simple server for sending and receiving messages @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/gotify/SCALE/migrations/migrate b/charts/stable/gotify/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/gotify/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/gotify/questions.yaml b/charts/stable/gotify/questions.yaml index 86e245d649f..32b4ae3c263 100644 --- a/charts/stable/gotify/questions.yaml +++ b/charts/stable/gotify/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/gotify/templates/common.yaml b/charts/stable/gotify/templates/common.yaml index c041f992862..273dd80c453 100644 --- a/charts/stable/gotify/templates/common.yaml +++ b/charts/stable/gotify/templates/common.yaml @@ -1,7 +1,7 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for nextcloud */}} {{- include "gotify.configmap" . }} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/gotify/values.yaml b/charts/stable/gotify/values.yaml index fc284385aa3..ccbae934402 100644 --- a/charts/stable/gotify/values.yaml +++ b/charts/stable/gotify/values.yaml @@ -3,7 +3,7 @@ image: pullPolicy: IfNotPresent tag: v2.1.4@sha256:3f568cbc18808a8d138b07073233411a1077676e28a468b7e345fffae639fa32 -secret: +secretEnv: user: "admin" pass: "admin" diff --git a/charts/stable/grafana/Chart.yaml b/charts/stable/grafana/Chart.yaml index e3911a55658..364ca15823d 100644 --- a/charts/stable/grafana/Chart.yaml +++ b/charts/stable/grafana/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "8.5.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Grafana is an open source, feature rich metrics dashboard and graph editor for Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB. home: https://github.com/truecharts/apps/tree/master/charts/stable/grafana @@ -23,7 +23,7 @@ sources: - https://github.com/bitnami/bitnami-docker-grafana - https://grafana.com/ type: application -version: 3.0.62 +version: 4.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/stable/grafana/SCALE/migrations/migrate b/charts/stable/grafana/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/grafana/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/grafana/questions.yaml b/charts/stable/grafana/questions.yaml index 4dfe34d0bfe..091bab9ad15 100644 --- a/charts/stable/grafana/questions.yaml +++ b/charts/stable/grafana/questions.yaml @@ -76,7 +76,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Secret Image Environment" schema: diff --git a/charts/stable/grafana/templates/common.yaml b/charts/stable/grafana/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/grafana/templates/common.yaml +++ b/charts/stable/grafana/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/grafana/values.yaml b/charts/stable/grafana/values.yaml index 41011bc959e..28f99986cd2 100644 --- a/charts/stable/grafana/values.yaml +++ b/charts/stable/grafana/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/grafana pullPolicy: IfNotPresent - tag: v8.5.4@sha256:67ffe5a759140d6fe11d484afd24d16cbf01d5cc500bad9d33a932c68eae553d + tag: v8.5.4@sha256:f63f123fe80e7b83b5d9d6ef36ab8a145d820ff2f5c30a9844345ebdab647236 securityContext: readOnlyRootFilesystem: false @@ -24,7 +24,7 @@ probes: startup: path: "/api/health" -secret: +secretEnv: GF_SECURITY_ADMIN_USER: "admin" GF_SECURITY_ADMIN_PASSWORD: "testpassword" diff --git a/charts/stable/grav/Chart.yaml b/charts/stable/grav/Chart.yaml index 45cf685c68b..1c6c2cc82f5 100644 --- a/charts/stable/grav/Chart.yaml +++ b/charts/stable/grav/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.7.18" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A Fast, Simple, and Flexible, file-based Web-platform. home: https://github.com/truecharts/apps/tree/master/charts/stable/grav icon: https://truecharts.org/_static/img/appicons/grav.png @@ -22,7 +22,7 @@ sources: - https://github.com/linuxserver/docker-grav - https://github.com/getgrav/grav/ type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/grav/SCALE/migrations/migrate b/charts/stable/grav/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/grav/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/grav/templates/common.yaml b/charts/stable/grav/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/grav/templates/common.yaml +++ b/charts/stable/grav/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/grist/Chart.yaml b/charts/stable/grist/Chart.yaml index be435d437de..65071379859 100644 --- a/charts/stable/grist/Chart.yaml +++ b/charts/stable/grist/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.7.9" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: redis.enabled name: redis repository: https://charts.truecharts.org @@ -25,7 +25,7 @@ sources: - https://hub.docker.com/r/gristlabs/grist - https://github.com/gristlabs/grist-core - https://support.getgrist.com/ -version: 1.0.26 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/grist/SCALE/migrations/migrate b/charts/stable/grist/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/grist/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/grist/templates/common.yaml b/charts/stable/grist/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/grist/templates/common.yaml +++ b/charts/stable/grist/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/grist/values.yaml b/charts/stable/grist/values.yaml index db48b8213b7..62ae3ab202d 100644 --- a/charts/stable/grist/values.yaml +++ b/charts/stable/grist/values.yaml @@ -15,8 +15,6 @@ env: PORT: "{{ .Values.service.main.ports.main.port }}" HOME_PORT: "{{ .Values.service.api.ports.api.port }}" GRIST_DEFAULT_EMAIL: "user@mydomain.com" - -envValueFrom: REDIS_URL: secretKeyRef: name: rediscreds diff --git a/charts/stable/grocy/Chart.yaml b/charts/stable/grocy/Chart.yaml index 8abc9942d82..1c1e12f337d 100644 --- a/charts/stable/grocy/Chart.yaml +++ b/charts/stable/grocy/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.3.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: ERP beyond your fridge - grocy is a web-based self-hosted groceries & household management solution for your home @@ -20,7 +20,7 @@ name: grocy sources: - https://github.com/grocy/grocy type: application -version: 10.0.30 +version: 11.0.0 annotations: truecharts.org/catagories: | - Home-Automation diff --git a/charts/stable/grocy/SCALE/migrations/migrate b/charts/stable/grocy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/grocy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/grocy/templates/common.yaml b/charts/stable/grocy/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/grocy/templates/common.yaml +++ b/charts/stable/grocy/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/guacamole-client/Chart.yaml b/charts/stable/guacamole-client/Chart.yaml index cdb250d391c..6fc1e57370b 100644 --- a/charts/stable/guacamole-client/Chart.yaml +++ b/charts/stable/guacamole-client/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.4.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -25,7 +25,7 @@ sources: - https://hub.docker.com/r/guacamole/guacamole - http://guacamole.incubator.apache.org/doc/gug/introduction.html type: application -version: 2.0.23 +version: 3.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/guacamole-client/SCALE/migrations/migrate b/charts/stable/guacamole-client/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/guacamole-client/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/guacamole-client/templates/common.yaml b/charts/stable/guacamole-client/templates/common.yaml index 47ce0e2be48..eefa02dc944 100644 --- a/charts/stable/guacamole-client/templates/common.yaml +++ b/charts/stable/guacamole-client/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{ include "common.setup" . }} +{{ include "tc.common.loader.init" . }} {{/* Render configmap for vaultwarden */}} {{- include "guacamole-client.configmap" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/guacamole-client/values.yaml b/charts/stable/guacamole-client/values.yaml index 93fba5448a9..772d2c49d69 100644 --- a/charts/stable/guacamole-client/values.yaml +++ b/charts/stable/guacamole-client/values.yaml @@ -23,6 +23,14 @@ env: POSTGRES_PORT: 5432 GUACD_HOSTNAME: "localhost" GUACD_PORT: 4822 + POSTGRES_HOSTNAME: + secretKeyRef: + name: dbcreds + key: plainhost + POSTGRES_PASSWORD: + secretKeyRef: + name: dbcreds + key: postgresql-password envFrom: - configMapRef: @@ -130,16 +138,6 @@ postgresql: postgresqlUsername: guacamole postgresqlDatabase: guacamole -envValueFrom: - POSTGRES_HOSTNAME: - secretKeyRef: - name: dbcreds - key: plainhost - POSTGRES_PASSWORD: - secretKeyRef: - name: dbcreds - key: postgresql-password - probes: liveness: path: "/guacamole" diff --git a/charts/stable/guacd/Chart.yaml b/charts/stable/guacd/Chart.yaml index 0d52bee7d5a..14118996b56 100644 --- a/charts/stable/guacd/Chart.yaml +++ b/charts/stable/guacd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: guacd -version: 1.0.19 +version: 2.0.0 appVersion: "1.4.0" description: Guacd - Apache Guacamole is a clientless remote desktop gateway. type: application @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/guacd/SCALE/migrations/migrate b/charts/stable/guacd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/guacd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/guacd/templates/common.yaml b/charts/stable/guacd/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/guacd/templates/common.yaml +++ b/charts/stable/guacd/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/habridge/Chart.yaml b/charts/stable/habridge/Chart.yaml index 26efcc183d4..19a2e715786 100644 --- a/charts/stable/habridge/Chart.yaml +++ b/charts/stable/habridge/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: habridge -version: 1.0.19 +version: 2.0.0 appVersion: "5.4.1" description: Habridge emulates Philips Hue API to other home automation gateways such as an Amazon Echo/Dot or other systems that support Philips Hue. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/habridge/SCALE/migrations/migrate b/charts/stable/habridge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/habridge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/habridge/questions.yaml b/charts/stable/habridge/questions.yaml index b74544a2f02..677d30b3845 100644 --- a/charts/stable/habridge/questions.yaml +++ b/charts/stable/habridge/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/habridge/templates/common.yaml b/charts/stable/habridge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/habridge/templates/common.yaml +++ b/charts/stable/habridge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/habridge/values.yaml b/charts/stable/habridge/values.yaml index 862d0926304..761226261fa 100644 --- a/charts/stable/habridge/values.yaml +++ b/charts/stable/habridge/values.yaml @@ -10,7 +10,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: SEC_KEY: "" service: diff --git a/charts/stable/hammond/Chart.yaml b/charts/stable/hammond/Chart.yaml index 1a51d8bdab6..d60d4452a35 100644 --- a/charts/stable/hammond/Chart.yaml +++ b/charts/stable/hammond/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A self-hosted vehicle expense tracking system with support for multiple users. home: https://github.com/truecharts/apps/tree/master/charts/stable/hammond icon: https://truecharts.org/_static/img/appicons/hammond.png @@ -18,7 +18,7 @@ name: hammond sources: - https://github.com/akhilrex/hammond - https://hub.docker.com/r/akhilrex/hammond -version: 1.0.17 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/hammond/SCALE/migrations/migrate b/charts/stable/hammond/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/hammond/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/hammond/templates/common.yaml b/charts/stable/hammond/templates/common.yaml index 4ad90c0980d..af7ef25789e 100644 --- a/charts/stable/hammond/templates/common.yaml +++ b/charts/stable/hammond/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for hammond */}} {{- include "hammond.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/hammond/values.yaml b/charts/stable/hammond/values.yaml index 68f5ffa415b..d9d8541199c 100644 --- a/charts/stable/hammond/values.yaml +++ b/charts/stable/hammond/values.yaml @@ -3,7 +3,7 @@ image: tag: 1.0.0@sha256:a38f0455634f15a38535b6f067f0cd6b62770df51d0c40c5f09ad19cbe066702 pullPolicy: IfNotPresent -envValueFrom: +env: JWT_SECRET: secretKeyRef: name: hammond-secrets diff --git a/charts/stable/handbrake/Chart.yaml b/charts/stable/handbrake/Chart.yaml index d78a274c451..02077d02238 100644 --- a/charts/stable/handbrake/Chart.yaml +++ b/charts/stable/handbrake/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.24.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs. @@ -24,7 +24,7 @@ sources: - https://hub.docker.com/r/jlesage/handbrake/ - https://handbrake.fr/ type: application -version: 12.0.17 +version: 13.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/handbrake/SCALE/migrations/migrate b/charts/stable/handbrake/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/handbrake/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/handbrake/questions.yaml b/charts/stable/handbrake/questions.yaml index dac15f72065..b29b99e25d5 100644 --- a/charts/stable/handbrake/questions.yaml +++ b/charts/stable/handbrake/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/handbrake/templates/common.yaml b/charts/stable/handbrake/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/handbrake/templates/common.yaml +++ b/charts/stable/handbrake/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index f9bcab847bc..16b9b1acb10 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -27,9 +27,9 @@ service: envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-handbrake' + name: '{{ include "tc.common.names.fullname" . }}-handbrake' -secret: +secretEnv: VNC_PASSWORD: "" handbrake: diff --git a/charts/stable/haste-server/Chart.yaml b/charts/stable/haste-server/Chart.yaml index 6bd045997a1..7e6d3b091af 100644 --- a/charts/stable/haste-server/Chart.yaml +++ b/charts/stable/haste-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Simple text sharing home: https://github.com/truecharts/apps/tree/master/charts/stable/haste-server icon: https://truecharts.org/_static/img/appicons/haste-server.png @@ -21,7 +21,7 @@ name: haste-server sources: - https://github.com/seejohnrun/haste-server - https://github.com/k8s-at-home/container-images -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/haste-server/SCALE/migrations/migrate b/charts/stable/haste-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/haste-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/haste-server/templates/common.yaml b/charts/stable/haste-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/haste-server/templates/common.yaml +++ b/charts/stable/haste-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/headphones/Chart.yaml b/charts/stable/headphones/Chart.yaml index 480ba01db69..3697bfc5af9 100644 --- a/charts/stable/headphones/Chart.yaml +++ b/charts/stable/headphones/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "58edc604" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: "An automated music downloader for NZB and Torrent, written in Python.\ \ It supports SABnzbd, NZBget, Transmission, \xB5Torrent and Blackhole." home: https://github.com/truecharts/apps/tree/master/charts/stable/headphones @@ -22,7 +22,7 @@ sources: - https://github.com/linuxserver/docker-headphones - https://github.com/rembo10/headphones type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/headphones/SCALE/migrations/migrate b/charts/stable/headphones/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/headphones/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/headphones/templates/common.yaml b/charts/stable/headphones/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/headphones/templates/common.yaml +++ b/charts/stable/headphones/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/healthchecks/Chart.yaml b/charts/stable/healthchecks/Chart.yaml index 4628a6e6cc6..7138393e458 100644 --- a/charts/stable/healthchecks/Chart.yaml +++ b/charts/stable/healthchecks/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.22.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Healthchecks is a cron job monitoring service. It listens for HTTP requests and email messages ("pings") from your cron jobs and scheduled tasks ("checks"). When a ping does not arrive on time, Healthchecks sends out alerts. @@ -22,7 +22,7 @@ name: healthchecks sources: - https://github.com/healthchecks/healthchecks - https://hub.docker.com/r/linuxserver/healthchecks -version: 6.0.19 +version: 7.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/healthchecks/SCALE/migrations/migrate b/charts/stable/healthchecks/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/healthchecks/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/healthchecks/questions.yaml b/charts/stable/healthchecks/questions.yaml index 4c1fce94a10..8dc27f83e6b 100644 --- a/charts/stable/healthchecks/questions.yaml +++ b/charts/stable/healthchecks/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/healthchecks/templates/common.yaml b/charts/stable/healthchecks/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/healthchecks/templates/common.yaml +++ b/charts/stable/healthchecks/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/healthchecks/values.yaml b/charts/stable/healthchecks/values.yaml index da82f13c164..3c97199da1d 100644 --- a/charts/stable/healthchecks/values.yaml +++ b/charts/stable/healthchecks/values.yaml @@ -23,7 +23,7 @@ service: port: 10074 targetPort: 8000 -secret: +secretEnv: # -- Superuser email SUPERUSER_EMAIL: "email@healthchecks.io" # -- Superuser password diff --git a/charts/stable/hedgedoc/Chart.yaml b/charts/stable/hedgedoc/Chart.yaml index e2656727c0f..76da5026b73 100644 --- a/charts/stable/hedgedoc/Chart.yaml +++ b/charts/stable/hedgedoc/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: hedgedoc -version: 1.0.24 +version: 2.0.0 appVersion: "1.9.3" description: HedgeDoc lets you create real-time collaborative markdown notes. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ diff --git a/charts/stable/hedgedoc/SCALE/migrations/migrate b/charts/stable/hedgedoc/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/hedgedoc/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/hedgedoc/templates/common.yaml b/charts/stable/hedgedoc/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/hedgedoc/templates/common.yaml +++ b/charts/stable/hedgedoc/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/hedgedoc/values.yaml b/charts/stable/hedgedoc/values.yaml index 8b7f3eb68d7..820391d8b39 100644 --- a/charts/stable/hedgedoc/values.yaml +++ b/charts/stable/hedgedoc/values.yaml @@ -16,8 +16,6 @@ env: CMD_URL_ADDPORT: true DB_NAME: "hedgedoc" DB_USER: "hedgedoc" - -envValueFrom: DB_HOST: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/heimdall/Chart.yaml b/charts/stable/heimdall/Chart.yaml index ed86bc35268..53f0ba8e1fe 100644 --- a/charts/stable/heimdall/Chart.yaml +++ b/charts/stable/heimdall/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.4.8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: An Application dashboard and launcher home: https://github.com/truecharts/apps/tree/master/charts/stable/heimdall @@ -19,7 +19,7 @@ name: heimdall sources: - https://github.com/linuxserver/Heimdall/ type: application -version: 10.0.20 +version: 11.0.0 annotations: truecharts.org/catagories: | - organizers diff --git a/charts/stable/heimdall/SCALE/migrations/migrate b/charts/stable/heimdall/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/heimdall/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/heimdall/templates/common.yaml b/charts/stable/heimdall/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/heimdall/templates/common.yaml +++ b/charts/stable/heimdall/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/homarr/Chart.yaml b/charts/stable/homarr/Chart.yaml index 7c6741ef953..dab78a6c92d 100644 --- a/charts/stable/homarr/Chart.yaml +++ b/charts/stable/homarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.5.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Homarr is a simple and lightweight homepage for your server, that helps you easily access all of your services in one place. home: https://github.com/truecharts/apps/tree/master/charts/stable/homarr icon: https://truecharts.org/_static/img/appicons/homarr.png @@ -17,7 +17,7 @@ maintainers: name: homarr sources: - https://github.com/ajnart/homarr -version: 1.0.3 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/homarr/SCALE/migrations/migrate b/charts/stable/homarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/homarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/homarr/templates/common.yaml b/charts/stable/homarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/homarr/templates/common.yaml +++ b/charts/stable/homarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/homarr/values.yaml b/charts/stable/homarr/values.yaml index 5a5c232d101..c4e140641d4 100644 --- a/charts/stable/homarr/values.yaml +++ b/charts/stable/homarr/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/homarr - tag: v0.5.2@sha256:223d4ab9fbc8ea2081fed6ff6720f574d0518291f3f617774c4dcfed5320ab45 + tag: v0.6.0@sha256:f3bccfe5bc095a6e5b521db73d80f88db6c956d148a60080ea3658319e68fd73 pullPolicy: IfNotPresent service: diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml index 9ac28879924..d808079bc41 100644 --- a/charts/stable/home-assistant/Chart.yaml +++ b/charts/stable/home-assistant/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.6.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ sources: - https://github.com/home-assistant/home-assistant - https://github.com/cdr/code-server type: application -version: 13.0.41 +version: 14.0.0 annotations: truecharts.org/catagories: | - home-automation diff --git a/charts/stable/home-assistant/SCALE/migrations/migrate b/charts/stable/home-assistant/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/home-assistant/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/home-assistant/questions.yaml b/charts/stable/home-assistant/questions.yaml index d303ea265d1..8094690281d 100644 --- a/charts/stable/home-assistant/questions.yaml +++ b/charts/stable/home-assistant/questions.yaml @@ -74,23 +74,6 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: git - group: "Container Configuration" - label: "Home-Assistant Git Settings" - schema: - additional_attrs: true - type: dict - attrs: - - variable: deployKey - label: "Git deploy key" - schema: - type: string - default: "" - - variable: deployKeyBase64 - label: "Git KeyBase64 deploy key" - schema: - type: string - default: "" # Include{containerConfig} - variable: service diff --git a/charts/stable/home-assistant/templates/_configmap.tpl b/charts/stable/home-assistant/templates/_configmap.tpl deleted file mode 100644 index 086c40af678..00000000000 --- a/charts/stable/home-assistant/templates/_configmap.tpl +++ /dev/null @@ -1,90 +0,0 @@ -{{/* Define the configmap */}} -{{- define "hass.configmap" -}} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-init -data: - init.sh: |- - #!/bin/sh - if test -f "/config/configuration.yaml"; then - echo "configuration.yaml exists." - if grep -q recorder: "/config/configuration.yaml"; then - echo "configuration.yaml already contains recorder" - else - cat /config/init/recorder.default >> /config/configuration.yaml - fi - if grep -q http: "/config/configuration.yaml"; then - echo "configuration.yaml already contains http section" - else - cat /config/init/http.default >> /config/configuration.yaml - fi - else - echo "configuration.yaml does NOT exist." - cp /config/init/configuration.yaml.default /config/configuration.yaml - cat /config/init/recorder.default >> /config/configuration.yaml - cat /config/init/http.default >> /config/configuration.yaml - fi - - echo "Creating include files..." - for include_file in groups.yaml automations.yaml scripts.yaml scenes.yaml; do - if test -f "/config/$include_file"; then - echo "$include_file exists." - else - echo "$include_file does NOT exist." - touch "/config/$include_file" - fi - done - - cd "/config" || echo "Could not change path to /config" - echo "Creating custom_components directory..." - mkdir "/config/custom_components" || echo "custom_components directory already exists" - - echo "Changing to the custom_components directory..." - cd "/config/custom_components" || echo "Could not change path to /config/custom_components" - - echo "Downloading HACS" - wget "https://github.com/hacs/integration/releases/latest/download/hacs.zip" || exit 0 - - if [ -d "/config/custom_components/hacs" ]; then - echo "HACS directory already exist, cleaning up..." - rm -R "/config/custom_components/hacs" - fi - - echo "Creating HACS directory..." - mkdir "/config/custom_components/hacs" - - echo "Unpacking HACS..." - unzip "/config/custom_components/hacs.zip" -d "/config/custom_components/hacs" >/dev/null 2>&1 - - echo "Removing HACS zip file..." - rm "/config/custom_components/hacs.zip" - echo "Installation complete." - - configuration.yaml.default: |- - # Configure a default setup of Home Assistant (frontend, api, etc) - default_config: - - # Text to speech - tts: - - platform: google_translate - - group: !include groups.yaml - automation: !include automations.yaml - script: !include scripts.yaml - scene: !include scenes.yaml - recorder.default: |- - - recorder: - purge_keep_days: 30 - commit_interval: 3 - db_url: {{ ( printf "%s?client_encoding=utf8" ( .Values.postgresql.url.complete | trimAll "\"" ) ) | quote }} - http.default: |- - - http: - use_x_forwarded_for: true - trusted_proxies: - - 172.16.0.0/16 - -{{- end -}} diff --git a/charts/stable/home-assistant/templates/common.yaml b/charts/stable/home-assistant/templates/common.yaml index 0cc42ff47ee..b9e7208f382 100644 --- a/charts/stable/home-assistant/templates/common.yaml +++ b/charts/stable/home-assistant/templates/common.yaml @@ -1,22 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} - -{{/* Render configmap for hass */}} -{{- include "hass.configmap" . }} - -{{/* Append the general secret volumes to the volumes */}} -{{- define "hass.initvolume" -}} -enabled: "true" -mountPath: "/config/init" -readOnly: true -type: "custom" -volumeSpec: - configMap: - name: {{ include "common.names.fullname" . }}-init - defaultMode: 0777 -{{- end -}} - -{{- $_ := set .Values.persistence "init" (include "hass.initvolume" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/home-assistant/templates/secret.yaml b/charts/stable/home-assistant/templates/secret.yaml deleted file mode 100644 index 19f769cf59b..00000000000 --- a/charts/stable/home-assistant/templates/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if or .Values.git.deployKey .Values.git.deployKeyBase64 }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "common.names.fullname" . }}-deploykey - labels: - {{- include "common.labels" . | nindent 4 }} -type: Opaque -data: - {{- if .Values.git.deployKey }} - id_rsa: {{ .Values.git.deployKey | b64enc | quote }} - {{- else }} - id_rsa: {{ .Values.git.deployKeyBase64 | quote }} - {{- end }} -{{- end }} diff --git a/charts/stable/home-assistant/values.yaml b/charts/stable/home-assistant/values.yaml index 977783e8a66..ebde6ae51e4 100644 --- a/charts/stable/home-assistant/values.yaml +++ b/charts/stable/home-assistant/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/home-assistant pullPolicy: IfNotPresent - tag: v2022.6.1@sha256:5c97229d5ce59666fa71cede2b3f140f9f0e2a8cd7307b4e71cdc27e5f9d8b24 + tag: v2022.6.2@sha256:7b9b262861c0f252ba33c1d24a0cad06eb657cb22a78089f4ecfc368abf250e9 securityContext: readOnlyRootFilesystem: false @@ -34,12 +34,6 @@ initContainers: # # When hostNetwork is true set dnsPolicy to ClusterFirstWithHostNet # dnsPolicy: ClusterFirstWithHostNet -# Allow access a Git repository by passing in a private SSH key -git: - # Raw SSH private key - deployKey: "" - # Base64-encoded SSH private key. When both variables are set, the raw SSH key takes precedence. - deployKeyBase64: "" # Enable a prometheus-operator servicemonitor prometheus: @@ -52,8 +46,102 @@ persistence: config: enabled: true mountPath: "/config" + init: + enabled: "true" + mountPath: "/config/init" + readOnly: true + type: "custom" + volumeSpec: + configMap: + name: '{{ include "tc.common.names.fullname" . }}-init' + defaultMode: 0777 +configmap: + init: + enabled: true + data: + init.sh: |- + #!/bin/sh + if test -f "/config/configuration.yaml"; then + echo "configuration.yaml exists." + if grep -q recorder: "/config/configuration.yaml"; then + echo "configuration.yaml already contains recorder" + else + cat /config/init/recorder.default >> /config/configuration.yaml + fi + if grep -q http: "/config/configuration.yaml"; then + echo "configuration.yaml already contains http section" + else + cat /config/init/http.default >> /config/configuration.yaml + fi + else + echo "configuration.yaml does NOT exist." + cp /config/init/configuration.yaml.default /config/configuration.yaml + cat /config/init/recorder.default >> /config/configuration.yaml + cat /config/init/http.default >> /config/configuration.yaml + fi + + echo "Creating include files..." + for include_file in groups.yaml automations.yaml scripts.yaml scenes.yaml; do + if test -f "/config/$include_file"; then + echo "$include_file exists." + else + echo "$include_file does NOT exist." + touch "/config/$include_file" + fi + done + + cd "/config" || echo "Could not change path to /config" + echo "Creating custom_components directory..." + mkdir "/config/custom_components" || echo "custom_components directory already exists" + + echo "Changing to the custom_components directory..." + cd "/config/custom_components" || echo "Could not change path to /config/custom_components" + + echo "Downloading HACS" + wget "https://github.com/hacs/integration/releases/latest/download/hacs.zip" || exit 0 + + if [ -d "/config/custom_components/hacs" ]; then + echo "HACS directory already exist, cleaning up..." + rm -R "/config/custom_components/hacs" + fi + + echo "Creating HACS directory..." + mkdir "/config/custom_components/hacs" + + echo "Unpacking HACS..." + unzip "/config/custom_components/hacs.zip" -d "/config/custom_components/hacs" >/dev/null 2>&1 + + echo "Removing HACS zip file..." + rm "/config/custom_components/hacs.zip" + echo "Installation complete." + + configuration.yaml.default: |- + # Configure a default setup of Home Assistant (frontend, api, etc) + default_config: + + # Text to speech + tts: + - platform: google_translate + + group: !include groups.yaml + automation: !include automations.yaml + script: !include scripts.yaml + scene: !include scenes.yaml + recorder.default: |- + + recorder: + purge_keep_days: 30 + commit_interval: 3 + db_url: {{ ( printf "%s?client_encoding=utf8" ( .Values.postgresql.url.complete | trimAll "\"" ) ) | quote }} + http.default: |- + + http: + use_x_forwarded_for: true + trusted_proxies: + - 172.16.0.0/16 + # -- Enable and configure postgresql database subchart under this key. # For more options see [postgresql chart documentation](https://github.com/tccr.io/truecharts/charts/tree/master/tccr.io/truecharts/postgresql) # @default -- See values.yaml diff --git a/charts/stable/homer/Chart.yaml b/charts/stable/homer/Chart.yaml index 9eae182c4a3..d607781ba0e 100644 --- a/charts/stable/homer/Chart.yaml +++ b/charts/stable/homer/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "22.02.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A dead simple static homepage for your server to keep your services on hand. home: https://github.com/truecharts/apps/tree/master/charts/stable/homer icon: https://truecharts.org/_static/img/appicons/homer.png @@ -20,7 +20,7 @@ name: homer sources: - https://github.com/bastienwirtz/homer - https://hub.docker.com/r/b4bz/homer -version: 1.0.16 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/homer/SCALE/migrations/migrate b/charts/stable/homer/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/homer/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/homer/templates/common.yaml b/charts/stable/homer/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/homer/templates/common.yaml +++ b/charts/stable/homer/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/htpcmanager/Chart.yaml b/charts/stable/htpcmanager/Chart.yaml index 4fe97158ddb..4e0f84a8ae0 100644 --- a/charts/stable/htpcmanager/Chart.yaml +++ b/charts/stable/htpcmanager/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: htpcmanager -version: 1.0.19 +version: 2.0.0 appVersion: "2021.11.17" description: Htpcmanager is a front end for many htpc related applications. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/htpcmanager/SCALE/migrations/migrate b/charts/stable/htpcmanager/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/htpcmanager/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/htpcmanager/templates/common.yaml b/charts/stable/htpcmanager/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/htpcmanager/templates/common.yaml +++ b/charts/stable/htpcmanager/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/hyperion-ng/Chart.yaml b/charts/stable/hyperion-ng/Chart.yaml index e1624c0a903..affa20cdae5 100644 --- a/charts/stable/hyperion-ng/Chart.yaml +++ b/charts/stable/hyperion-ng/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.0.13" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Hyperion is an opensource Bias or Ambient Lighting implementation home: https://github.com/truecharts/apps/tree/master/charts/stable/hyperion-ng icon: https://truecharts.org/_static/img/appicons/hyperion-ng.png @@ -19,7 +19,7 @@ name: hyperion-ng sources: - https://github.com/hyperion-project/hyperion.ng - https://hub.docker.com/r/sirfragalot/hyperion.ng -version: 5.0.22 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/hyperion-ng/SCALE/migrations/migrate b/charts/stable/hyperion-ng/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/hyperion-ng/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/hyperion-ng/templates/common.yaml b/charts/stable/hyperion-ng/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/hyperion-ng/templates/common.yaml +++ b/charts/stable/hyperion-ng/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/icantbelieveitsnotvaletudo/Chart.yaml b/charts/stable/icantbelieveitsnotvaletudo/Chart.yaml index eb8dbde5500..07b11a0c41b 100644 --- a/charts/stable/icantbelieveitsnotvaletudo/Chart.yaml +++ b/charts/stable/icantbelieveitsnotvaletudo/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2021.2.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Create live map data from Valetudo powered robots home: https://github.com/truecharts/apps/tree/master/charts/stable/icantbelieveitsnotvaletudo icon: https://truecharts.org/_static/img/appicons/icantbelieveitsnotvaletudo.png @@ -21,7 +21,7 @@ name: icantbelieveitsnotvaletudo sources: - https://github.com/Hypfer/ICantBelieveItsNotValetudo - https://github.com/truecharts/apps/tree/master/charts/icantbelieveitsnotvaletudo -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/icantbelieveitsnotvaletudo/SCALE/migrations/migrate b/charts/stable/icantbelieveitsnotvaletudo/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/icantbelieveitsnotvaletudo/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/icantbelieveitsnotvaletudo/templates/common.yaml b/charts/stable/icantbelieveitsnotvaletudo/templates/common.yaml index 870213ec49c..eacdafa9525 100644 --- a/charts/stable/icantbelieveitsnotvaletudo/templates/common.yaml +++ b/charts/stable/icantbelieveitsnotvaletudo/templates/common.yaml @@ -1,30 +1,4 @@ -{{- include "common.setup" . }} - -{{/* Append the hardcoded settings */}} -{{- define "icantbelieveitsnotvaletudo.harcodedValues" -}} -persistence: - settings: - enabled: "true" - mountPath: "/app/config.json" - subPath: "config.json" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-settings" (include "common.names.fullname" .) }} - -probes: - liveness: - enabled: false - readiness: - enabled: false - startup: - enabled: false - -service: - main: - enabled: false -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "icantbelieveitsnotvaletudo.harcodedValues" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/icantbelieveitsnotvaletudo/templates/configmap.yaml b/charts/stable/icantbelieveitsnotvaletudo/templates/configmap.yaml deleted file mode 100644 index 6d9443a149e..00000000000 --- a/charts/stable/icantbelieveitsnotvaletudo/templates/configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-settings - labels: - {{- include "common.labels" . | nindent 4 }} -data: - config.json: | - {{- .Values.config | mustToPrettyJson | nindent 4 }} diff --git a/charts/stable/icantbelieveitsnotvaletudo/values.yaml b/charts/stable/icantbelieveitsnotvaletudo/values.yaml index e6e7544b960..34140b1daad 100644 --- a/charts/stable/icantbelieveitsnotvaletudo/values.yaml +++ b/charts/stable/icantbelieveitsnotvaletudo/values.yaml @@ -10,16 +10,33 @@ controller: # -- Set the controller upgrade strategy strategy: RollingUpdate +configmap: + settings: + enabled: true + data: + config.json: | + {{- .Values.config | mustToPrettyJson | nindent 4 }} + service: main: ports: main: port: 10039 targetPort: 3000 + persistence: config: enabled: true mountPath: "/config" + settings: + enabled: true + mountPath: "/app/config.json" + subPath: "config.json" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-settings" (include "tc.common.names.fullname" .) }}' + # -- Configures app settings. See [image docs](https://github.com/Hypfer/ICantBelieveItsNotValetudo) for more information. # @default -- See values.yaml config: diff --git a/charts/stable/icinga2/Chart.yaml b/charts/stable/icinga2/Chart.yaml index a3c38f06dd3..87a956523fc 100644 --- a/charts/stable/icinga2/Chart.yaml +++ b/charts/stable/icinga2/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.13.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: icinga2 sources: - https://github.com/jjethwa/icinga2 - https://icinga.com/ -version: 1.0.25 +version: 2.0.0 annotations: truecharts.org/catagories: | - monitoring diff --git a/charts/stable/icinga2/SCALE/migrations/migrate b/charts/stable/icinga2/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/icinga2/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/icinga2/templates/common.yaml b/charts/stable/icinga2/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/icinga2/templates/common.yaml +++ b/charts/stable/icinga2/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/icinga2/values.yaml b/charts/stable/icinga2/values.yaml index 4177fecacd0..ef8ebf23fb0 100644 --- a/charts/stable/icinga2/values.yaml +++ b/charts/stable/icinga2/values.yaml @@ -7,6 +7,18 @@ image: # @default -- See below env: DEFAULT_MYSQL_USER: icinga2 + DEFAULT_MYSQL_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + DEFAULT_MYSQL_PASS: + secretKeyRef: + name: mariadbcreds + key: mariadb-password + MYSQL_ROOT_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-root-password securityContext: readOnlyRootFilesystem: false @@ -63,20 +75,6 @@ persistence: enabled: true mountPath: "/etc/ssmtp" -envValueFrom: - DEFAULT_MYSQL_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - DEFAULT_MYSQL_PASS: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - MYSQL_ROOT_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-root-password - mariadb: enabled: true mariadbUsername: icinga2 diff --git a/charts/core/k8s-gateway/.helmignore b/charts/stable/impostor-server/.helmignore similarity index 100% rename from charts/core/k8s-gateway/.helmignore rename to charts/stable/impostor-server/.helmignore diff --git a/charts/games/impostor-server/CHANGELOG.md b/charts/stable/impostor-server/CHANGELOG.md similarity index 100% rename from charts/games/impostor-server/CHANGELOG.md rename to charts/stable/impostor-server/CHANGELOG.md diff --git a/charts/core/external-service/CONFIG.md b/charts/stable/impostor-server/CONFIG.md similarity index 100% rename from charts/core/external-service/CONFIG.md rename to charts/stable/impostor-server/CONFIG.md diff --git a/charts/games/impostor-server/Chart.yaml b/charts/stable/impostor-server/Chart.yaml similarity index 95% rename from charts/games/impostor-server/Chart.yaml rename to charts/stable/impostor-server/Chart.yaml index 3c599b086ad..b52e27ee10c 100644 --- a/charts/games/impostor-server/Chart.yaml +++ b/charts/stable/impostor-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.6.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A private Among Us server home: https://github.com/truecharts/apps/tree/master/charts/games/impostor-server @@ -19,7 +19,7 @@ name: impostor-server sources: - https://github.com/truecharts/apps/tree/master/incubator/impostor-server type: application -version: 0.0.40 +version: 1.0.0 annotations: truecharts.org/catagories: | - games diff --git a/charts/games/impostor-server/README.md b/charts/stable/impostor-server/README.md similarity index 100% rename from charts/games/impostor-server/README.md rename to charts/stable/impostor-server/README.md diff --git a/charts/stable/impostor-server/SCALE/migrations/migrate b/charts/stable/impostor-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/impostor-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/games/minecraft-java/ci/base-values.yaml b/charts/stable/impostor-server/ci/base-values.yaml similarity index 100% rename from charts/games/minecraft-java/ci/base-values.yaml rename to charts/stable/impostor-server/ci/base-values.yaml diff --git a/charts/games/impostor-server/ci/values.yaml b/charts/stable/impostor-server/ci/values.yaml similarity index 100% rename from charts/games/impostor-server/ci/values.yaml rename to charts/stable/impostor-server/ci/values.yaml diff --git a/charts/games/impostor-server/helm-values.md b/charts/stable/impostor-server/helm-values.md similarity index 100% rename from charts/games/impostor-server/helm-values.md rename to charts/stable/impostor-server/helm-values.md diff --git a/charts/games/impostor-server/questions.yaml b/charts/stable/impostor-server/questions.yaml similarity index 100% rename from charts/games/impostor-server/questions.yaml rename to charts/stable/impostor-server/questions.yaml diff --git a/charts/games/impostor-server/security.md b/charts/stable/impostor-server/security.md similarity index 100% rename from charts/games/impostor-server/security.md rename to charts/stable/impostor-server/security.md diff --git a/charts/stable/impostor-server/templates/common.yaml b/charts/stable/impostor-server/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/impostor-server/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/impostor-server/values.yaml b/charts/stable/impostor-server/values.yaml similarity index 100% rename from charts/games/impostor-server/values.yaml rename to charts/stable/impostor-server/values.yaml diff --git a/charts/stable/inventree/Chart.yaml b/charts/stable/inventree/Chart.yaml index 43922a050d3..1399bed6f51 100644 --- a/charts/stable/inventree/Chart.yaml +++ b/charts/stable/inventree/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.7.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: inventree sources: - https://inventree.readthedocs.io - https://github.com/inventree/InvenTree -version: 1.0.2 +version: 2.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/inventree/SCALE/migrations/migrate b/charts/stable/inventree/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/inventree/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/inventree/questions.yaml b/charts/stable/inventree/questions.yaml index acf2f0146d6..da43106ba8b 100644 --- a/charts/stable/inventree/questions.yaml +++ b/charts/stable/inventree/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/inventree/templates/common.yaml b/charts/stable/inventree/templates/common.yaml index 0f40b8eaaab..6259492797e 100644 --- a/charts/stable/inventree/templates/common.yaml +++ b/charts/stable/inventree/templates/common.yaml @@ -1,22 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} - -{{/* Append the hardcoded settings */}} -{{- define "inventree.harcodedValues" -}} -persistence: - inventree-config: - enabled: "true" - mountPath: "/etc/nginx/nginx.conf" - subPath: "nginx-confing" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-config" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "inventree.harcodedValues" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for inventree */}} {{- include "inventree.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/inventree/templates/configmap.yaml b/charts/stable/inventree/templates/configmap.yaml deleted file mode 100644 index 2d555b52ac6..00000000000 --- a/charts/stable/inventree/templates/configmap.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - nginx-config: |- - server { - - # Listen for connection on (internal) port 80 - listen 10231; - - real_ip_header proxy_protocol; - - location / { - - proxy_set_header Host $http_host; - proxy_set_header X-Forwarded-By $server_addr:$server_port; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header CLIENT_IP $remote_addr; - - proxy_pass_request_headers on; - - proxy_redirect off; - - client_max_body_size 100M; - - proxy_buffering off; - proxy_request_buffering off; - - # Change 'inventree-server' to the name of the inventree server container, - # and '8000' to the INVENTREE_WEB_PORT (if not default) - proxy_pass http://localhost:8000; - } - - # Redirect any requests for static files - location /static/ { - alias /var/www/static/; - autoindex on; - - # Caching settings - expires 30d; - add_header Pragma public; - add_header Cache-Control "public"; - } - - # Redirect any requests for media files - location /media/ { - alias /var/www/media/; - - # Media files require user authentication - auth_request /auth; - } - - # Use the 'user' API endpoint for auth - location /auth { - internal; - - proxy_pass http://localhost:8000/auth/; - - proxy_pass_request_body off; - proxy_set_header Content-Length ""; - proxy_set_header X-Original-URI $request_uri; - } - } diff --git a/charts/stable/inventree/values.yaml b/charts/stable/inventree/values.yaml index 3cec3d32d5d..ec67778f5ca 100644 --- a/charts/stable/inventree/values.yaml +++ b/charts/stable/inventree/values.yaml @@ -14,11 +14,76 @@ podSecurityContext: runAsUser: 100 runAsGroup: 0 -secret: +secretEnv: INVENTREE_ADMIN_EMAIL: "test@example.com" INVENTREE_ADMIN_USER: "super" INVENTREE_ADMIN_PASSWORD: "secret" +configmap: + config: + enabled: true + data: + nginx-config: |- + server { + # Listen for connection on (internal) port 80 + listen 10231; + + real_ip_header proxy_protocol; + + location / { + + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-By $server_addr:$server_port; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header CLIENT_IP $remote_addr; + + proxy_pass_request_headers on; + + proxy_redirect off; + + client_max_body_size 100M; + + proxy_buffering off; + proxy_request_buffering off; + + # Change 'inventree-server' to the name of the inventree server container, + # and '8000' to the INVENTREE_WEB_PORT (if not default) + proxy_pass http://localhost:8000; + } + + # Redirect any requests for static files + location /static/ { + alias /var/www/static/; + autoindex on; + + # Caching settings + expires 30d; + add_header Pragma public; + add_header Cache-Control "public"; + } + + # Redirect any requests for media files + location /media/ { + alias /var/www/media/; + + # Media files require user authentication + auth_request /auth; + } + + # Use the 'user' API endpoint for auth + location /auth { + internal; + + proxy_pass http://localhost:8000/auth/; + + proxy_pass_request_body off; + proxy_set_header Content-Length ""; + proxy_set_header X-Original-URI $request_uri; + } + } + env: INVENTREE_DB_ENGINE: "postgresql" INVENTREE_DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" @@ -31,8 +96,6 @@ env: INVENTREE_PLUGINS_ENABLED: false INVENTREE_LOGIN_CONFIRM_DAYS: 3 INVENTREE_LOGIN_ATTEMPTS: 5 - -envValueFrom: INVENTREE_DB_PASSWORD: secretKeyRef: name: dbcreds @@ -57,6 +120,14 @@ persistence: data: enabled: true mountPath: "/home/inventree/data" + inventree-config: + enabled: "true" + mountPath: "/etc/nginx/nginx.conf" + subPath: "nginx-confing" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-config" (include "tc.common.names.fullname" .) }}' initContainers: init-migrate: diff --git a/charts/stable/ipfs/Chart.yaml b/charts/stable/ipfs/Chart.yaml index 23fd2c26cd6..dbf82680dce 100644 --- a/charts/stable/ipfs/Chart.yaml +++ b/charts/stable/ipfs/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ipfs -version: 2.0.15 +version: 3.0.0 appVersion: "0.12.2" description: IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas from previous systems such Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single bittorrent swarm, exchanging git objects. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/ipfs/SCALE/migrations/migrate b/charts/stable/ipfs/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ipfs/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ipfs/questions.yaml b/charts/stable/ipfs/questions.yaml index c041580e007..79925cc147c 100644 --- a/charts/stable/ipfs/questions.yaml +++ b/charts/stable/ipfs/questions.yaml @@ -76,7 +76,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/ipfs/templates/common.yaml b/charts/stable/ipfs/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/stable/ipfs/templates/common.yaml +++ b/charts/stable/ipfs/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/stable/ispy-agent-dvr/Chart.yaml b/charts/stable/ispy-agent-dvr/Chart.yaml index cb4bb095905..de7c9db4ec8 100644 --- a/charts/stable/ispy-agent-dvr/Chart.yaml +++ b/charts/stable/ispy-agent-dvr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.0.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: iSpy's Agent DVR, a standalone DVR service to manage IP cameras. home: https://github.com/truecharts/apps/tree/master/charts/stable/ispy-agent-dvr icon: https://truecharts.org/_static/img/appicons/ispy-agent-dvr.png @@ -20,7 +20,7 @@ name: ispy-agent-dvr sources: - https://hub.docker.com/r/doitandbedone/ispyagentdvr - https://github.com/doitandbedone/ispyagentdvr-docker -version: 1.0.28 +version: 2.0.0 annotations: truecharts.org/catagories: | - security diff --git a/charts/stable/ispy-agent-dvr/SCALE/migrations/migrate b/charts/stable/ispy-agent-dvr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ispy-agent-dvr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ispy-agent-dvr/templates/common.yaml b/charts/stable/ispy-agent-dvr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ispy-agent-dvr/templates/common.yaml +++ b/charts/stable/ispy-agent-dvr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ispy-agent-dvr/values.yaml b/charts/stable/ispy-agent-dvr/values.yaml index 0495e3c748f..2507cf90f89 100644 --- a/charts/stable/ispy-agent-dvr/values.yaml +++ b/charts/stable/ispy-agent-dvr/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/ispy-agent-dvr - tag: v4.0.0.0@sha256:bd469839305eae23b0d8628613f98d52e0eebc8f1143f78042b12a0ed8daa0cc + tag: v4.0.1.0@sha256:2676711c153a275be2fd11b3554eeb4202991dd32faf83b63922294fd249bbc5 pullPolicy: IfNotPresent securityContext: diff --git a/charts/stable/iyuuplus/Chart.yaml b/charts/stable/iyuuplus/Chart.yaml index 2de7b95ca04..0ba76fa19fa 100644 --- a/charts/stable/iyuuplus/Chart.yaml +++ b/charts/stable/iyuuplus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: iyuuplus -version: 1.0.17 +version: 2.0.0 appVersion: "latest" description: The IYUU automatic seeding tool can automatically seed most PT sites in China, support downloader clusters, multiple disks, multiple download directories, connecting to remote downloaders, etc. type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/iyuuplus/SCALE/migrations/migrate b/charts/stable/iyuuplus/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/iyuuplus/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/iyuuplus/templates/common.yaml b/charts/stable/iyuuplus/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/iyuuplus/templates/common.yaml +++ b/charts/stable/iyuuplus/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml index bc60d2953f2..19434f78d75 100644 --- a/charts/stable/jackett/Chart.yaml +++ b/charts/stable/jackett/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.20.1144" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: API Support for your favorite torrent trackers. home: https://github.com/truecharts/apps/tree/master/charts/stable/jackett @@ -21,7 +21,7 @@ name: jackett sources: - https://github.com/Jackett/Jackett type: application -version: 10.0.54 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/jackett/SCALE/migrations/migrate b/charts/stable/jackett/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/jackett/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/jackett/templates/common.yaml b/charts/stable/jackett/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/jackett/templates/common.yaml +++ b/charts/stable/jackett/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/jackett/values.yaml b/charts/stable/jackett/values.yaml index bf719b36cd5..188f9fdd939 100644 --- a/charts/stable/jackett/values.yaml +++ b/charts/stable/jackett/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/jackett pullPolicy: IfNotPresent - tag: v0.20.1144@sha256:3bc1ad9b684adcceb56990c9478b54e41094f524b7a894d6a37ae5d05f55643a + tag: v0.20.1150@sha256:b7d568151ce4cafff789929056471ee9d1884c667983190d555c8769d66288fc securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/jdownloader2/Chart.yaml b/charts/stable/jdownloader2/Chart.yaml index e4ed30c5022..64f3de1f5fb 100644 --- a/charts/stable/jdownloader2/Chart.yaml +++ b/charts/stable/jdownloader2/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.7.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: JDownloader is a free, open-source download management tool with a huge community of developers that makes downloading as easy and fast as it should be. @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/jlesage/jdownloader-2 - https://jdownloader.org/ type: application -version: 7.0.17 +version: 8.0.0 annotations: truecharts.org/catagories: | - downloads diff --git a/charts/stable/jdownloader2/SCALE/migrations/migrate b/charts/stable/jdownloader2/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/jdownloader2/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/jdownloader2/questions.yaml b/charts/stable/jdownloader2/questions.yaml index 0b3855678d3..53235bff8a1 100644 --- a/charts/stable/jdownloader2/questions.yaml +++ b/charts/stable/jdownloader2/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/jdownloader2/templates/common.yaml b/charts/stable/jdownloader2/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/jdownloader2/templates/common.yaml +++ b/charts/stable/jdownloader2/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/jdownloader2/values.yaml b/charts/stable/jdownloader2/values.yaml index 44682c8bade..942c25e8e50 100644 --- a/charts/stable/jdownloader2/values.yaml +++ b/charts/stable/jdownloader2/values.yaml @@ -34,9 +34,9 @@ service: envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-jdownloader' + name: '{{ include "tc.common.names.fullname" . }}-jdownloader' -secret: +secretEnv: VNC_PASSWORD: "" jdownloader: diff --git a/charts/stable/jellyfin/Chart.yaml b/charts/stable/jellyfin/Chart.yaml index 6d77e095201..e075db6d148 100644 --- a/charts/stable/jellyfin/Chart.yaml +++ b/charts/stable/jellyfin/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "10.7.7" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Jellyfin is a Free Software Media System home: https://github.com/truecharts/apps/tree/master/charts/stable/jellyfin @@ -21,7 +21,7 @@ name: jellyfin sources: - https://github.com/jellyfin/jellyfin type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/jellyfin/SCALE/migrations/migrate b/charts/stable/jellyfin/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/jellyfin/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/jellyfin/templates/common.yaml b/charts/stable/jellyfin/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/jellyfin/templates/common.yaml +++ b/charts/stable/jellyfin/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/jellyseerr/Chart.yaml b/charts/stable/jellyseerr/Chart.yaml index 21bec75170f..5609b3842ac 100644 --- a/charts/stable/jellyseerr/Chart.yaml +++ b/charts/stable/jellyseerr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.1.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: TEMPLATEREPLACEME home: https://github.com/truecharts/apps/tree/master/charts/stable/jellyseerr icon: https://truecharts.org/_static/img/appicons/jellyseerr.png @@ -18,7 +18,7 @@ name: jellyseerr sources: - https://github.com/Fallenbagel/jellyseerr - https://hub.docker.com/r/fallenbagel/jellyseerr -version: 1.0.2 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/jellyseerr/SCALE/migrations/migrate b/charts/stable/jellyseerr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/jellyseerr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/jellyseerr/templates/common.yaml b/charts/stable/jellyseerr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/jellyseerr/templates/common.yaml +++ b/charts/stable/jellyseerr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/joplin-server/Chart.yaml b/charts/stable/joplin-server/Chart.yaml index 7c15af9c3c9..ffeac25c05b 100644 --- a/charts/stable/joplin-server/Chart.yaml +++ b/charts/stable/joplin-server/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.7.4" description: This server allows you to sync any Joplin client name: joplin-server -version: 6.0.23 +version: 7.0.0 kubeVersion: '>=1.16.0-0' keywords: - joplin @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/joplin-server/SCALE/migrations/migrate b/charts/stable/joplin-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/joplin-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/joplin-server/templates/common.yaml b/charts/stable/joplin-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/joplin-server/templates/common.yaml +++ b/charts/stable/joplin-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/joplin-server/values.yaml b/charts/stable/joplin-server/values.yaml index e410e8959ba..404b9709599 100644 --- a/charts/stable/joplin-server/values.yaml +++ b/charts/stable/joplin-server/values.yaml @@ -18,8 +18,6 @@ env: POSTGRES_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" POSTGRES_PORT: "5432" - -envValueFrom: POSTGRES_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/core/prometheus/.helmignore b/charts/stable/k8s-gateway/.helmignore similarity index 100% rename from charts/core/prometheus/.helmignore rename to charts/stable/k8s-gateway/.helmignore diff --git a/charts/core/k8s-gateway/CHANGELOG.md b/charts/stable/k8s-gateway/CHANGELOG.md similarity index 100% rename from charts/core/k8s-gateway/CHANGELOG.md rename to charts/stable/k8s-gateway/CHANGELOG.md diff --git a/charts/core/k8s-gateway/CONFIG.md b/charts/stable/k8s-gateway/CONFIG.md similarity index 100% rename from charts/core/k8s-gateway/CONFIG.md rename to charts/stable/k8s-gateway/CONFIG.md diff --git a/charts/core/k8s-gateway/Chart.yaml b/charts/stable/k8s-gateway/Chart.yaml similarity index 95% rename from charts/core/k8s-gateway/Chart.yaml rename to charts/stable/k8s-gateway/Chart.yaml index be3ccd9be95..7c6e47d38f4 100644 --- a/charts/core/k8s-gateway/Chart.yaml +++ b/charts/stable/k8s-gateway/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.3.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A Helm chart for the k8s_gateway CoreDNS plugin home: https://github.com/truecharts/apps/tree/master/charts/core/k8s-gateway @@ -20,7 +20,7 @@ name: k8s-gateway sources: - https://github.com/ori-edge/k8s_gateway type: application -version: 5.0.21 +version: 6.0.0 annotations: truecharts.org/catagories: | - networking diff --git a/charts/core/k8s-gateway/README.md b/charts/stable/k8s-gateway/README.md similarity index 100% rename from charts/core/k8s-gateway/README.md rename to charts/stable/k8s-gateway/README.md diff --git a/charts/core/k8s-gateway/helm-values.md b/charts/stable/k8s-gateway/helm-values.md similarity index 100% rename from charts/core/k8s-gateway/helm-values.md rename to charts/stable/k8s-gateway/helm-values.md diff --git a/charts/core/k8s-gateway/questions.yaml b/charts/stable/k8s-gateway/questions.yaml similarity index 100% rename from charts/core/k8s-gateway/questions.yaml rename to charts/stable/k8s-gateway/questions.yaml diff --git a/charts/core/k8s-gateway/security.md b/charts/stable/k8s-gateway/security.md similarity index 100% rename from charts/core/k8s-gateway/security.md rename to charts/stable/k8s-gateway/security.md diff --git a/charts/core/k8s-gateway/templates/_configmap.tpl b/charts/stable/k8s-gateway/templates/_configmap.tpl similarity index 91% rename from charts/core/k8s-gateway/templates/_configmap.tpl rename to charts/stable/k8s-gateway/templates/_configmap.tpl index 2c6c2c35b67..c91a06788b3 100644 --- a/charts/core/k8s-gateway/templates/_configmap.tpl +++ b/charts/stable/k8s-gateway/templates/_configmap.tpl @@ -12,14 +12,14 @@ Create the matchable regex from domain {{/* Define the configmap */}} {{- define "k8s-gateway.configmap" -}} {{- $values := .Values }} -{{- $fqdn := ( include "common.names.fqdn" . ) }} +{{- $fqdn := ( include "tc.common.names.fqdn" . ) }} --- apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.names.fullname" . }}-corefile + name: {{ include "tc.common.names.fullname" . }}-corefile labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} data: Corefile: |- .:53 { diff --git a/charts/core/k8s-gateway/templates/common.yaml b/charts/stable/k8s-gateway/templates/common.yaml similarity index 78% rename from charts/core/k8s-gateway/templates/common.yaml rename to charts/stable/k8s-gateway/templates/common.yaml index 80cb9a9cb39..80417591e99 100644 --- a/charts/core/k8s-gateway/templates/common.yaml +++ b/charts/stable/k8s-gateway/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for nextcloud */}} @@ -13,7 +13,7 @@ readOnly: true type: "custom" volumeSpec: configMap: - name: {{ include "common.names.fullname" . }}-corefile + name: {{ include "tc.common.names.fullname" . }}-corefile items: - key: Corefile path: Corefile @@ -21,4 +21,4 @@ volumeSpec: {{- $_ := set .Values.persistence "config-volume" (include "k8s-gateway.configvolume" . | fromYaml) -}} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/core/k8s-gateway/values.yaml b/charts/stable/k8s-gateway/values.yaml similarity index 80% rename from charts/core/k8s-gateway/values.yaml rename to charts/stable/k8s-gateway/values.yaml index f02777bad81..c86b5426c30 100644 --- a/charts/core/k8s-gateway/values.yaml +++ b/charts/stable/k8s-gateway/values.yaml @@ -44,33 +44,35 @@ forward: value: cloudflare-dns.com serviceAccount: - # -- Specifies whether a service account should be created - create: true + main: + # -- Specifies whether a service account should be created + create: true # -- Create a ClusterRole and ClusterRoleBinding # @default -- See below rbac: - # -- Enables or disables the ClusterRole and ClusterRoleBinding - enabled: true + main: + # -- Enables or disables the ClusterRole and ClusterRoleBinding + enabled: true - # -- Set Rules on the ClusterRole - rules: - - apiGroups: - - "" - resources: - - services - - namespaces - verbs: - - list - - watch - - apiGroups: - - extensions - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch + # -- Set Rules on the ClusterRole + rules: + - apiGroups: + - "" + resources: + - services + - namespaces + verbs: + - list + - watch + - apiGroups: + - extensions + - networking.k8s.io + resources: + - ingresses + verbs: + - list + - watch service: main: diff --git a/charts/stable/kanboard/Chart.yaml b/charts/stable/kanboard/Chart.yaml index aa6b66462ec..15c546e055b 100644 --- a/charts/stable/kanboard/Chart.yaml +++ b/charts/stable/kanboard/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.2.22" description: Kanboard is a free and open source Kanban project management software. name: kanboard -version: 6.0.24 +version: 7.0.0 kubeVersion: ">=1.16.0-0" keywords: - kanboard @@ -14,7 +14,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/kanboard/SCALE/migrations/migrate b/charts/stable/kanboard/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kanboard/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kanboard/templates/common.yaml b/charts/stable/kanboard/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/kanboard/templates/common.yaml +++ b/charts/stable/kanboard/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/kanboard/values.yaml b/charts/stable/kanboard/values.yaml index 081b5cc6853..363d96beadd 100644 --- a/charts/stable/kanboard/values.yaml +++ b/charts/stable/kanboard/values.yaml @@ -27,8 +27,6 @@ env: DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" DB_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}" DB_PORT: "5432" - -envValueFrom: DB_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/kavita/Chart.yaml b/charts/stable/kavita/Chart.yaml index 46052acc0fe..585a821adc7 100644 --- a/charts/stable/kavita/Chart.yaml +++ b/charts/stable/kavita/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: kavita -version: 1.0.15 +version: 2.0.0 appVersion: "0.5.3" description: Kavita is a rocket fueled self-hosted digital library which supports a vast array of file formats type: application @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/kavita/SCALE/migrations/migrate b/charts/stable/kavita/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kavita/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kavita/templates/common.yaml b/charts/stable/kavita/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/kavita/templates/common.yaml +++ b/charts/stable/kavita/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/kimai/Chart.yaml b/charts/stable/kimai/Chart.yaml index 81303536d30..799dd389d06 100644 --- a/charts/stable/kimai/Chart.yaml +++ b/charts/stable/kimai/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.20" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -25,7 +25,7 @@ sources: - https://github.com/kevinpapst/kimai2 - https://github.com/tobybatch/kimai2 - https://hub.docker.com/r/kimai/kimai2 -version: 1.0.16 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/kimai/SCALE/migrations/migrate b/charts/stable/kimai/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kimai/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kimai/questions.yaml b/charts/stable/kimai/questions.yaml index b6661ec3728..4d2b991de66 100644 --- a/charts/stable/kimai/questions.yaml +++ b/charts/stable/kimai/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/kimai/templates/common.yaml b/charts/stable/kimai/templates/common.yaml index 0e61d3c9988..1e9026ec785 100644 --- a/charts/stable/kimai/templates/common.yaml +++ b/charts/stable/kimai/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for kimai */}} {{- include "kimai.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/kimai/values.yaml b/charts/stable/kimai/values.yaml index 3b6fafa7f72..3db0b14b5ae 100644 --- a/charts/stable/kimai/values.yaml +++ b/charts/stable/kimai/values.yaml @@ -10,7 +10,7 @@ podSecurityContext: runAsUser: 33 runAsGroup: 33 -secret: +secretEnv: ADMINMAIL: "admin@mysecretdomain.com" ADMINPASS: "MvvTfjagiaqDprGNVA" @@ -23,8 +23,6 @@ env: TRUSTED_HOSTS: "{{ .Values.env.trust_hosts }},localhost" # User Defined trust_hosts: "127.0.0.1" - -envValueFrom: DB_PASS: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/kms/Chart.yaml b/charts/stable/kms/Chart.yaml index c4848604d89..b1c6ceba918 100644 --- a/charts/stable/kms/Chart.yaml +++ b/charts/stable/kms/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "minimal" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Private Windows Activation Server for development and testing home: https://github.com/truecharts/apps/tree/master/charts/stable/kms @@ -20,7 +20,7 @@ sources: - https://github.com/Py-KMS-Organization/py-kms - https://hub.docker.com/r/pykmsorg/py-kms type: application -version: 10.0.24 +version: 11.0.0 annotations: truecharts.org/catagories: | - graywares diff --git a/charts/stable/kms/SCALE/migrations/migrate b/charts/stable/kms/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kms/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kms/templates/common.yaml b/charts/stable/kms/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/kms/templates/common.yaml +++ b/charts/stable/kms/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/kodi-headless/Chart.yaml b/charts/stable/kodi-headless/Chart.yaml index a586fbd9f70..016f70b2b65 100644 --- a/charts/stable/kodi-headless/Chart.yaml +++ b/charts/stable/kodi-headless/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: kodi-headless -version: 1.0.19 +version: 2.0.0 appVersion: "190" description: A headless install of kodi in a docker container. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/kodi-headless/SCALE/migrations/migrate b/charts/stable/kodi-headless/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kodi-headless/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kodi-headless/templates/common.yaml b/charts/stable/kodi-headless/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/kodi-headless/templates/common.yaml +++ b/charts/stable/kodi-headless/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/koel/Chart.yaml b/charts/stable/koel/Chart.yaml index ee163280e79..7926b515efa 100644 --- a/charts/stable/koel/Chart.yaml +++ b/charts/stable/koel/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -25,7 +25,7 @@ sources: - https://github.com/koel/docker - https://hub.docker.com/r/phanan/koel - https://github.com/koel/koel -version: 1.0.21 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/koel/SCALE/migrations/migrate b/charts/stable/koel/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/koel/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/koel/questions.yaml b/charts/stable/koel/questions.yaml index 164967018bc..96e4ccfee34 100644 --- a/charts/stable/koel/questions.yaml +++ b/charts/stable/koel/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/koel/templates/common.yaml b/charts/stable/koel/templates/common.yaml index 1c2c86f4f82..3be71209256 100644 --- a/charts/stable/koel/templates/common.yaml +++ b/charts/stable/koel/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for koel */}} {{- include "koel.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/koel/values.yaml b/charts/stable/koel/values.yaml index 0e534dde3eb..eb53b95d865 100644 --- a/charts/stable/koel/values.yaml +++ b/charts/stable/koel/values.yaml @@ -21,15 +21,6 @@ env: LASTFM_API_KEY: "" LASTFM_API_SECRET: "" YOUTUBE_API_KEY: "" - -service: - main: - ports: - main: - port: 10185 - targetPort: 80 - -envValueFrom: DB_HOST: secretKeyRef: name: mariadbcreds @@ -43,6 +34,13 @@ envValueFrom: name: koel-secrets key: APP_KEY +service: + main: + ports: + main: + port: 10185 + targetPort: 80 + installContainers: initdb: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" diff --git a/charts/stable/komga/Chart.yaml b/charts/stable/komga/Chart.yaml index d4604e36a4c..698b69dcd95 100644 --- a/charts/stable/komga/Chart.yaml +++ b/charts/stable/komga/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.154.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A comics/mangas server to serve/stream pages via API home: https://github.com/truecharts/apps/tree/master/charts/stable/komga icon: https://truecharts.org/_static/img/appicons/komga.png @@ -21,7 +21,7 @@ name: komga sources: - https://komga.org/ - https://github.com/gotson/komga -version: 5.0.24 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/komga/SCALE/migrations/migrate b/charts/stable/komga/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/komga/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/komga/templates/common.yaml b/charts/stable/komga/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/komga/templates/common.yaml +++ b/charts/stable/komga/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/kopia/Chart.yaml b/charts/stable/kopia/Chart.yaml index a1ffc1e9655..db3e77dcb9f 100644 --- a/charts/stable/kopia/Chart.yaml +++ b/charts/stable/kopia/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "20220531.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Kopia is a simple, cross-platform tool for managing encrypted backups in the cloud. It provides fast, incremental backups, secure, client-side end-to-end encryption, compression and data deduplication. home: https://github.com/truecharts/apps/tree/master/charts/incubator/kopia icon: https://truecharts.org/_static/img/appicons/kopia.png @@ -19,7 +19,7 @@ sources: - https://kopia.io/docs/installation/#docker-images - https://hub.docker.com/r/kopia/kopia - https://github.com/kopia/kopia -version: 1.0.2 +version: 2.0.0 annotations: truecharts.org/catagories: | - utility diff --git a/charts/stable/kopia/SCALE/migrations/migrate b/charts/stable/kopia/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kopia/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kopia/questions.yaml b/charts/stable/kopia/questions.yaml index 21aac523f49..d78f328e35e 100644 --- a/charts/stable/kopia/questions.yaml +++ b/charts/stable/kopia/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/kopia/templates/common.yaml b/charts/stable/kopia/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/kopia/templates/common.yaml +++ b/charts/stable/kopia/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/kopia/values.yaml b/charts/stable/kopia/values.yaml index f7bcabddd4b..819c60e4b8b 100644 --- a/charts/stable/kopia/values.yaml +++ b/charts/stable/kopia/values.yaml @@ -1,11 +1,11 @@ image: repository: kopia/kopia - tag: 20220531.0.202938@sha256:17e51f15eb7799f9e4610e9c136babb8d0930bfaebff282a5cf06ab7374e777e + tag: 20220604.0.63625@sha256:33b9acf1ddacdb864f222d9e3376e0d596a2867e7fcaa32df77156e80efa6ba7 pullPolicy: IfNotPresent extraArgs: ["server", "--address=http://0.0.0.0:10238", "--ui", "--insecure"] -secret: +secretEnv: KOPIA_PASSWORD: "" KOPIA_SERVER_USERNAME: "user" KOPIA_SERVER_PASSWORD: "password" diff --git a/charts/stable/kutt/Chart.yaml b/charts/stable/kutt/Chart.yaml index 4df2044c70c..c04e52a8e71 100644 --- a/charts/stable/kutt/Chart.yaml +++ b/charts/stable/kutt/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.7.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -29,7 +29,7 @@ name: kutt sources: - https://github.com/thedevs-network/kutt type: application -version: 1.0.17 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/kutt/SCALE/migrations/migrate b/charts/stable/kutt/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/kutt/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/kutt/questions.yaml b/charts/stable/kutt/questions.yaml index 09c91ce619a..f675db6250d 100644 --- a/charts/stable/kutt/questions.yaml +++ b/charts/stable/kutt/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/kutt/templates/common.yaml b/charts/stable/kutt/templates/common.yaml index edbf1b24944..9730468f033 100644 --- a/charts/stable/kutt/templates/common.yaml +++ b/charts/stable/kutt/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for kutt */}} {{- include "kutt.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/kutt/values.yaml b/charts/stable/kutt/values.yaml index 6d26f3ad39b..929a998c016 100644 --- a/charts/stable/kutt/values.yaml +++ b/charts/stable/kutt/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: MAIL_USER: "" MAIL_PASSWORD: "" RECAPTCHA_SITE_KEY: "" @@ -43,8 +43,6 @@ env: MAIL_PORT: 567 MAIL_FROM: "" MAIL_SECURE: true - -envValueFrom: DB_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/lanraragi/Chart.yaml b/charts/stable/lanraragi/Chart.yaml index 0d11ad74d72..1d1be34ba0a 100644 --- a/charts/stable/lanraragi/Chart.yaml +++ b/charts/stable/lanraragi/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.8.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Open source server for archival of comics/manga. home: https://github.com/truecharts/apps/tree/master/charts/stable/lanraragi icon: https://truecharts.org/_static/img/appicons/lanraragi.png @@ -21,7 +21,7 @@ sources: - https://github.com/Difegue/LANraragi - https://hub.docker.com/r/difegue/lanraragi - https://sugoi.gitbook.io/lanraragi/ -version: 1.0.18 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/lanraragi/SCALE/migrations/migrate b/charts/stable/lanraragi/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/lanraragi/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/lanraragi/templates/common.yaml b/charts/stable/lanraragi/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/lanraragi/templates/common.yaml +++ b/charts/stable/lanraragi/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/lazylibrarian/Chart.yaml b/charts/stable/lazylibrarian/Chart.yaml index c34caa7f6e9..e7256979e37 100644 --- a/charts/stable/lazylibrarian/Chart.yaml +++ b/charts/stable/lazylibrarian/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Get all your books, like series with Sonarr... home: https://github.com/truecharts/apps/tree/master/charts/stable/lazylibrarian @@ -21,7 +21,7 @@ sources: - https://gitlab.com/LazyLibrarian/LazyLibrarian.git - https://lazylibrarian.gitlab.io type: application -version: 10.0.31 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/lazylibrarian/SCALE/migrations/migrate b/charts/stable/lazylibrarian/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/lazylibrarian/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/lazylibrarian/templates/common.yaml b/charts/stable/lazylibrarian/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/lazylibrarian/templates/common.yaml +++ b/charts/stable/lazylibrarian/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/lazylibrarian/values.yaml b/charts/stable/lazylibrarian/values.yaml index eb4872a3247..db41beff171 100644 --- a/charts/stable/lazylibrarian/values.yaml +++ b/charts/stable/lazylibrarian/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/lazylibrarian pullPolicy: IfNotPresent - tag: latest@sha256:e694e6b4f2398501aee43e68aee0809055ed52bacab4742c95b57a13a2cd2e18 + tag: latest@sha256:21ec4044731d9fbbeb48f542be85a480ff233eb6ac07a00d965989e36b7fc152 securityContext: runAsNonRoot: false diff --git a/charts/stable/leaf2mqtt/Chart.yaml b/charts/stable/leaf2mqtt/Chart.yaml index 1d989f0076a..e315abb8d37 100644 --- a/charts/stable/leaf2mqtt/Chart.yaml +++ b/charts/stable/leaf2mqtt/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Nissan Leaf connected services to MQTT adapter home: https://github.com/truecharts/apps/tree/master/charts/stable/leaf2mqtt icon: https://truecharts.org/_static/img/appicons/leaf2mqtt.png @@ -22,7 +22,7 @@ name: leaf2mqtt sources: - https://github.com/mitsumaui/leaf2mqtt - https://github.com/k8s-at-home/container-images -version: 3.0.20 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/leaf2mqtt/SCALE/migrations/migrate b/charts/stable/leaf2mqtt/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/leaf2mqtt/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/leaf2mqtt/questions.yaml b/charts/stable/leaf2mqtt/questions.yaml index 753ac72c46a..4fafa1d7f7c 100644 --- a/charts/stable/leaf2mqtt/questions.yaml +++ b/charts/stable/leaf2mqtt/questions.yaml @@ -52,7 +52,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/leaf2mqtt/templates/common.yaml b/charts/stable/leaf2mqtt/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/stable/leaf2mqtt/templates/common.yaml +++ b/charts/stable/leaf2mqtt/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/leaf2mqtt/values.yaml b/charts/stable/leaf2mqtt/values.yaml index c318d939dce..3fce082435f 100644 --- a/charts/stable/leaf2mqtt/values.yaml +++ b/charts/stable/leaf2mqtt/values.yaml @@ -29,7 +29,7 @@ probes: startup: enabled: false -secret: +secretEnv: LEAF_USERNAME: "leafuser" LEAF_PASSWORD: "changeme" MQTT_USERNAME: "mqttuser" diff --git a/charts/stable/leantime/Chart.yaml b/charts/stable/leantime/Chart.yaml index 1a9b1771471..8d202db6236 100644 --- a/charts/stable/leantime/Chart.yaml +++ b/charts/stable/leantime/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.1.9" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -24,7 +24,7 @@ name: leantime sources: - https://leantime.io/ - https://hub.docker.com/r/nicholaswilde/leantime -version: 2.0.24 +version: 3.0.0 annotations: truecharts.org/catagories: | - management diff --git a/charts/stable/leantime/SCALE/migrations/migrate b/charts/stable/leantime/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/leantime/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/leantime/templates/common.yaml b/charts/stable/leantime/templates/common.yaml index f967b92d3a2..21f1ee2691f 100644 --- a/charts/stable/leantime/templates/common.yaml +++ b/charts/stable/leantime/templates/common.yaml @@ -1,7 +1,7 @@ -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for leantime */}} {{- include "leantime.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/leantime/values.yaml b/charts/stable/leantime/values.yaml index a93557af29f..dddbbba190b 100644 --- a/charts/stable/leantime/values.yaml +++ b/charts/stable/leantime/values.yaml @@ -15,15 +15,6 @@ env: LEAN_DB_DATABASE: "{{ .Values.mariadb.mariadbDatabase }}" LEAN_DB_USER: "{{ .Values.mariadb.mariadbUsername }}" LEAN_APP_URL: "{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}https://{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ end }}{{ end }}" - -service: - main: - ports: - main: - port: 10117 - targetPort: 80 - -envValueFrom: LEAN_DB_HOST: secretKeyRef: name: mariadbcreds @@ -37,6 +28,14 @@ envValueFrom: name: leantime-secrets key: LEAN_SESSION_PASSWORD + +service: + main: + ports: + main: + port: 10117 + targetPort: 80 + mariadb: enabled: true mariadbUsername: leantime diff --git a/charts/stable/libreoffice/Chart.yaml b/charts/stable/libreoffice/Chart.yaml index 3775fbea5b9..13065ca922e 100644 --- a/charts/stable/libreoffice/Chart.yaml +++ b/charts/stable/libreoffice/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: libreoffice -version: 1.0.20 +version: 2.0.0 appVersion: "7.2.2" description: LibreOffice is a free and powerful office suite, and a successor to OpenOffice.org. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/libreoffice/SCALE/migrations/migrate b/charts/stable/libreoffice/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/libreoffice/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/libreoffice/templates/common.yaml b/charts/stable/libreoffice/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/libreoffice/templates/common.yaml +++ b/charts/stable/libreoffice/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/librephotos/Chart.yaml b/charts/stable/librephotos/Chart.yaml index f5a7e13ad99..e31f0a1cd74 100644 --- a/charts/stable/librephotos/Chart.yaml +++ b/charts/stable/librephotos/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022w6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -27,7 +27,7 @@ name: librephotos sources: - https://github.com/LibrePhotos/librephotos - https://hub.docker.com/r/reallibrephotos/librephotos -version: 2.0.23 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/librephotos/SCALE/migrations/migrate b/charts/stable/librephotos/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/librephotos/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/librephotos/questions.yaml b/charts/stable/librephotos/questions.yaml index 878ed74a87a..83aa7f1fea9 100644 --- a/charts/stable/librephotos/questions.yaml +++ b/charts/stable/librephotos/questions.yaml @@ -109,7 +109,7 @@ questions: type: boolean default: false - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Secret Image Environment" schema: diff --git a/charts/stable/librephotos/templates/common.yaml b/charts/stable/librephotos/templates/common.yaml index 67dff07f4ec..6c6067c70d4 100644 --- a/charts/stable/librephotos/templates/common.yaml +++ b/charts/stable/librephotos/templates/common.yaml @@ -1,19 +1,5 @@ -{{- include "common.setup" . }} - -{{/* Append the general configMap volume to the volumes */}} -{{- define "librephotos.harcodedValues" -}} -persistence: - librephotos-config: - enabled: "true" - mountPath: "/etc/nginx/nginx.conf" - subPath: "nginx-config" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-config" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "librephotos.harcodedValues" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{- include "librephotos.secrets" . }} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/librephotos/templates/configmap.yaml b/charts/stable/librephotos/templates/configmap.yaml deleted file mode 100644 index fdf25dd3332..00000000000 --- a/charts/stable/librephotos/templates/configmap.yaml +++ /dev/null @@ -1,63 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - nginx-config: |- - user nginx; - worker_processes 1; - - error_log /var/log/nginx/error.log debug; - - events { - worker_connections 1024; - } - - http { - server { - listen 80; - location / { - # React routes are entirely on the App side in the web broswer - # Always proxy to root with the same page request when nginx 404s - error_page 404 /; - proxy_intercept_errors on; - proxy_set_header Host $host; - proxy_pass http://localhost:3000/; - } - location ~ ^/(api|media)/ { - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host localhost; - include uwsgi_params; - proxy_pass http://localhost:8001; - } - # Django media - location /protected_media { - internal; - alias /protected_media/; - } - - location /static/drf-yasg { - proxy_pass http://localhost:8001; - } - - location /data { - internal; - alias /data/; - } - - # Original Photos - location /original { - internal; - alias /data/; - } - # Nextcloud Original Photos - location /nextcloud_original { - internal; - alias /data/nextcloud_media/; - } - } - } diff --git a/charts/stable/librephotos/values.yaml b/charts/stable/librephotos/values.yaml index a659137a3b3..fdfc29d8462 100644 --- a/charts/stable/librephotos/values.yaml +++ b/charts/stable/librephotos/values.yaml @@ -19,12 +19,72 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: ADMIN_EMAIL: "admin@mydomain.com" ADMIN_USERNAME: "admin" ADMIN_PASSWORD: "password" MAPBOX_API_KEY: "" +configmap: + config: + enabled: true + data: + nginx-config: |- + user nginx; + worker_processes 1; + + error_log /var/log/nginx/error.log debug; + + events { + worker_connections 1024; + } + + http { + server { + listen 80; + location / { + # React routes are entirely on the App side in the web broswer + # Always proxy to root with the same page request when nginx 404s + error_page 404 /; + proxy_intercept_errors on; + proxy_set_header Host $host; + proxy_pass http://localhost:3000/; + } + location ~ ^/(api|media)/ { + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host localhost; + include uwsgi_params; + proxy_pass http://localhost:8001; + } + # Django media + location /protected_media { + internal; + alias /protected_media/; + } + + location /static/drf-yasg { + proxy_pass http://localhost:8001; + } + + location /data { + internal; + alias /data/; + } + + # Original Photos + location /original { + internal; + alias /data/; + } + # Nextcloud Original Photos + location /nextcloud_original { + internal; + alias /data/nextcloud_media/; + } + } + } + env: BACKEND_HOST: "localhost" DB_BACKEND: "postgresql" @@ -36,8 +96,6 @@ env: SKIP_PATTERNS: "" HEAVYWEIGHT_PROCESS: 1 DEBUG: 0 - -envValueFrom: DB_PASS: secretKeyRef: name: dbcreds @@ -118,3 +176,11 @@ persistence: cache: enabled: true mountPath: "/root/.cache" + librephotos-config: + enabled: "true" + mountPath: "/etc/nginx/nginx.conf" + subPath: "nginx-config" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-config" (include "tc.common.names.fullname" .) }}' diff --git a/charts/stable/librespeed/Chart.yaml b/charts/stable/librespeed/Chart.yaml index a9b13fcca90..d89bd8a1e55 100644 --- a/charts/stable/librespeed/Chart.yaml +++ b/charts/stable/librespeed/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.2.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Librespeed is a HTML5 webpage to test upload and download speeds home: https://github.com/truecharts/apps/tree/master/charts/stable/librespeed icon: https://truecharts.org/_static/img/appicons/librespeed.png @@ -20,7 +20,7 @@ sources: - https://github.com/librespeed/speedtest - https://hub.docker.com/r/linuxserver/librespeed - https://github.com/truecharts/apps/tree/master/charts/librespeed -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/librespeed/SCALE/migrations/migrate b/charts/stable/librespeed/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/librespeed/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/librespeed/templates/common.yaml b/charts/stable/librespeed/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/librespeed/templates/common.yaml +++ b/charts/stable/librespeed/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/lidarr/Chart.yaml b/charts/stable/lidarr/Chart.yaml index 8b901e951ef..d51420a5649 100644 --- a/charts/stable/lidarr/Chart.yaml +++ b/charts/stable/lidarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0.2.2590" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Looks and smells like Sonarr but made for music home: https://github.com/truecharts/apps/tree/master/charts/stable/lidarr @@ -21,7 +21,7 @@ name: lidarr sources: - https://github.com/Lidarr/Lidarr type: application -version: 10.0.33 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/lidarr/SCALE/migrations/migrate b/charts/stable/lidarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/lidarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/lidarr/templates/common.yaml b/charts/stable/lidarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/lidarr/templates/common.yaml +++ b/charts/stable/lidarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/lidarr/values.yaml b/charts/stable/lidarr/values.yaml index 7a858aaa598..457d1736983 100644 --- a/charts/stable/lidarr/values.yaml +++ b/charts/stable/lidarr/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/lidarr pullPolicy: IfNotPresent - tag: v1.0.2.2590@sha256:f2e7597503b38b0e6484becc0ccb541bad5e61d3ea65b62b7159530ec985ed9f + tag: v1.1.0.2600@sha256:956bd7dbaba700e4da69bc57fd37205edb9658e6742af8127408497f321e38fe securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/linkace/Chart.yaml b/charts/stable/linkace/Chart.yaml index 670e4514366..7bd973a9f3e 100644 --- a/charts/stable/linkace/Chart.yaml +++ b/charts/stable/linkace/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.10.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -27,7 +27,7 @@ sources: - https://www.linkace.org/docs/ - https://github.com/linkace/linkace - https://hub.docker.com/r/linkace/linkace -version: 2.0.28 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/linkace/SCALE/migrations/migrate b/charts/stable/linkace/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/linkace/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/linkace/questions.yaml b/charts/stable/linkace/questions.yaml index 4812f1701ea..f3470225d9f 100644 --- a/charts/stable/linkace/questions.yaml +++ b/charts/stable/linkace/questions.yaml @@ -117,7 +117,7 @@ questions: schema: type: int default: 512 - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Secret Image Environment" schema: diff --git a/charts/stable/linkace/templates/_cronjob.tpl b/charts/stable/linkace/templates/_cronjob.tpl index 0baac48a52a..1fc5671c967 100644 --- a/charts/stable/linkace/templates/_cronjob.tpl +++ b/charts/stable/linkace/templates/_cronjob.tpl @@ -1,7 +1,7 @@ {{/* Define the cronjob */}} {{- define "linkace.cronjob" -}} {{- if .Values.secret.CRON_TOKEN }} -{{- $jobName := include "common.names.fullname" . }} +{{- $jobName := include "tc.common.names.fullname" . }} --- apiVersion: batch/v1 @@ -9,7 +9,7 @@ kind: CronJob metadata: name: {{ printf "%s-cronjob" $jobName }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} spec: schedule: "{{ .Values.cronjob.schedule }}" concurrencyPolicy: Forbid diff --git a/charts/stable/linkace/templates/common.yaml b/charts/stable/linkace/templates/common.yaml index 27ee87e65d0..b7d96a117b1 100644 --- a/charts/stable/linkace/templates/common.yaml +++ b/charts/stable/linkace/templates/common.yaml @@ -1,9 +1,9 @@ {{/* Make sure all variables are set properly */}} -{{ include "common.setup" . }} +{{ include "tc.common.loader.init" . }} {{ include "linkace.cronjob" . }} {{ include "linkace.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/linkace/values.yaml b/charts/stable/linkace/values.yaml index df74170a268..e53c757db7a 100644 --- a/charts/stable/linkace/values.yaml +++ b/charts/stable/linkace/values.yaml @@ -30,8 +30,6 @@ env: BACKUP_DISK: s3 BACKUP_NOTIFICATION_EMAIL: your@email.com BACKUP_MAX_SIZE: 512 - -envValueFrom: DB_HOST: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/linkding/Chart.yaml b/charts/stable/linkding/Chart.yaml index a5d6511a341..a5ecc845a5e 100644 --- a/charts/stable/linkding/Chart.yaml +++ b/charts/stable/linkding/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.11.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Linkding is a simple bookmark service that you can host yourself. It's designed be to be minimal, fast and easy. home: https://github.com/truecharts/apps/tree/master/charts/stable/linkding icon: https://truecharts.org/_static/img/appicons/linkding.png @@ -19,7 +19,7 @@ name: linkding sources: - https://github.com/sissbruecker/linkding - https://hub.docker.com/r/sissbruecker/linkding -version: 1.0.11 +version: 2.0.0 annotations: truecharts.org/catagories: | - bookmarks diff --git a/charts/stable/linkding/SCALE/migrations/migrate b/charts/stable/linkding/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/linkding/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/linkding/questions.yaml b/charts/stable/linkding/questions.yaml index d0413d98c6b..5948e4d8441 100644 --- a/charts/stable/linkding/questions.yaml +++ b/charts/stable/linkding/questions.yaml @@ -82,7 +82,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/linkding/templates/common.yaml b/charts/stable/linkding/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/linkding/templates/common.yaml +++ b/charts/stable/linkding/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/linkding/values.yaml b/charts/stable/linkding/values.yaml index 887634df9b5..c6a898aaa60 100644 --- a/charts/stable/linkding/values.yaml +++ b/charts/stable/linkding/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: DJANGO_SUPERUSER_USERNAME: "superuser" DJANGO_SUPERUSER_EMAIL: "super@example.com" DJANGO_SUPERUSER_PASSWORD: "somesecret" diff --git a/charts/stable/littlelink/Chart.yaml b/charts/stable/littlelink/Chart.yaml index bb15e8c8c6e..382e9adffde 100644 --- a/charts/stable/littlelink/Chart.yaml +++ b/charts/stable/littlelink/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Easy platform to combine all your social links home: https://github.com/truecharts/apps/tree/master/charts/stable/littlelink @@ -20,7 +20,7 @@ sources: - https://github.com/techno-tim/littlelink-server - https://github.com/sethcottle/littlelink type: application -version: 5.0.30 +version: 6.0.0 annotations: truecharts.org/catagories: | - social diff --git a/charts/stable/littlelink/SCALE/migrations/migrate b/charts/stable/littlelink/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/littlelink/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/littlelink/templates/common.yaml b/charts/stable/littlelink/templates/common.yaml index 90b9a2748b1..214486b3b19 100644 --- a/charts/stable/littlelink/templates/common.yaml +++ b/charts/stable/littlelink/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} {{/* Render configmap for littlelink */}} {{- include "littlelink.configmap" . }} diff --git a/charts/stable/logitech-media-server/Chart.yaml b/charts/stable/logitech-media-server/Chart.yaml index 8bc1c1792e7..abbeea82646 100644 --- a/charts/stable/logitech-media-server/Chart.yaml +++ b/charts/stable/logitech-media-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "8.3.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Logitech Media Server is a platform for home/office audio streaming. home: https://github.com/truecharts/apps/tree/master/charts/stable/logitech-media-server @@ -23,7 +23,7 @@ sources: - https://github.com/Logitech/slimserver - https://hub.docker.com/r/lmscommunity/logitechmediaserver type: application -version: 3.0.34 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/logitech-media-server/SCALE/migrations/migrate b/charts/stable/logitech-media-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/logitech-media-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/logitech-media-server/templates/common.yaml b/charts/stable/logitech-media-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/logitech-media-server/templates/common.yaml +++ b/charts/stable/logitech-media-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/loki/Chart.yaml b/charts/stable/loki/Chart.yaml index 24432a1cb0e..cf828ab2622 100644 --- a/charts/stable/loki/Chart.yaml +++ b/charts/stable/loki/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.5.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - name: "promtail" condition: promtail.enabled repository: https://charts.truecharts.org @@ -23,7 +23,7 @@ name: loki sources: - https://github.com/grafana/loki type: application -version: 3.0.22 +version: 4.0.0 annotations: truecharts.org/catagories: | - logs diff --git a/charts/stable/loki/SCALE/migrations/migrate b/charts/stable/loki/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/loki/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/loki/templates/common.yaml b/charts/stable/loki/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/loki/templates/common.yaml +++ b/charts/stable/loki/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/loki/templates/configmap-alert.yaml b/charts/stable/loki/templates/configmap-alert.yaml deleted file mode 100644 index 599457ddc4b..00000000000 --- a/charts/stable/loki/templates/configmap-alert.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if gt (len .Values.alerting_groups) 0 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }} - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -data: - {{ include "common.names.fullname" . }}-alerting-rules.yaml: |- - groups: - {{- toYaml .Values.alerting_groups | nindent 6 }} -{{- end }} diff --git a/charts/stable/loki/templates/secret.yaml b/charts/stable/loki/templates/secret.yaml deleted file mode 100644 index 2e75b6ed030..00000000000 --- a/charts/stable/loki/templates/secret.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "common.names.fullname" . -}}-config - labels: - {{- include "common.labels" . | nindent 4 }} - annotations: - {{- with .Values.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} -data: - loki.yaml: {{ tpl (toYaml .Values.config) . | b64enc}} diff --git a/charts/stable/loki/values.yaml b/charts/stable/loki/values.yaml index 72d2cabd81f..e52f00b5395 100644 --- a/charts/stable/loki/values.yaml +++ b/charts/stable/loki/values.yaml @@ -27,6 +27,23 @@ controller: args: - "-config.file=/etc/loki/loki.yaml" +## TODO add alertinggroups support like this +# configmap: +# alerting: +# enabled: true +# data: +# '{{ include "common.names.fullname" . }}-alerting-rules.yaml': |- +# {{- if gt (len .Values.alerting_groups) 0 }} +# groups: +# {{- toYaml .Values.alerting_groups | nindent 6 }} +# {{- end }} + +secret: + config: + enabled: true + data: + loki.yaml: '{{ tpl (toYaml .Values.config) . }}' + service: main: ports: @@ -130,7 +147,7 @@ persistence: enabled: true type: secret # -- Specify the name of the configmap object to be mounted - objectName: '{{ include "common.names.fullname" . -}}-config' + objectName: '{{ include "tc.common.names.fullname" . -}}-config' # -- Where to mount the volume in the main container. mountPath: "/etc/loki" diff --git a/charts/stable/lychee/Chart.yaml b/charts/stable/lychee/Chart.yaml index eb4c2c7c762..1effb8bd509 100644 --- a/charts/stable/lychee/Chart.yaml +++ b/charts/stable/lychee/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.4.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -31,7 +31,7 @@ sources: - https://github.com/LycheeOrg/Lychee - https://hub.docker.com/r/lycheeorg/lychee type: application -version: 11.0.24 +version: 12.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/lychee/SCALE/migrations/migrate b/charts/stable/lychee/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/lychee/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/lychee/questions.yaml b/charts/stable/lychee/questions.yaml index 60ecac21cf1..d10a2e64b08 100644 --- a/charts/stable/lychee/questions.yaml +++ b/charts/stable/lychee/questions.yaml @@ -100,7 +100,7 @@ questions: type: boolean default: false - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Secret Image Environment" schema: diff --git a/charts/stable/lychee/templates/common.yaml b/charts/stable/lychee/templates/common.yaml index d9b58791f5f..2e5d85f07fc 100644 --- a/charts/stable/lychee/templates/common.yaml +++ b/charts/stable/lychee/templates/common.yaml @@ -1,7 +1,7 @@ {{/* Make sure all variables are set properly */}} -{{ include "common.setup" . }} +{{ include "tc.common.loader.init" . }} {{ include "lychee.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/lychee/values.yaml b/charts/stable/lychee/values.yaml index 5ab5f794cc9..f1aa680c008 100644 --- a/charts/stable/lychee/values.yaml +++ b/charts/stable/lychee/values.yaml @@ -39,8 +39,6 @@ env: PUSHER_APP_KEY: "" PUSHER_APP_CLUSTER: "" APP_URL: http://localhost - -envValueFrom: DB_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/makemkv/Chart.yaml b/charts/stable/makemkv/Chart.yaml index c0e41a58e5b..f22abe34321 100644 --- a/charts/stable/makemkv/Chart.yaml +++ b/charts/stable/makemkv/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.21.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: MakeMKV is your one-click solution to convert video that you own into free and patents-unencumbered format that can be played everywhere. home: https://github.com/truecharts/apps/tree/master/charts/stable/makemkv icon: https://truecharts.org/_static/img/appicons/makemkv.png @@ -18,7 +18,7 @@ name: makemkv sources: - https://github.com/jlesage/docker-makemkv - https://hub.docker.com/r/jlesage/makemkv -version: 1.0.17 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/makemkv/SCALE/migrations/migrate b/charts/stable/makemkv/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/makemkv/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/makemkv/questions.yaml b/charts/stable/makemkv/questions.yaml index 5556d73192d..5902e9368a3 100644 --- a/charts/stable/makemkv/questions.yaml +++ b/charts/stable/makemkv/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/makemkv/templates/common.yaml b/charts/stable/makemkv/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/makemkv/templates/common.yaml +++ b/charts/stable/makemkv/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/makemkv/values.yaml b/charts/stable/makemkv/values.yaml index e758b070299..cc9e8b398e9 100644 --- a/charts/stable/makemkv/values.yaml +++ b/charts/stable/makemkv/values.yaml @@ -11,12 +11,12 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: VNC_PASSWORD: "" envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-makemkv' + name: '{{ include "tc.common.names.fullname" . }}-makemkv' makemkv: # General Settings diff --git a/charts/stable/matomo/Chart.yaml b/charts/stable/matomo/Chart.yaml index 0382013d42e..7ba2beff1d3 100644 --- a/charts/stable/matomo/Chart.yaml +++ b/charts/stable/matomo/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.10.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/bitnami/matomo - https://github.com/bitnami/bitnami-docker-matomo - https://github.com/matomo-org/matomo -version: 1.0.67 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/matomo/SCALE/migrations/migrate b/charts/stable/matomo/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/matomo/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/matomo/templates/common.yaml b/charts/stable/matomo/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/matomo/templates/common.yaml +++ b/charts/stable/matomo/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/matomo/values.yaml b/charts/stable/matomo/values.yaml index 365145954c7..51ceebff100 100644 --- a/charts/stable/matomo/values.yaml +++ b/charts/stable/matomo/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/matomo - tag: v4.10.1@sha256:c7ebe37ff70c02e2679f8d60fd34a383678f8dfe457325bba3946c508eb0318d + tag: v4.10.1@sha256:1ac42cd2b07045464c80ad4213aa4bf81ece1097009c35697a77d9d19348964c pullPolicy: IfNotPresent securityContext: @@ -51,6 +51,14 @@ env: # PHP_MAX_INPUT_VARS: # PHP_POST_MAX_SIZE: # PHP_UPLOAD_MAX_FILESIZE: + MATOMO_DATABASE_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + MATOMO_DATABASE_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-password probes: liveness: @@ -81,16 +89,6 @@ persistence: enabled: true mountPath: "/bitnami/matomo" -envValueFrom: - MATOMO_DATABASE_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - MATOMO_DATABASE_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - mariadb: enabled: true mariadbUsername: matomo diff --git a/charts/stable/mattermost/Chart.yaml b/charts/stable/mattermost/Chart.yaml index 874ea1af213..5d03dba2298 100644 --- a/charts/stable/mattermost/Chart.yaml +++ b/charts/stable/mattermost/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -24,7 +24,7 @@ name: mattermost sources: - https://github.com/mattermost/mattermost-server - https://github.com/mattermost/docker -version: 1.0.2 +version: 2.0.0 annotations: truecharts.org/catagories: | - hosting diff --git a/charts/stable/mattermost/SCALE/migrations/migrate b/charts/stable/mattermost/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mattermost/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mattermost/templates/common.yaml b/charts/stable/mattermost/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/mattermost/templates/common.yaml +++ b/charts/stable/mattermost/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mattermost/values.yaml b/charts/stable/mattermost/values.yaml index 3b078e3c266..aac251158fb 100644 --- a/charts/stable/mattermost/values.yaml +++ b/charts/stable/mattermost/values.yaml @@ -8,8 +8,6 @@ env: MM_SQLSETTINGS_DRIVERNAME: "postgres" MM_BLEVESETTINGS_INDEXDIR: "/mattermost/bleve-indexes" MM_SERVICESETTINGS_SITEURL: "https://test.example.com" - -envValueFrom: MM_SQLSETTINGS_DATASOURCE: secretKeyRef: name: dbcreds diff --git a/charts/stable/mealie/Chart.yaml b/charts/stable/mealie/Chart.yaml index 0ca3562f6ad..e0e880433d3 100644 --- a/charts/stable/mealie/Chart.yaml +++ b/charts/stable/mealie/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.5.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -21,7 +21,7 @@ maintainers: name: mealie sources: - https://github.com/hay-kot/mealie -version: 6.0.23 +version: 7.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/mealie/SCALE/migrations/migrate b/charts/stable/mealie/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mealie/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mealie/templates/common.yaml b/charts/stable/mealie/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/mealie/templates/common.yaml +++ b/charts/stable/mealie/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mealie/values.yaml b/charts/stable/mealie/values.yaml index b3cf66f1b8b..444c432aa2b 100644 --- a/charts/stable/mealie/values.yaml +++ b/charts/stable/mealie/values.yaml @@ -21,8 +21,6 @@ env: DB_TYPE: postgres POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" - -envValueFrom: POSTGRES_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/medusa/Chart.yaml b/charts/stable/medusa/Chart.yaml index 12fabc78fff..1966c06cd4f 100644 --- a/charts/stable/medusa/Chart.yaml +++ b/charts/stable/medusa/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.5.29" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An automatic Video Library Manager for TV Shows home: https://github.com/truecharts/apps/tree/master/charts/stable/medusa icon: https://truecharts.org/_static/img/appicons/medusa.png @@ -24,7 +24,7 @@ sources: - https://github.com/linuxserver/docker-medusa - https://pymedusa.com/ type: application -version: 2.0.29 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/medusa/SCALE/migrations/migrate b/charts/stable/medusa/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/medusa/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/medusa/templates/common.yaml b/charts/stable/medusa/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/medusa/templates/common.yaml +++ b/charts/stable/medusa/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/medusa/values.yaml b/charts/stable/medusa/values.yaml index 5769cf0a495..ac9a59734d0 100644 --- a/charts/stable/medusa/values.yaml +++ b/charts/stable/medusa/values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/medusa pullPolicy: IfNotPresent - tag: v0.5.29@sha256:b0f5fda30103f15b0067b4643f4ba3c72a849725f07e59ba2ca09a63d028defd + tag: v1.0.2@sha256:107ae3799dde6d039285f50f72e70384dc6d388012ea419e169a49995853d7d3 securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/meshroom/Chart.yaml b/charts/stable/meshroom/Chart.yaml index 6222405f77b..09b815c1883 100644 --- a/charts/stable/meshroom/Chart.yaml +++ b/charts/stable/meshroom/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.4.0-cent" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Meshroom is a free, open-source 3D Reconstruction Software based on the AliceVision Photogrammetric Computer Vision framework. home: https://github.com/truecharts/apps/tree/master/charts/stable/meshroom icon: https://truecharts.org/_static/img/appicons/meshroom.png @@ -18,7 +18,7 @@ name: meshroom sources: - https://github.com/alicevision/meshroom - https://hub.docker.com/r/alicevision/meshroom -version: 1.0.1 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/meshroom/SCALE/migrations/migrate b/charts/stable/meshroom/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/meshroom/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/meshroom/templates/common.yaml b/charts/stable/meshroom/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/meshroom/templates/common.yaml +++ b/charts/stable/meshroom/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/core/amd-gpu-plugin/.helmignore b/charts/stable/metallb/.helmignore similarity index 100% rename from charts/core/amd-gpu-plugin/.helmignore rename to charts/stable/metallb/.helmignore diff --git a/charts/core/metallb/CHANGELOG.md b/charts/stable/metallb/CHANGELOG.md similarity index 100% rename from charts/core/metallb/CHANGELOG.md rename to charts/stable/metallb/CHANGELOG.md diff --git a/charts/core/metallb/CONFIG.md b/charts/stable/metallb/CONFIG.md similarity index 100% rename from charts/core/metallb/CONFIG.md rename to charts/stable/metallb/CONFIG.md diff --git a/charts/core/metallb/Chart.yaml b/charts/stable/metallb/Chart.yaml similarity index 98% rename from charts/core/metallb/Chart.yaml rename to charts/stable/metallb/Chart.yaml index 1254e33ba73..ab1257ea4cd 100644 --- a/charts/core/metallb/Chart.yaml +++ b/charts/stable/metallb/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/metallb/metallb - https://metallb.universe.tf type: application -version: 1.0.5 +version: 2.0.0 annotations: truecharts.org/catagories: | - core diff --git a/charts/core/metallb/README.md b/charts/stable/metallb/README.md similarity index 100% rename from charts/core/metallb/README.md rename to charts/stable/metallb/README.md diff --git a/charts/core/metallb/helm-values.md b/charts/stable/metallb/helm-values.md similarity index 100% rename from charts/core/metallb/helm-values.md rename to charts/stable/metallb/helm-values.md diff --git a/charts/core/metallb/questions.yaml b/charts/stable/metallb/questions.yaml similarity index 100% rename from charts/core/metallb/questions.yaml rename to charts/stable/metallb/questions.yaml diff --git a/charts/core/metallb/security.md b/charts/stable/metallb/security.md similarity index 100% rename from charts/core/metallb/security.md rename to charts/stable/metallb/security.md diff --git a/charts/core/metallb/values.yaml b/charts/stable/metallb/values.yaml similarity index 100% rename from charts/core/metallb/values.yaml rename to charts/stable/metallb/values.yaml diff --git a/charts/stable/metube/Chart.yaml b/charts/stable/metube/Chart.yaml index 24b11fce199..64f93482e50 100644 --- a/charts/stable/metube/Chart.yaml +++ b/charts/stable/metube/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Web GUI for youtube-dl (using the yt-dlp fork) with playlist support. Allows you to download videos from YouTube and dozens of other sites home: https://github.com/truecharts/apps/tree/master/charts/stable/metube icon: https://truecharts.org/_static/img/appicons/metube.png @@ -17,7 +17,7 @@ maintainers: name: metube sources: - https://github.com/alexta69/metube -version: 1.0.9 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/metube/SCALE/migrations/migrate b/charts/stable/metube/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/metube/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/metube/templates/common.yaml b/charts/stable/metube/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/metube/templates/common.yaml +++ b/charts/stable/metube/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/impostor-server/.helmignore b/charts/stable/minecraft-bedrock/.helmignore similarity index 100% rename from charts/games/impostor-server/.helmignore rename to charts/stable/minecraft-bedrock/.helmignore diff --git a/charts/games/minecraft-bedrock/CHANGELOG.md b/charts/stable/minecraft-bedrock/CHANGELOG.md similarity index 100% rename from charts/games/minecraft-bedrock/CHANGELOG.md rename to charts/stable/minecraft-bedrock/CHANGELOG.md diff --git a/charts/core/prometheus/CONFIG.md b/charts/stable/minecraft-bedrock/CONFIG.md similarity index 100% rename from charts/core/prometheus/CONFIG.md rename to charts/stable/minecraft-bedrock/CONFIG.md diff --git a/charts/games/minecraft-bedrock/Chart.yaml b/charts/stable/minecraft-bedrock/Chart.yaml similarity index 95% rename from charts/games/minecraft-bedrock/Chart.yaml rename to charts/stable/minecraft-bedrock/Chart.yaml index 8d7cb3a9d51..7702a6da67b 100644 --- a/charts/games/minecraft-bedrock/Chart.yaml +++ b/charts/stable/minecraft-bedrock/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.1.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Minecraft Bedrock Dedicated Server home: https://github.com/truecharts/apps/tree/master/charts/games/minecraft-bedrock @@ -20,7 +20,7 @@ sources: - https://github.com/itzg/docker-minecraft-server - https://hub.docker.com/r/itzg/minecraft-server type: application -version: 0.0.33 +version: 1.0.0 annotations: truecharts.org/catagories: | - games diff --git a/charts/games/minecraft-bedrock/README.md b/charts/stable/minecraft-bedrock/README.md similarity index 100% rename from charts/games/minecraft-bedrock/README.md rename to charts/stable/minecraft-bedrock/README.md diff --git a/charts/stable/minecraft-bedrock/SCALE/migrations/migrate b/charts/stable/minecraft-bedrock/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/minecraft-bedrock/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/games/minecraft-bedrock/helm-values.md b/charts/stable/minecraft-bedrock/helm-values.md similarity index 100% rename from charts/games/minecraft-bedrock/helm-values.md rename to charts/stable/minecraft-bedrock/helm-values.md diff --git a/charts/games/minecraft-bedrock/questions.yaml b/charts/stable/minecraft-bedrock/questions.yaml similarity index 100% rename from charts/games/minecraft-bedrock/questions.yaml rename to charts/stable/minecraft-bedrock/questions.yaml diff --git a/charts/games/minecraft-bedrock/security.md b/charts/stable/minecraft-bedrock/security.md similarity index 100% rename from charts/games/minecraft-bedrock/security.md rename to charts/stable/minecraft-bedrock/security.md diff --git a/charts/stable/minecraft-bedrock/templates/common.yaml b/charts/stable/minecraft-bedrock/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/minecraft-bedrock/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/minecraft-bedrock/values.yaml b/charts/stable/minecraft-bedrock/values.yaml similarity index 100% rename from charts/games/minecraft-bedrock/values.yaml rename to charts/stable/minecraft-bedrock/values.yaml diff --git a/charts/games/minecraft-bedrock/.helmignore b/charts/stable/minecraft-java/.helmignore similarity index 100% rename from charts/games/minecraft-bedrock/.helmignore rename to charts/stable/minecraft-java/.helmignore diff --git a/charts/games/minecraft-java/CHANGELOG.md b/charts/stable/minecraft-java/CHANGELOG.md similarity index 100% rename from charts/games/minecraft-java/CHANGELOG.md rename to charts/stable/minecraft-java/CHANGELOG.md diff --git a/charts/core/traefik/CONFIG.md b/charts/stable/minecraft-java/CONFIG.md similarity index 100% rename from charts/core/traefik/CONFIG.md rename to charts/stable/minecraft-java/CONFIG.md diff --git a/charts/games/minecraft-java/Chart.yaml b/charts/stable/minecraft-java/Chart.yaml similarity index 95% rename from charts/games/minecraft-java/Chart.yaml rename to charts/stable/minecraft-java/Chart.yaml index 284a1a73252..380ca3772fb 100644 --- a/charts/games/minecraft-java/Chart.yaml +++ b/charts/stable/minecraft-java/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.8.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Minecraft Java Dedicated Server home: https://github.com/truecharts/apps/tree/master/charts/games/minecraft-java @@ -20,7 +20,7 @@ sources: - https://github.com/itzg/docker-minecraft-server - https://hub.docker.com/r/itzg/minecraft-server type: application -version: 0.0.60 +version: 1.0.0 annotations: truecharts.org/catagories: | - games diff --git a/charts/games/minecraft-java/README.md b/charts/stable/minecraft-java/README.md similarity index 100% rename from charts/games/minecraft-java/README.md rename to charts/stable/minecraft-java/README.md diff --git a/charts/stable/minecraft-java/SCALE/migrations/migrate b/charts/stable/minecraft-java/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/minecraft-java/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/minecraft-java/SCALE/migrations/migrate_from_0.0.60 b/charts/stable/minecraft-java/SCALE/migrations/migrate_from_0.0.60 new file mode 100644 index 00000000000..b1485990d75 --- /dev/null +++ b/charts/stable/minecraft-java/SCALE/migrations/migrate_from_0.0.60 @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + 'secretEnv': values.get('secret'), + 'secret': {} + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/minecraft-java/ci/base-values.yaml b/charts/stable/minecraft-java/ci/base-values.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/charts/games/minecraft-java/ci/j11-values.yaml b/charts/stable/minecraft-java/ci/j11-values.yaml similarity index 54% rename from charts/games/minecraft-java/ci/j11-values.yaml rename to charts/stable/minecraft-java/ci/j11-values.yaml index 73a9e548a34..063d2d6eb54 100644 --- a/charts/games/minecraft-java/ci/j11-values.yaml +++ b/charts/stable/minecraft-java/ci/j11-values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/minecraft-java11 - tag: latest@sha256:8b2b808e8fb015b9285ca09093ba73b2684db66ce187e5bf9fc70188bb35e109 + tag: latest@sha256:d814d5f4c6799132438177d39bad19093ac0b164f951a86955a64697dfe3b8e6 pullPolicy: Always env: diff --git a/charts/games/minecraft-java/ci/j11j9-values.yaml b/charts/stable/minecraft-java/ci/j11j9-values.yaml similarity index 100% rename from charts/games/minecraft-java/ci/j11j9-values.yaml rename to charts/stable/minecraft-java/ci/j11j9-values.yaml diff --git a/charts/games/minecraft-java/ci/j8-values.yaml b/charts/stable/minecraft-java/ci/j8-values.yaml similarity index 56% rename from charts/games/minecraft-java/ci/j8-values.yaml rename to charts/stable/minecraft-java/ci/j8-values.yaml index 18ca3468421..3b7b33229ec 100644 --- a/charts/games/minecraft-java/ci/j8-values.yaml +++ b/charts/stable/minecraft-java/ci/j8-values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/minecraft-java8-openj9 - tag: latest@sha256:3107f66549000c7d6e41391c803f88ff9beb5b6c0a4c8e2ef0f5d1d810dbbf83 + tag: latest@sha256:1b0c3a03b6633bd1743d15949534144b3267e2b218b7b11082183424951291b6 pullPolicy: Always env: diff --git a/charts/games/minecraft-java/ci/j8j9-values.yaml b/charts/stable/minecraft-java/ci/j8j9-values.yaml similarity index 100% rename from charts/games/minecraft-java/ci/j8j9-values.yaml rename to charts/stable/minecraft-java/ci/j8j9-values.yaml diff --git a/charts/games/minecraft-java/helm-values.md b/charts/stable/minecraft-java/helm-values.md similarity index 100% rename from charts/games/minecraft-java/helm-values.md rename to charts/stable/minecraft-java/helm-values.md diff --git a/charts/games/minecraft-java/questions.yaml b/charts/stable/minecraft-java/questions.yaml similarity index 99% rename from charts/games/minecraft-java/questions.yaml rename to charts/stable/minecraft-java/questions.yaml index 026e371a618..afe5b5fa483 100644 --- a/charts/games/minecraft-java/questions.yaml +++ b/charts/stable/minecraft-java/questions.yaml @@ -92,7 +92,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: @@ -238,9 +238,9 @@ questions: - variable: PAPERBUILD label: "Paper Build Number" schema: - type: int + type: string required: false - default: 0 + default: "" show_if: [[TYPE, "=", "PAPER"]] - variable: PAPER_DOWNLOAD_URL label: "Paper Download URL" @@ -280,16 +280,16 @@ questions: - variable: MOHIST_BUILD label: "Mohist Build" schema: - type: int + type: string required: false - default: 0 + default: "" show_if: [[TYPE, "=", "MOHIST"]] - variable: CANYON_BUILD label: "Canyon Build" schema: - type: int + type: string required: false - default: 0 + default: "" show_if: [[TYPE, "=", "CANYON"]] - variable: SPONGEBRANCH label: "Sponge Branch" diff --git a/charts/games/minecraft-java/security.md b/charts/stable/minecraft-java/security.md similarity index 100% rename from charts/games/minecraft-java/security.md rename to charts/stable/minecraft-java/security.md diff --git a/charts/stable/minecraft-java/templates/common.yaml b/charts/stable/minecraft-java/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/minecraft-java/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/minecraft-java/values.yaml b/charts/stable/minecraft-java/values.yaml similarity index 85% rename from charts/games/minecraft-java/values.yaml rename to charts/stable/minecraft-java/values.yaml index ddc442da66d..d5a88a82002 100644 --- a/charts/games/minecraft-java/values.yaml +++ b/charts/stable/minecraft-java/values.yaml @@ -4,7 +4,7 @@ image: pullPolicy: Always j11Image: repository: tccr.io/truecharts/minecraft-java11 - tag: latest@sha256:8b2b808e8fb015b9285ca09093ba73b2684db66ce187e5bf9fc70188bb35e109 + tag: latest@sha256:d814d5f4c6799132438177d39bad19093ac0b164f951a86955a64697dfe3b8e6 pullPolicy: Always j11j9Image: repository: tccr.io/truecharts/minecraft-java11-openj9 @@ -12,11 +12,11 @@ j11j9Image: pullPolicy: Always j8Image: repository: tccr.io/truecharts/minecraft-java8-openj9 - tag: latest@sha256:3107f66549000c7d6e41391c803f88ff9beb5b6c0a4c8e2ef0f5d1d810dbbf83 + tag: latest@sha256:1b0c3a03b6633bd1743d15949534144b3267e2b218b7b11082183424951291b6 pullPolicy: Always j8j9Image: repository: tccr.io/truecharts/minecraft-java8-openj9 - tag: latest@sha256:3107f66549000c7d6e41391c803f88ff9beb5b6c0a4c8e2ef0f5d1d810dbbf83 + tag: latest@sha256:1b0c3a03b6633bd1743d15949534144b3267e2b218b7b11082183424951291b6 pullPolicy: Always portal: @@ -30,7 +30,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: RCON_PASSWORD: "secretrconpass" env: diff --git a/charts/games/minetest/CHANGELOG.md b/charts/stable/minetest/CHANGELOG.md similarity index 100% rename from charts/games/minetest/CHANGELOG.md rename to charts/stable/minetest/CHANGELOG.md diff --git a/charts/games/impostor-server/CONFIG.md b/charts/stable/minetest/CONFIG.md similarity index 100% rename from charts/games/impostor-server/CONFIG.md rename to charts/stable/minetest/CONFIG.md diff --git a/charts/games/minetest/Chart.yaml b/charts/stable/minetest/Chart.yaml similarity index 95% rename from charts/games/minetest/Chart.yaml rename to charts/stable/minetest/Chart.yaml index ea1dc948662..ddce4b48855 100644 --- a/charts/games/minetest/Chart.yaml +++ b/charts/stable/minetest/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: minetest -version: 0.0.49 +version: 1.0.0 appVersion: "5.5.1" description: Minetest (server) is a near-infinite-world block sandbox game and a game engine. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/games/minetest/README.md b/charts/stable/minetest/README.md similarity index 100% rename from charts/games/minetest/README.md rename to charts/stable/minetest/README.md diff --git a/charts/stable/minetest/SCALE/migrations/migrate b/charts/stable/minetest/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/minetest/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/games/minetest/helm-values.md b/charts/stable/minetest/helm-values.md similarity index 100% rename from charts/games/minetest/helm-values.md rename to charts/stable/minetest/helm-values.md diff --git a/charts/games/minetest/questions.yaml b/charts/stable/minetest/questions.yaml similarity index 100% rename from charts/games/minetest/questions.yaml rename to charts/stable/minetest/questions.yaml diff --git a/charts/games/minetest/security.md b/charts/stable/minetest/security.md similarity index 100% rename from charts/games/minetest/security.md rename to charts/stable/minetest/security.md diff --git a/charts/stable/minetest/templates/common.yaml b/charts/stable/minetest/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/minetest/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/minetest/values.yaml b/charts/stable/minetest/values.yaml similarity index 100% rename from charts/games/minetest/values.yaml rename to charts/stable/minetest/values.yaml diff --git a/charts/stable/miniflux/Chart.yaml b/charts/stable/miniflux/Chart.yaml index 3c02b00bb48..f28a1a68e36 100644 --- a/charts/stable/miniflux/Chart.yaml +++ b/charts/stable/miniflux/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.0.37" description: Miniflux is a minimalist and opinionated feed reader. name: miniflux -version: 5.0.24 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - miniflux @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/miniflux/SCALE/migrations/migrate b/charts/stable/miniflux/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/miniflux/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/miniflux/questions.yaml b/charts/stable/miniflux/questions.yaml index 112e52abe5f..170b940e6ad 100644 --- a/charts/stable/miniflux/questions.yaml +++ b/charts/stable/miniflux/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/miniflux/templates/common.yaml b/charts/stable/miniflux/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/miniflux/templates/common.yaml +++ b/charts/stable/miniflux/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/miniflux/values.yaml b/charts/stable/miniflux/values.yaml index 686a875dfc7..dbb8200fe57 100644 --- a/charts/stable/miniflux/values.yaml +++ b/charts/stable/miniflux/values.yaml @@ -5,7 +5,7 @@ image: # -- environment variables. See [miniflux docs](https://miniflux.app/docs/configuration.html) for more details. # @default -- See below -secret: +secretEnv: # -- Admin user login, it's used only if `CREATE_ADMIN` is enabled. ADMIN_USERNAME: "admin" # -- Admin user password, it's used only if `CREATE_ADMIN` is enabled. @@ -16,8 +16,6 @@ env: RUN_MIGRATIONS: 1 # -- Set to `1` to create an admin user from environment variables. CREATE_ADMIN: 1 - -envValueFrom: # -- Postgresql connection parameters. See [lib/pq](https://pkg.go.dev/github.com/lib/pq#hdr-Connection_String_Parameters) for more details. DATABASE_URL: secretKeyRef: diff --git a/charts/stable/minio-console/Chart.yaml b/charts/stable/minio-console/Chart.yaml index 108209ac259..478e1fd281d 100644 --- a/charts/stable/minio-console/Chart.yaml +++ b/charts/stable/minio-console/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.18.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A management console for minio server and operator home: https://github.com/truecharts/apps/tree/master/charts/stable/minio-console icon: https://truecharts.org/_static/img/appicons/minio-console.png @@ -19,7 +19,7 @@ maintainers: name: minio-console sources: - https://github.com/minio/console -version: 2.0.32 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/minio-console/SCALE/migrations/migrate b/charts/stable/minio-console/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/minio-console/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/minio-console/questions.yaml b/charts/stable/minio-console/questions.yaml index 31509a8a409..e381fe2bee3 100644 --- a/charts/stable/minio-console/questions.yaml +++ b/charts/stable/minio-console/questions.yaml @@ -75,7 +75,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/minio-console/templates/common.yaml b/charts/stable/minio-console/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/minio-console/templates/common.yaml +++ b/charts/stable/minio-console/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/minio-console/values.yaml b/charts/stable/minio-console/values.yaml index 54f4d5db0db..448e431b910 100644 --- a/charts/stable/minio-console/values.yaml +++ b/charts/stable/minio-console/values.yaml @@ -2,14 +2,14 @@ image: # -- image repository repository: tccr.io/truecharts/minio-console # -- image tag - tag: v0.18.0@sha256:e561e84d6209dcd32d31131f5b0a501b8f4b164e05a21b532de01362db47ac9f + tag: v0.18.1@sha256:b3f107196a93f0a231081bf041d2d51e1f86c7fadf017152a3dc699c5de2177c # -- image pull policy pullPolicy: IfNotPresent # -- Override the args for the default container. args: ["server"] -secret: +secretEnv: # -- Required: Passphrase to derive keys (generate own) # Example: D6vpras1xpUgrcFpOIGA4crHvzUDQb48 CONSOLE_PBKDF_PASSPHRASE: "changeme" diff --git a/charts/stable/minio/Chart.yaml b/charts/stable/minio/Chart.yaml index a842c749c6a..fdf0424aa89 100644 --- a/charts/stable/minio/Chart.yaml +++ b/charts/stable/minio/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Minio is a self-hosted S3 storage server home: https://github.com/truecharts/apps/tree/master/charts/stable/minio icon: https://truecharts.org/_static/img/appicons/minio.png @@ -19,7 +19,7 @@ maintainers: name: minio sources: - https://github.com/minio/minio -version: 2.0.32 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/minio/SCALE/migrations/migrate b/charts/stable/minio/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/minio/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/minio/questions.yaml b/charts/stable/minio/questions.yaml index 5e7714e2e22..ddca9f755e3 100644 --- a/charts/stable/minio/questions.yaml +++ b/charts/stable/minio/questions.yaml @@ -75,7 +75,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/minio/templates/common.yaml b/charts/stable/minio/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/minio/templates/common.yaml +++ b/charts/stable/minio/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/minio/values.yaml b/charts/stable/minio/values.yaml index ddee55fbe6b..1f782c1320a 100644 --- a/charts/stable/minio/values.yaml +++ b/charts/stable/minio/values.yaml @@ -5,7 +5,7 @@ image: args: ["server", "/data", "--address", ":10106", "--console-address", ":10107"] -secret: +secretEnv: MINIO_ROOT_PASSWORD: "changeme" env: diff --git a/charts/stable/minisatip/Chart.yaml b/charts/stable/minisatip/Chart.yaml index 0717554693e..bde8c8ea063 100644 --- a/charts/stable/minisatip/Chart.yaml +++ b/charts/stable/minisatip/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: minisatip -version: 1.0.20 +version: 2.0.0 appVersion: "2021.12.01" description: Minisatip is a multi-threaded satip server version 1.2 that runs under Linux. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 maintainers: - email: info@truecharts.org name: TrueCharts diff --git a/charts/stable/minisatip/SCALE/migrations/migrate b/charts/stable/minisatip/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/minisatip/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/minisatip/templates/common.yaml b/charts/stable/minisatip/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/minisatip/templates/common.yaml +++ b/charts/stable/minisatip/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mkvtoolnix/Chart.yaml b/charts/stable/mkvtoolnix/Chart.yaml index 2f8e665cb9f..3c4bc40b6ff 100644 --- a/charts/stable/mkvtoolnix/Chart.yaml +++ b/charts/stable/mkvtoolnix/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.63.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: MKVToolNix is a set of tools to create, alter and inspect Matroska files. home: https://github.com/truecharts/apps/tree/master/charts/stable/mkvtoolnix @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/jlesage/mkvtoolnix - https://mkvtoolnix.download/ type: application -version: 1.0.7 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/mkvtoolnix/SCALE/migrations/migrate b/charts/stable/mkvtoolnix/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mkvtoolnix/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mkvtoolnix/questions.yaml b/charts/stable/mkvtoolnix/questions.yaml index 4ee6f7dee7f..0db0d95880c 100644 --- a/charts/stable/mkvtoolnix/questions.yaml +++ b/charts/stable/mkvtoolnix/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/mkvtoolnix/templates/common.yaml b/charts/stable/mkvtoolnix/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/mkvtoolnix/templates/common.yaml +++ b/charts/stable/mkvtoolnix/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mkvtoolnix/values.yaml b/charts/stable/mkvtoolnix/values.yaml index 31fa48a1fce..38037d093b6 100644 --- a/charts/stable/mkvtoolnix/values.yaml +++ b/charts/stable/mkvtoolnix/values.yaml @@ -27,9 +27,9 @@ service: envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-mkvtoolnix' + name: '{{ include "tc.common.names.fullname" . }}-mkvtoolnix' -secret: +secretEnv: VNC_PASSWORD: "" mkvtoolnix: diff --git a/charts/stable/ml-workspace/Chart.yaml b/charts/stable/ml-workspace/Chart.yaml index 96512b22553..61514c85945 100644 --- a/charts/stable/ml-workspace/Chart.yaml +++ b/charts/stable/ml-workspace/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.13.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: All-in-one web-based development environment for machine learning home: https://github.com/truecharts/apps/tree/master/charts/stable/ml-workspace icon: https://truecharts.org/_static/img/appicons/ml-workspace.png @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/mltooling/ml-workspace-gpu - https://hub.docker.com/r/mltooling/ml-workspace-light - https://hub.docker.com/r/mltooling/ml-workspace-minimal -version: 1.1.13 +version: 2.0.0 annotations: truecharts.org/catagories: | - utility diff --git a/charts/stable/ml-workspace/SCALE/migrations/migrate b/charts/stable/ml-workspace/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ml-workspace/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ml-workspace/questions.yaml b/charts/stable/ml-workspace/questions.yaml index 9bc897fcd76..6fe4e10b86b 100644 --- a/charts/stable/ml-workspace/questions.yaml +++ b/charts/stable/ml-workspace/questions.yaml @@ -93,7 +93,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/ml-workspace/templates/common.yaml b/charts/stable/ml-workspace/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ml-workspace/templates/common.yaml +++ b/charts/stable/ml-workspace/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ml-workspace/values.yaml b/charts/stable/ml-workspace/values.yaml index f13de4571ee..d2f38eec44e 100644 --- a/charts/stable/ml-workspace/values.yaml +++ b/charts/stable/ml-workspace/values.yaml @@ -38,7 +38,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: WORKSPACE_AUTH_USER: "admin" WORKSPACE_AUTH_PASSWORD: "password" # true, false, or a token diff --git a/charts/stable/monica/Chart.yaml b/charts/stable/monica/Chart.yaml index 509d58c1ea7..ffb0fb1152c 100644 --- a/charts/stable/monica/Chart.yaml +++ b/charts/stable/monica/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.7.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -22,7 +22,7 @@ name: monica sources: - https://github.com/monicahq/monica - https://hub.docker.com/_/monica -version: 1.0.34 +version: 2.0.0 annotations: truecharts.org/catagories: | - crm diff --git a/charts/stable/monica/SCALE/migrations/migrate b/charts/stable/monica/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/monica/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/monica/templates/_appkey.tpl b/charts/stable/monica/templates/_appkey.tpl index d504d2edc9c..337c6a503cf 100644 --- a/charts/stable/monica/templates/_appkey.tpl +++ b/charts/stable/monica/templates/_appkey.tpl @@ -9,7 +9,7 @@ type: Opaque metadata: name: appkey labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} {{- $keyprevious := lookup "v1" "Secret" .Release.Namespace "appkey" }} {{- $appkey := "" }} data: diff --git a/charts/stable/monica/templates/common.yaml b/charts/stable/monica/templates/common.yaml index 166b81aa266..181c028a3c6 100644 --- a/charts/stable/monica/templates/common.yaml +++ b/charts/stable/monica/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render appkey for monica */}} {{- include "monica.appkey" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/monica/values.yaml b/charts/stable/monica/values.yaml index 6942c442dac..8681086dabb 100644 --- a/charts/stable/monica/values.yaml +++ b/charts/stable/monica/values.yaml @@ -20,6 +20,18 @@ env: APP_URL: https://crm.k8s-at-home.com DB_DATABASE: monica DB_USERNAME: monica + DB_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + DB_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-password + APP_KEY: + secretKeyRef: + name: appkey + key: appkey # -- Configures service settings for the chart. # @default -- See values.yaml @@ -37,20 +49,6 @@ persistence: enabled: true mountPath: "/var/www/html/storage" -envValueFrom: - DB_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - DB_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password - APP_KEY: - secretKeyRef: - name: appkey - key: appkey - mariadb: enabled: true mariadbUsername: monica diff --git a/charts/stable/mosdns/Chart.yaml b/charts/stable/mosdns/Chart.yaml index c642caa606d..c0e3fa2607c 100644 --- a/charts/stable/mosdns/Chart.yaml +++ b/charts/stable/mosdns/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: mosdns -version: 1.0.16 +version: 2.0.0 appVersion: "3.9.0" description: A location-based pluggable DNS forwarder/splitter. type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/mosdns/SCALE/migrations/migrate b/charts/stable/mosdns/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mosdns/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mosdns/templates/common.yaml b/charts/stable/mosdns/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/mosdns/templates/common.yaml +++ b/charts/stable/mosdns/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mosquitto/Chart.yaml b/charts/stable/mosquitto/Chart.yaml index db43402c795..57e4c462286 100644 --- a/charts/stable/mosquitto/Chart.yaml +++ b/charts/stable/mosquitto/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.0.14" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Eclipse Mosquitto - An open source MQTT broker home: https://github.com/truecharts/apps/tree/master/charts/stable/mosquitto @@ -21,7 +21,7 @@ name: mosquitto sources: - https://github.com/eclipse/mosquitto type: application -version: 5.0.27 +version: 6.0.0 annotations: truecharts.org/catagories: | - homeautomation diff --git a/charts/stable/mosquitto/SCALE/migrations/migrate b/charts/stable/mosquitto/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mosquitto/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mosquitto/templates/common.yaml b/charts/stable/mosquitto/templates/common.yaml index 170372870d4..b9e7208f382 100644 --- a/charts/stable/mosquitto/templates/common.yaml +++ b/charts/stable/mosquitto/templates/common.yaml @@ -1,17 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} - -{{/* Append the configMap volume to the volumes */}} -{{- define "mosquitto.configVolume" -}} -enabled: "true" -mountPath: "/mosquitto/config/mosquitto.conf" -subPath: "mosquitto.conf" -type: "custom" -volumeSpec: - configMap: - name: {{ template "common.names.fullname" . }}-config -{{- end -}} -{{- $_ := set .Values.persistence "mosquitto-config" (include "mosquitto.configVolume" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/mosquitto/templates/configmap.yaml b/charts/stable/mosquitto/templates/configmap.yaml deleted file mode 100644 index 489d68b0ea5..00000000000 --- a/charts/stable/mosquitto/templates/configmap.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - mosquitto.conf: | - listener {{ .Values.service.main.ports.main.port }} - {{- if .Values.auth.enabled }} - allow_anonymous false - {{- else }} - allow_anonymous true - {{- end }} - {{- if .Values.persistence.data.enabled }} - persistence true - persistence_location {{ .Values.persistence.data.mountPath }} - autosave_interval 1800 - {{- end }} - {{- if .Values.persistence.configinc.enabled }} - include_dir {{ .Values.persistence.configinc.mountPath }} - {{- end }} diff --git a/charts/stable/mosquitto/values.yaml b/charts/stable/mosquitto/values.yaml index c2ab08c1979..c55114360a8 100644 --- a/charts/stable/mosquitto/values.yaml +++ b/charts/stable/mosquitto/values.yaml @@ -14,6 +14,26 @@ auth: # -- By enabling this, `allow_anonymous` gets set to `false` in the mosquitto config. enabled: false +configmap: + config: + enabled: true + data: + mosquitto.conf: | + listener {{ .Values.service.main.ports.main.port }} + {{- if .Values.auth.enabled }} + allow_anonymous false + {{- else }} + allow_anonymous true + {{- end }} + {{- if .Values.persistence.data.enabled }} + persistence true + persistence_location {{ .Values.persistence.data.mountPath }} + autosave_interval 1800 + {{- end }} + {{- if .Values.persistence.configinc.enabled }} + include_dir {{ .Values.persistence.configinc.mountPath }} + {{- end }} + persistence: data: enabled: true @@ -21,3 +41,11 @@ persistence: configinc: enabled: true mountPath: "/mosquitto/configinc" + mosquitto-config: + enabled: "true" + mountPath: "/mosquitto/config/mosquitto.conf" + subPath: "mosquitto.conf" + type: "custom" + volumeSpec: + configMap: + name: '{{ template "tc.common.names.fullname" . }}-config' diff --git a/charts/stable/mstream/Chart.yaml b/charts/stable/mstream/Chart.yaml index 6c0387fb571..b9098b54c7e 100644 --- a/charts/stable/mstream/Chart.yaml +++ b/charts/stable/mstream/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.2.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A personal music streaming server home: https://github.com/truecharts/apps/tree/master/charts/stable/mstream icon: https://truecharts.org/_static/img/appicons/mstream.png @@ -21,7 +21,7 @@ sources: - https://github.com/linuxserver/docker-mstream - https://mstream.io/ type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/mstream/SCALE/migrations/migrate b/charts/stable/mstream/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mstream/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mstream/templates/common.yaml b/charts/stable/mstream/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/mstream/templates/common.yaml +++ b/charts/stable/mstream/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/muximux/Chart.yaml b/charts/stable/muximux/Chart.yaml index 2f7d081ee0c..695cc7502d1 100644 --- a/charts/stable/muximux/Chart.yaml +++ b/charts/stable/muximux/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "057352e8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A lightweight portal to view & manage your HTPC apps without having to run anything more than a PHP enabled webserver home: https://github.com/truecharts/apps/tree/master/charts/stable/muximux @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-muximux - https://github.com/mescon/Muximux type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/muximux/SCALE/migrations/migrate b/charts/stable/muximux/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/muximux/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/muximux/templates/common.yaml b/charts/stable/muximux/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/muximux/templates/common.yaml +++ b/charts/stable/muximux/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mylar/Chart.yaml b/charts/stable/mylar/Chart.yaml index d6ec7525059..ffb983d695d 100644 --- a/charts/stable/mylar/Chart.yaml +++ b/charts/stable/mylar/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.6.8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Mylar is a automated Comic Book downloader home: https://github.com/truecharts/apps/tree/master/charts/stable/mylar icon: https://truecharts.org/_static/img/appicons/mylar.png @@ -19,7 +19,7 @@ sources: - https://github.com/mylar3/mylar3 - https://github.com/linuxserver/docker-mylar3 - https://github.com/truecharts/apps/tree/master/charts/mylar -version: 5.0.25 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/mylar/SCALE/migrations/migrate b/charts/stable/mylar/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mylar/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mylar/templates/common.yaml b/charts/stable/mylar/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/mylar/templates/common.yaml +++ b/charts/stable/mylar/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/mysql-workbench/Chart.yaml b/charts/stable/mysql-workbench/Chart.yaml index 1c8cb6b0ab7..e1163f61634 100644 --- a/charts/stable/mysql-workbench/Chart.yaml +++ b/charts/stable/mysql-workbench/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: mysql-workbench -version: 1.0.22 +version: 2.0.0 appVersion: "8.0.29" description: MySQL Workbench is a unified visual tool for database architects, developers and DBAs. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/mysql-workbench/SCALE/migrations/migrate b/charts/stable/mysql-workbench/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/mysql-workbench/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/mysql-workbench/templates/common.yaml b/charts/stable/mysql-workbench/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/mysql-workbench/templates/common.yaml +++ b/charts/stable/mysql-workbench/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/n8n/Chart.yaml b/charts/stable/n8n/Chart.yaml index a3f98dfa55d..9b9806f2cb4 100644 --- a/charts/stable/n8n/Chart.yaml +++ b/charts/stable/n8n/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.179.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -28,7 +28,7 @@ sources: - https://docs.n8n.io/ - https://github.com/n8n-io/n8n - https://hub.docker.com/r/n8nio/n8n -version: 2.0.37 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/n8n/SCALE/migrations/migrate b/charts/stable/n8n/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/n8n/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/n8n/templates/common.yaml b/charts/stable/n8n/templates/common.yaml index 991ed17320e..3dd8f0e5f7b 100644 --- a/charts/stable/n8n/templates/common.yaml +++ b/charts/stable/n8n/templates/common.yaml @@ -1,9 +1,9 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for n8n */}} {{- include "n8n.configmap" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/n8n/values.yaml b/charts/stable/n8n/values.yaml index afd417dc34e..e55e410ae86 100644 --- a/charts/stable/n8n/values.yaml +++ b/charts/stable/n8n/values.yaml @@ -19,6 +19,22 @@ env: DB_POSTGRESDB_PORT: 5432 QUEUE_BULL_REDIS_PORT: 6379 N8N_USER_FOLDER: "/data" + DB_POSTGRESDB_HOST: + secretKeyRef: + name: dbcreds + key: plainhost + DB_POSTGRESDB_PASSWORD: + secretKeyRef: + name: dbcreds + key: postgresql-password + QUEUE_BULL_REDIS_HOST: + secretKeyRef: + name: rediscreds + key: plainhost + QUEUE_BULL_REDIS_PASSWORD: + secretKeyRef: + name: rediscreds + key: redis-password probes: liveness: @@ -90,24 +106,6 @@ envFrom: - configMapRef: name: n8n-config -envValueFrom: - DB_POSTGRESDB_HOST: - secretKeyRef: - name: dbcreds - key: plainhost - DB_POSTGRESDB_PASSWORD: - secretKeyRef: - name: dbcreds - key: postgresql-password - QUEUE_BULL_REDIS_HOST: - secretKeyRef: - name: rediscreds - key: plainhost - QUEUE_BULL_REDIS_PASSWORD: - secretKeyRef: - name: rediscreds - key: redis-password - service: main: ports: diff --git a/charts/stable/nano-wallet/Chart.yaml b/charts/stable/nano-wallet/Chart.yaml index f65615608c0..402b972e1a7 100644 --- a/charts/stable/nano-wallet/Chart.yaml +++ b/charts/stable/nano-wallet/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: nano-wallet -version: 1.0.19 +version: 2.0.0 appVersion: "2021.12.16" description: Nano-wallet is a digital payment protocol designed to be accessible and lightweight. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/nano-wallet/SCALE/migrations/migrate b/charts/stable/nano-wallet/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nano-wallet/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nano-wallet/templates/common.yaml b/charts/stable/nano-wallet/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/nano-wallet/templates/common.yaml +++ b/charts/stable/nano-wallet/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/navidrome/Chart.yaml b/charts/stable/navidrome/Chart.yaml index 7185494f543..f1628d03539 100644 --- a/charts/stable/navidrome/Chart.yaml +++ b/charts/stable/navidrome/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.47.5" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Navidrome is an open source web-based music collection server and streamer home: https://github.com/truecharts/apps/tree/master/charts/stable/navidrome @@ -22,7 +22,7 @@ sources: - https://github.com/deluan/navidrome - https://hub.docker.com/r/deluan/navidrome type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/navidrome/SCALE/migrations/migrate b/charts/stable/navidrome/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/navidrome/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/navidrome/templates/common.yaml b/charts/stable/navidrome/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/navidrome/templates/common.yaml +++ b/charts/stable/navidrome/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/netdata/Chart.yaml b/charts/stable/netdata/Chart.yaml index 3ecc9fbb806..c88e25c987f 100644 --- a/charts/stable/netdata/Chart.yaml +++ b/charts/stable/netdata/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.34.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Netdata is high-fidelity infrastructure monitoring and troubleshooting. home: https://github.com/truecharts/apps/tree/master/charts/incubator/netdata icon: https://truecharts.org/_static/img/appicons/netdata.png @@ -18,7 +18,7 @@ maintainers: name: netdata sources: - https://github.com/netdata -version: 1.0.1 +version: 2.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/netdata/SCALE/migrations/migrate b/charts/stable/netdata/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/netdata/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/netdata/questions.yaml b/charts/stable/netdata/questions.yaml index 66411580b5e..259a3d5819d 100644 --- a/charts/stable/netdata/questions.yaml +++ b/charts/stable/netdata/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/netdata/templates/common.yaml b/charts/stable/netdata/templates/common.yaml index 88ed46b597d..eacdafa9525 100644 --- a/charts/stable/netdata/templates/common.yaml +++ b/charts/stable/netdata/templates/common.yaml @@ -1,20 +1,4 @@ -{{- include "common.setup" . }} - -{{/* Append the hardcoded settings */}} -{{- define "netdata.harcodedValues" -}} -persistence: - netdata-configs: - enabled: "true" - mountPath: "/etc/netdata/truecharts-defaults/.netdata.conf" - subPath: "netdata-conf" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-configs" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "netdata.harcodedValues" . | fromYaml) -}} - -{{- include "netdata.configmap" . }} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/netdata/templates/configmap.yaml b/charts/stable/netdata/templates/configmap.yaml deleted file mode 100644 index 82244be10e5..00000000000 --- a/charts/stable/netdata/templates/configmap.yaml +++ /dev/null @@ -1,16 +0,0 @@ -{{- define "netdata.configmap" -}} - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-configs - labels: - {{- include "common.labels" . | nindent 4 }} -data: - netdata-conf: |- - [global] - memory mode = dbengine - dbengine multihost disk space = 4096 - page cache size = 64 -{{- end -}} diff --git a/charts/stable/netdata/values.yaml b/charts/stable/netdata/values.yaml index dc5bc45ff32..630eec65847 100644 --- a/charts/stable/netdata/values.yaml +++ b/charts/stable/netdata/values.yaml @@ -15,32 +15,45 @@ podSecurityContext: runAsGroup: 0 fsGroup: 201 +# -- The service account the pods will use to interact with the Kubernetes API serviceAccount: - create: true + main: + create: true + +configmap: + configs: + enabled: true + data: + netdata-conf: |- + [global] + memory mode = dbengine + dbengine multihost disk space = 4096 + page cache size = 64 rbac: - enabled: true - rules: - - apiGroups: - - "" - resources: - - "pods" - - "nodes" - - "nodes/metrics" - # - "services" # used by agent service discovery - # - "configmaps" # used by agent service discovery - # - "secrets" # used by agent service discovery - verbs: - - "get" - - "list" - - "watch" - - apiGroups: [""] - resources: - - "namespaces" - verbs: - - "get" + main: + enabled: true + rules: + - apiGroups: + - "" + resources: + - "pods" + - "nodes" + - "nodes/metrics" + # - "services" # used by agent service discovery + # - "configmaps" # used by agent service discovery + # - "secrets" # used by agent service discovery + verbs: + - "get" + - "list" + - "watch" + - apiGroups: [""] + resources: + - "namespaces" + verbs: + - "get" -envValueFrom: +env: MY_NODE_NAME: fieldRef: fieldPath: spec.nodeName @@ -51,7 +64,7 @@ envValueFrom: fieldRef: fieldPath: metadata.name -secret: +secretEnv: NETDATA_CLAIM_URL: "" NETDATA_CLAIM_TOKEN: "" NETDATA_CLAIM_ROOMS: "" @@ -117,6 +130,14 @@ persistence: hostPath: "/etc/os-release" mountPath: "/host/etc/os-release" readOnly: true + netdata-configs: + enabled: "true" + mountPath: "/etc/netdata/truecharts-defaults/.netdata.conf" + subPath: "netdata-conf" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-configs" (include "tc.common.names.fullname" .) }}' initContainers: create-config: diff --git a/charts/stable/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml index cf734b38eba..97d6ec2fb06 100644 --- a/charts/stable/nextcloud/Chart.yaml +++ b/charts/stable/nextcloud/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "24.0.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -33,7 +33,7 @@ sources: - https://github.com/nextcloud/docker - https://github.com/nextcloud/helm type: application -version: 12.0.32 +version: 13.0.0 annotations: truecharts.org/catagories: | - cloud diff --git a/charts/stable/nextcloud/SCALE/migrations/migrate b/charts/stable/nextcloud/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nextcloud/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nextcloud/questions.yaml b/charts/stable/nextcloud/questions.yaml index 8e79c1190bf..fc12221f6a3 100644 --- a/charts/stable/nextcloud/questions.yaml +++ b/charts/stable/nextcloud/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/nextcloud/templates/_cronjob.tpl b/charts/stable/nextcloud/templates/_cronjob.tpl index 96a0b6145c6..6ebfbe7d70c 100644 --- a/charts/stable/nextcloud/templates/_cronjob.tpl +++ b/charts/stable/nextcloud/templates/_cronjob.tpl @@ -1,6 +1,6 @@ {{/* Define the cronjob */}} {{- define "nextcloud.cronjob" -}} -{{- $jobName := include "common.names.fullname" . }} +{{- $jobName := include "tc.common.names.fullname" . }} --- apiVersion: batch/v1beta1 @@ -8,7 +8,7 @@ kind: CronJob metadata: name: {{ printf "%s-cronjob" $jobName }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} spec: schedule: "{{ .Values.cronjob.schedule }}" concurrencyPolicy: Forbid @@ -25,7 +25,7 @@ spec: metadata: spec: restartPolicy: Never - {{- with (include "common.controller.volumes" . | trim) }} + {{- with (include "tc.common.controller.volumes" . | trim) }} volumes: {{- nindent 12 . }} {{- end }} @@ -38,7 +38,7 @@ spec: - "-f" - "/var/www/html/cron.php" # Will mount configuration files as www-data (id: 33) by default for nextcloud - {{- with (include "common.controller.volumeMounts" . | trim) }} + {{- with (include "tc.common.controller.volumeMounts" . | trim) }} volumeMounts: {{ nindent 16 . }} {{- end }} diff --git a/charts/stable/nextcloud/templates/common.yaml b/charts/stable/nextcloud/templates/common.yaml index 801767a012a..ae63960a6f1 100644 --- a/charts/stable/nextcloud/templates/common.yaml +++ b/charts/stable/nextcloud/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for nextcloud */}} {{- include "nextcloud.configmap" . }} @@ -11,4 +11,4 @@ {{- include "nextcloud.cronjob" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml index d3fa3dc9cda..23c041364bf 100644 --- a/charts/stable/nextcloud/values.yaml +++ b/charts/stable/nextcloud/values.yaml @@ -25,7 +25,7 @@ service: enabled: true port: 7867 targetPort: 7867 -secret: +secretEnv: NEXTCLOUD_ADMIN_USER: "admin" NEXTCLOUD_ADMIN_PASSWORD: "adminpass" @@ -33,12 +33,6 @@ env: TRUSTED_PROXIES: "172.16.0.0/16" POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" - -envFrom: - - configMapRef: - name: nextcloudconfig - -envValueFrom: POSTGRES_PASSWORD: secretKeyRef: name: dbcreds @@ -56,6 +50,10 @@ envValueFrom: name: rediscreds key: redis-password +envFrom: + - configMapRef: + name: nextcloudconfig + persistence: data: enabled: true diff --git a/charts/stable/nextpvr/Chart.yaml b/charts/stable/nextpvr/Chart.yaml index af1228431ab..58b8765b12a 100644 --- a/charts/stable/nextpvr/Chart.yaml +++ b/charts/stable/nextpvr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: NextPVR is a personal video recorder application, with the goal making it easy to watch or record live TV. home: https://github.com/truecharts/apps/tree/master/charts/stable/nextpvr icon: https://truecharts.org/_static/img/appicons/nextpvr.png @@ -19,7 +19,7 @@ name: nextpvr sources: - https://hub.docker.com/r/nextpvr/nextpvr_amd64 - https://github.com/sub3/NextPVR/wiki/Install-Docker -version: 1.0.18 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/nextpvr/SCALE/migrations/migrate b/charts/stable/nextpvr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nextpvr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nextpvr/templates/common.yaml b/charts/stable/nextpvr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/nextpvr/templates/common.yaml +++ b/charts/stable/nextpvr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ngircd/Chart.yaml b/charts/stable/ngircd/Chart.yaml index 8553655d286..7b421d82b6b 100644 --- a/charts/stable/ngircd/Chart.yaml +++ b/charts/stable/ngircd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ngircd -version: 1.0.19 +version: 2.0.0 appVersion: "2021.11.21" description: Ngircd is a free, portable and lightweight Internet Relay Chat server for small or private networks. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/ngircd/SCALE/migrations/migrate b/charts/stable/ngircd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ngircd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ngircd/templates/common.yaml b/charts/stable/ngircd/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ngircd/templates/common.yaml +++ b/charts/stable/ngircd/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/nntp2nntp/Chart.yaml b/charts/stable/nntp2nntp/Chart.yaml index e008ab56279..c10d1b79ad7 100644 --- a/charts/stable/nntp2nntp/Chart.yaml +++ b/charts/stable/nntp2nntp/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: nntp2nntp -version: 1.0.20 +version: 2.0.0 appVersion: "0.3.202205" description: Nntp2nntp proxy allow you to use your NNTP Account from multiple systems, each with own user name and password. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/nntp2nntp/SCALE/migrations/migrate b/charts/stable/nntp2nntp/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nntp2nntp/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nntp2nntp/templates/common.yaml b/charts/stable/nntp2nntp/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/nntp2nntp/templates/common.yaml +++ b/charts/stable/nntp2nntp/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/nocodb/Chart.yaml b/charts/stable/nocodb/Chart.yaml index b7823e3b52a..210f3c1c95a 100644 --- a/charts/stable/nocodb/Chart.yaml +++ b/charts/stable/nocodb/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.91.7" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ name: nocodb sources: - https://hub.docker.com/r/nocodb/nocodb - https://github.com/nocodb/nocodb -version: 1.0.16 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/nocodb/SCALE/migrations/migrate b/charts/stable/nocodb/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nocodb/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nocodb/questions.yaml b/charts/stable/nocodb/questions.yaml index e56c2130f15..8ceba32bc45 100644 --- a/charts/stable/nocodb/questions.yaml +++ b/charts/stable/nocodb/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/nocodb/templates/common.yaml b/charts/stable/nocodb/templates/common.yaml index fbaa7698de4..0d02f605455 100644 --- a/charts/stable/nocodb/templates/common.yaml +++ b/charts/stable/nocodb/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for nocodb */}} {{- include "nocodb.configmap" . }} @@ -8,4 +8,4 @@ {{- include "nocodb.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/nocodb/values.yaml b/charts/stable/nocodb/values.yaml index 0b863785cb3..38eadff232b 100644 --- a/charts/stable/nocodb/values.yaml +++ b/charts/stable/nocodb/values.yaml @@ -18,8 +18,6 @@ env: NC_PUBLIC_URL: "http://localhost:10226" NC_DISABLE_TELE: true DISABLE_SPLASH_SCREEN: false - -envValueFrom: NC_REDIS_URL: secretKeyRef: name: rediscreds diff --git a/charts/stable/node-red/Chart.yaml b/charts/stable/node-red/Chart.yaml index c58e21023d4..dae48458e9b 100644 --- a/charts/stable/node-red/Chart.yaml +++ b/charts/stable/node-red/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.2.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Node-RED is low-code programming for event-driven applications home: https://github.com/truecharts/apps/tree/master/charts/stable/node-red @@ -20,7 +20,7 @@ name: node-red sources: - https://github.com/node-red/node-red-docker type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - tools diff --git a/charts/stable/node-red/SCALE/migrations/migrate b/charts/stable/node-red/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/node-red/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/node-red/templates/common.yaml b/charts/stable/node-red/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/node-red/templates/common.yaml +++ b/charts/stable/node-red/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/novnc/Chart.yaml b/charts/stable/novnc/Chart.yaml index edb2b3a3a6f..9ec9a886408 100644 --- a/charts/stable/novnc/Chart.yaml +++ b/charts/stable/novnc/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.2.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: The open source VNC client home: https://github.com/truecharts/apps/tree/master/charts/stable/novnc icon: https://truecharts.org/_static/img/appicons/novnc.png @@ -21,7 +21,7 @@ name: novnc sources: - https://novnc.com/ type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/novnc/SCALE/migrations/migrate b/charts/stable/novnc/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/novnc/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/novnc/templates/common.yaml b/charts/stable/novnc/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/novnc/templates/common.yaml +++ b/charts/stable/novnc/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ntfy/Chart.yaml b/charts/stable/ntfy/Chart.yaml index 94389e533a2..a6a1aedd084 100644 --- a/charts/stable/ntfy/Chart.yaml +++ b/charts/stable/ntfy/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.25.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: ntfy is a simple HTTP-based pub-sub notification service. It allows you to send notifications to your phone or desktop via scripts from any computer. home: https://github.com/truecharts/apps/tree/master/charts/stable/ntfy icon: https://truecharts.org/_static/img/appicons/ntfy.png @@ -17,7 +17,7 @@ maintainers: name: ntfy sources: - https://github.com/binwiederhier/ntfy/ -version: 1.0.13 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/ntfy/SCALE/migrations/migrate b/charts/stable/ntfy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ntfy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ntfy/templates/common.yaml b/charts/stable/ntfy/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ntfy/templates/common.yaml +++ b/charts/stable/ntfy/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ntfy/values.yaml b/charts/stable/ntfy/values.yaml index a42a556116a..87731342be4 100644 --- a/charts/stable/ntfy/values.yaml +++ b/charts/stable/ntfy/values.yaml @@ -17,7 +17,7 @@ env: envFrom: - configMapRef: - name: '{{ include "common.names.fullname" . }}-ntfy' + name: '{{ include "tc.common.names.fullname" . }}-ntfy' service: main: diff --git a/charts/stable/nullserv/Chart.yaml b/charts/stable/nullserv/Chart.yaml index 9c347f62238..dd9e2df4e4e 100644 --- a/charts/stable/nullserv/Chart.yaml +++ b/charts/stable/nullserv/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.3.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A simple null file http and https server home: https://github.com/truecharts/apps/tree/master/charts/stable/nullserv icon: https://truecharts.org/_static/img/appicons/nullserv.png @@ -17,7 +17,7 @@ maintainers: name: nullserv sources: - https://github.com/bmrzycki/nullserv -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/nullserv/SCALE/migrations/migrate b/charts/stable/nullserv/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nullserv/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nullserv/templates/common.yaml b/charts/stable/nullserv/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/nullserv/templates/common.yaml +++ b/charts/stable/nullserv/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/nzbget/Chart.yaml b/charts/stable/nzbget/Chart.yaml index 37d16ac5e1b..602c34c6da1 100644 --- a/charts/stable/nzbget/Chart.yaml +++ b/charts/stable/nzbget/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "21.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: NZBGet is a Usenet downloader client home: https://github.com/truecharts/apps/tree/master/charts/stable/nzbget @@ -20,7 +20,7 @@ name: nzbget sources: - https://nzbget.net/ type: application -version: 10.0.19 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/nzbget/SCALE/migrations/migrate b/charts/stable/nzbget/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nzbget/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nzbget/templates/common.yaml b/charts/stable/nzbget/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/nzbget/templates/common.yaml +++ b/charts/stable/nzbget/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/nzbhydra/Chart.yaml b/charts/stable/nzbhydra/Chart.yaml index 33d1dde3b39..1c4ac004206 100644 --- a/charts/stable/nzbhydra/Chart.yaml +++ b/charts/stable/nzbhydra/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.3.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: true description: Usenet meta search home: https://github.com/truecharts/apps/tree/master/charts/stable/nzbhydra @@ -17,7 +17,7 @@ name: nzbhydra sources: - https://github.com/theotherp/nzbhydra2 type: application -version: 10.0.24 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/nzbhydra/SCALE/migrations/migrate b/charts/stable/nzbhydra/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/nzbhydra/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/nzbhydra/templates/common.yaml b/charts/stable/nzbhydra/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/nzbhydra/templates/common.yaml +++ b/charts/stable/nzbhydra/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/octoprint/Chart.yaml b/charts/stable/octoprint/Chart.yaml index 98a2b2181ae..c296e28d883 100644 --- a/charts/stable/octoprint/Chart.yaml +++ b/charts/stable/octoprint/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.8.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: OctoPrint is the snappy web interface for your 3D printer home: https://github.com/truecharts/apps/tree/master/charts/stable/octoprint icon: https://truecharts.org/_static/img/appicons/octoprint.png @@ -20,7 +20,7 @@ name: octoprint sources: - https://github.com/OctoPrint/OctoPrint - https://hub.docker.com/r/octoprint/octoprint -version: 5.0.22 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/octoprint/SCALE/migrations/migrate b/charts/stable/octoprint/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/octoprint/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/octoprint/templates/common.yaml b/charts/stable/octoprint/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/octoprint/templates/common.yaml +++ b/charts/stable/octoprint/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/odoo/Chart.yaml b/charts/stable/odoo/Chart.yaml index 169306e5662..0d0ddb9f1f5 100644 --- a/charts/stable/odoo/Chart.yaml +++ b/charts/stable/odoo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "15.0" -version: 6.0.36 +version: 7.0.0 kubeVersion: '>=1.16.0-0' name: odoo description: All-in-one business software. Beautiful. Easy-to-use. CRM, Accounting, PM, HR, Procurement, Point of Sale, MRP, Marketing, etc. @@ -21,7 +21,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/odoo/SCALE/migrations/migrate b/charts/stable/odoo/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/odoo/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/odoo/templates/common.yaml b/charts/stable/odoo/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/odoo/templates/common.yaml +++ b/charts/stable/odoo/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/odoo/values.yaml b/charts/stable/odoo/values.yaml index a0d7cc45d69..e294c68da47 100644 --- a/charts/stable/odoo/values.yaml +++ b/charts/stable/odoo/values.yaml @@ -6,8 +6,6 @@ image: env: USER: "{{ .Values.postgresql.postgresqlUsername }}" PORT: 5432 - -envValueFrom: PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/omada-controller/Chart.yaml b/charts/stable/omada-controller/Chart.yaml index 61211d2a52d..2cb6362a776 100644 --- a/charts/stable/omada-controller/Chart.yaml +++ b/charts/stable/omada-controller/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Omada is a SDN tool for TP-Link Omada hardware home: https://github.com/truecharts/apps/tree/master/charts/stable/omada-controller icon: https://truecharts.org/_static/img/appicons/omada-controller.png @@ -18,7 +18,7 @@ name: omada-controller sources: - https://github.com/mbentley/docker-omada-controller - https://github.com/truecharts/apps/tree/master/charts/omada-controller -version: 5.0.35 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/omada-controller/SCALE/migrations/migrate b/charts/stable/omada-controller/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/omada-controller/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/omada-controller/templates/common.yaml b/charts/stable/omada-controller/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/omada-controller/templates/common.yaml +++ b/charts/stable/omada-controller/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ombi/Chart.yaml b/charts/stable/ombi/Chart.yaml index 2c4d29ccd4f..d6236d42fb8 100644 --- a/charts/stable/ombi/Chart.yaml +++ b/charts/stable/ombi/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.15.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Want a Movie or TV Show on Plex or Emby? Use Ombi! home: https://github.com/truecharts/apps/tree/master/charts/stable/ombi @@ -24,7 +24,7 @@ name: ombi sources: - https://github.com/tidusjar/Ombi type: application -version: 10.0.24 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/ombi/SCALE/migrations/migrate b/charts/stable/ombi/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ombi/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ombi/templates/common.yaml b/charts/stable/ombi/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ombi/templates/common.yaml +++ b/charts/stable/ombi/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/onlyoffice-document-server/Chart.yaml b/charts/stable/onlyoffice-document-server/Chart.yaml index bd75a5ddb6f..eef3aad738b 100644 --- a/charts/stable/onlyoffice-document-server/Chart.yaml +++ b/charts/stable/onlyoffice-document-server/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "7.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -30,7 +30,7 @@ sources: - https://github.com/ONLYOFFICE/DocumentServer - https://github.com/ONLYOFFICE/Docker-DocumentServer - https://hub.docker.com/r/onlyoffice/documentserver/ -version: 4.0.23 +version: 5.0.0 annotations: truecharts.org/catagories: | - office diff --git a/charts/stable/onlyoffice-document-server/SCALE/migrations/migrate b/charts/stable/onlyoffice-document-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/onlyoffice-document-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/onlyoffice-document-server/questions.yaml b/charts/stable/onlyoffice-document-server/questions.yaml index 30a2eff0495..5ca7aef9f25 100644 --- a/charts/stable/onlyoffice-document-server/questions.yaml +++ b/charts/stable/onlyoffice-document-server/questions.yaml @@ -77,7 +77,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/onlyoffice-document-server/templates/common.yaml b/charts/stable/onlyoffice-document-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/onlyoffice-document-server/templates/common.yaml +++ b/charts/stable/onlyoffice-document-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/onlyoffice-document-server/values.yaml b/charts/stable/onlyoffice-document-server/values.yaml index 59dfd6c898d..934a710c74c 100644 --- a/charts/stable/onlyoffice-document-server/values.yaml +++ b/charts/stable/onlyoffice-document-server/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: JWT_SECRET: "randomgeneratedstring" env: @@ -22,8 +22,6 @@ env: DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" REDIS_SERVER_PORT: 6379 - -envValueFrom: DB_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/openhab/Chart.yaml b/charts/stable/openhab/Chart.yaml index 3101dac50f6..36c57274880 100644 --- a/charts/stable/openhab/Chart.yaml +++ b/charts/stable/openhab/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.2.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: OpenHab is a home-automation application home: https://github.com/truecharts/apps/tree/master/charts/stable/openhab @@ -19,7 +19,7 @@ name: openhab sources: - https://hub.docker.com/r/openhab/openhab type: application -version: 1.0.19 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/openhab/SCALE/migrations/migrate b/charts/stable/openhab/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/openhab/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/openhab/templates/_configmap.tpl b/charts/stable/openhab/templates/_configmap.tpl deleted file mode 100644 index 2371d9538cb..00000000000 --- a/charts/stable/openhab/templates/_configmap.tpl +++ /dev/null @@ -1,14 +0,0 @@ -{{/* Append the hardcoded volumes */}} -{{- define "openhab.configmap" -}} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-init - labels: - {{- include "common.labels" . | nindent 4 }} -data: - enable-console-logging.sh: | - echo 'Enabling console logging.' - sed -i -E 's|().*|\1|' /openhab/userdata/etc/log4j2.xml -{{- end -}} diff --git a/charts/stable/openhab/templates/common.yaml b/charts/stable/openhab/templates/common.yaml index 1b4c06f5949..b9e7208f382 100644 --- a/charts/stable/openhab/templates/common.yaml +++ b/charts/stable/openhab/templates/common.yaml @@ -1,22 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} - -{{/* Render configmap for openhab */}} -{{- include "openhab.configmap" . }} - -{{/* Append the hardcoded volumes */}} -{{- define "openhab.hardcodedValues" -}} -persistence: - init: - enabled: true - mountPath: /etc/cont-init.d/enable-console-logging.sh - subPath: enable-console-logging.sh - type: custom - volumeSpec: - configMap: - name: {{ printf "%v-init" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "openhab.hardcodedValues" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/openhab/values.yaml b/charts/stable/openhab/values.yaml index 3879542d536..efbfce1518b 100644 --- a/charts/stable/openhab/values.yaml +++ b/charts/stable/openhab/values.yaml @@ -17,6 +17,14 @@ service: enabled: true port: 10170 +configmap: + init: + enabled: true + data: + enable-console-logging.sh: | + echo 'Enabling console logging.' + sed -i -E 's|().*|\1|' /openhab/userdata/etc/log4j2.xml + securityContext: readOnlyRootFilesystem: false runAsNonRoot: false @@ -40,3 +48,11 @@ persistence: userdata: enabled: true mountPath: "/openhab/userdata" + init: + enabled: true + mountPath: /etc/cont-init.d/enable-console-logging.sh + subPath: enable-console-logging.sh + type: custom + volumeSpec: + configMap: + name: '{{ printf "%v-init" (include "tc.common.names.fullname" .) }}' diff --git a/charts/stable/openkm/Chart.yaml b/charts/stable/openkm/Chart.yaml index d90a2fbe6da..a61c3d83096 100644 --- a/charts/stable/openkm/Chart.yaml +++ b/charts/stable/openkm/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "6.3.11" description: OpenKM integrates all essential documents management, collaboration and an advanced search functionality into one easy to use solution. name: openkm -version: 5.0.24 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - openkm @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/openkm/SCALE/migrations/migrate b/charts/stable/openkm/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/openkm/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/openkm/templates/_configmap.tpl b/charts/stable/openkm/templates/_configmap.tpl index a66fbec64ad..e5c3eb392e2 100644 --- a/charts/stable/openkm/templates/_configmap.tpl +++ b/charts/stable/openkm/templates/_configmap.tpl @@ -4,7 +4,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.names.fullname" . }}-init + name: {{ include "tc.common.names.fullname" . }}-init data: init.sh: |- #!/bin/sh diff --git a/charts/stable/openkm/templates/common.yaml b/charts/stable/openkm/templates/common.yaml index 24a9b365b53..5f3f39f53ae 100644 --- a/charts/stable/openkm/templates/common.yaml +++ b/charts/stable/openkm/templates/common.yaml @@ -1,22 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for openkm */}} {{- include "openkm.configmap" . }} -{{/* Append the general secret volumes to the volumes */}} -{{- define "openkm.initvolume" -}} -enabled: "true" -mountPath: "/config/init" -readOnly: true -type: "custom" -volumeSpec: - configMap: - name: {{ include "common.names.fullname" . }}-init - defaultMode: 0777 -{{- end -}} - -{{- $_ := set .Values.persistence "init" (include "openkm.initvolume" . | fromYaml) -}} - {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/openkm/values.yaml b/charts/stable/openkm/values.yaml index e55d11bde69..5acaa7cacbe 100644 --- a/charts/stable/openkm/values.yaml +++ b/charts/stable/openkm/values.yaml @@ -44,6 +44,15 @@ persistence: config: enabled: true mountPath: "/opt/tomcat/repository" + init: + enabled: "true" + mountPath: "/config/init" + readOnly: true + type: "custom" + volumeSpec: + configMap: + name: '{{ include "tc.common.names.fullname" . }}-init' + defaultMode: 0777 postgresql: enabled: true diff --git a/charts/stable/openldap/Chart.yaml b/charts/stable/openldap/Chart.yaml index f0677105a83..3fede203038 100644 --- a/charts/stable/openldap/Chart.yaml +++ b/charts/stable/openldap/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.5.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Community developed LDAP software home: https://github.com/truecharts/apps/tree/master/charts/stable/openldap @@ -23,7 +23,7 @@ sources: - https://github.com/jp-gouin/helm-openldap - https://github.com/osixia/docker-openldap type: application -version: 6.0.19 +version: 7.0.0 annotations: truecharts.org/catagories: | - cloud diff --git a/charts/stable/openldap/SCALE/migrations/migrate b/charts/stable/openldap/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/openldap/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/openldap/questions.yaml b/charts/stable/openldap/questions.yaml index 6dcb40b3276..268680aca7c 100644 --- a/charts/stable/openldap/questions.yaml +++ b/charts/stable/openldap/questions.yaml @@ -66,7 +66,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/openldap/templates/common.yaml b/charts/stable/openldap/templates/common.yaml index bc9c9caa860..83b1f475f42 100644 --- a/charts/stable/openldap/templates/common.yaml +++ b/charts/stable/openldap/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} {{/* Render configmap for openldap */}} {{- include "openldap.configmap" . }} diff --git a/charts/stable/openldap/values.yaml b/charts/stable/openldap/values.yaml index 02b9978be98..6680e434e25 100644 --- a/charts/stable/openldap/values.yaml +++ b/charts/stable/openldap/values.yaml @@ -50,7 +50,7 @@ service: port: 636 targetPort: 636 -secret: +secretEnv: LDAP_ADMIN_PASSWORD: "ldapadmin" LDAP_CONFIG_PASSWORD: "changeme" LDAP_READONLY_USER_USERNAME: "readonly" diff --git a/charts/stable/openvscode-server/Chart.yaml b/charts/stable/openvscode-server/Chart.yaml index f9d19ab7dd7..9f9f86bd3fe 100644 --- a/charts/stable/openvscode-server/Chart.yaml +++ b/charts/stable/openvscode-server/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: openvscode-server -version: 1.0.25 +version: 2.0.0 appVersion: "1.67.2" description: Openvscode-server provides a version of VS Code that runs a server on a remote machine. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/openvscode-server/SCALE/migrations/migrate b/charts/stable/openvscode-server/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/openvscode-server/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/openvscode-server/questions.yaml b/charts/stable/openvscode-server/questions.yaml index c5d4e1998c3..0e2cf46bd3a 100644 --- a/charts/stable/openvscode-server/questions.yaml +++ b/charts/stable/openvscode-server/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/openvscode-server/templates/common.yaml b/charts/stable/openvscode-server/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/openvscode-server/templates/common.yaml +++ b/charts/stable/openvscode-server/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/openvscode-server/values.yaml b/charts/stable/openvscode-server/values.yaml index 34167638ebe..065340f3c85 100644 --- a/charts/stable/openvscode-server/values.yaml +++ b/charts/stable/openvscode-server/values.yaml @@ -14,7 +14,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: {} +secretEnv: {} # CONNECTION_TOKEN: "somerandomstring" service: diff --git a/charts/stable/organizr/Chart.yaml b/charts/stable/organizr/Chart.yaml index fe7e97c8ba7..48f868bbf9f 100644 --- a/charts/stable/organizr/Chart.yaml +++ b/charts/stable/organizr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: HTPC/Homelab Services Organizer home: https://github.com/truecharts/apps/tree/master/charts/stable/organizr @@ -20,7 +20,7 @@ sources: - https://github.com/causefx/Organizr - https://hub.docker.com/r/organizr/organizr type: application -version: 10.0.22 +version: 11.0.0 annotations: truecharts.org/catagories: | - organizers diff --git a/charts/stable/organizr/SCALE/migrations/migrate b/charts/stable/organizr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/organizr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/organizr/templates/common.yaml b/charts/stable/organizr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/organizr/templates/common.yaml +++ b/charts/stable/organizr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/oscam/Chart.yaml b/charts/stable/oscam/Chart.yaml index 8ee67176186..bddec9bb0f0 100644 --- a/charts/stable/oscam/Chart.yaml +++ b/charts/stable/oscam/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "11693" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Open Source Conditional Access Module software home: https://github.com/truecharts/apps/tree/master/charts/stable/oscam @@ -19,7 +19,7 @@ name: oscam sources: - https://trac.streamboard.tv/oscam/browser/trunk type: application -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - DIY diff --git a/charts/stable/oscam/SCALE/migrations/migrate b/charts/stable/oscam/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/oscam/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/oscam/templates/common.yaml b/charts/stable/oscam/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/oscam/templates/common.yaml +++ b/charts/stable/oscam/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/outline/Chart.yaml b/charts/stable/outline/Chart.yaml index 46b70961d8e..2fe952e2855 100644 --- a/charts/stable/outline/Chart.yaml +++ b/charts/stable/outline/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.64.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -28,7 +28,7 @@ name: outline sources: - https://github.com/outline/outline type: application -version: 1.0.30 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/outline/SCALE/migrations/migrate b/charts/stable/outline/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/outline/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/outline/templates/common.yaml b/charts/stable/outline/templates/common.yaml index a62fd1cae85..b0c351b7002 100644 --- a/charts/stable/outline/templates/common.yaml +++ b/charts/stable/outline/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for fireflyiii */}} {{- include "outline.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/outline/values.yaml b/charts/stable/outline/values.yaml index 4b8d3f3681c..42b1fedd260 100644 --- a/charts/stable/outline/values.yaml +++ b/charts/stable/outline/values.yaml @@ -53,8 +53,6 @@ env: # AWS_S3_UPLOAD_MAX_SIZE: 26214400 # AWS_S3_FORCE_PATH_STYLE: true # AWS_S3_ACL: "" - -envValueFrom: DATABASE_URL: secretKeyRef: name: dbcreds diff --git a/charts/stable/overseerr/Chart.yaml b/charts/stable/overseerr/Chart.yaml index bcb97b060f6..3fdfe5c179a 100644 --- a/charts/stable/overseerr/Chart.yaml +++ b/charts/stable/overseerr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.29.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Overseerr is a free and open source software application for managing requests for your media library. It integrates with your existing services such as Sonarr, Radarr and Plex! @@ -23,7 +23,7 @@ name: overseerr sources: - https://github.com/sct/overseerr - https://hub.docker.com/r/sctx/overseerr -version: 5.0.20 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/overseerr/SCALE/migrations/migrate b/charts/stable/overseerr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/overseerr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/overseerr/templates/common.yaml b/charts/stable/overseerr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/overseerr/templates/common.yaml +++ b/charts/stable/overseerr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/owncast/Chart.yaml b/charts/stable/owncast/Chart.yaml index bea5358e633..67fd4405edd 100644 --- a/charts/stable/owncast/Chart.yaml +++ b/charts/stable/owncast/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.0.11" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Take control over your live stream video by running it yourself. Streaming + chat out of the box. home: https://github.com/truecharts/apps/tree/master/charts/stable/owncast @@ -22,7 +22,7 @@ name: owncast sources: - https://owncast.online/ - https://github.com/owncast/owncast -version: 5.0.20 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/owncast/SCALE/migrations/migrate b/charts/stable/owncast/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/owncast/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/owncast/templates/common.yaml b/charts/stable/owncast/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/owncast/templates/common.yaml +++ b/charts/stable/owncast/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/owncloud-ocis/Chart.yaml b/charts/stable/owncloud-ocis/Chart.yaml index eb808b85716..d5b2de523c7 100644 --- a/charts/stable/owncloud-ocis/Chart.yaml +++ b/charts/stable/owncloud-ocis/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.20.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: ownCloud Infinite Scale is a self-hosted file sync and share server. home: https://github.com/truecharts/apps/tree/master/charts/stable/owncloud-ocis icon: https://truecharts.org/_static/img/appicons/owncloud-ocis.png @@ -25,7 +25,7 @@ name: owncloud-ocis sources: - https://hub.docker.com/r/owncloud/ocis - https://owncloud.dev/ocis/ -version: 6.0.21 +version: 7.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/owncloud-ocis/SCALE/migrations/migrate b/charts/stable/owncloud-ocis/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/owncloud-ocis/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/owncloud-ocis/templates/common.yaml b/charts/stable/owncloud-ocis/templates/common.yaml index abe841863e1..f8dc48fa8d6 100644 --- a/charts/stable/owncloud-ocis/templates/common.yaml +++ b/charts/stable/owncloud-ocis/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for fireflyiii */}} {{- include "ocis.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/owncloud-ocis/values.yaml b/charts/stable/owncloud-ocis/values.yaml index f6a2a3dc08c..bfcb67c8093 100644 --- a/charts/stable/owncloud-ocis/values.yaml +++ b/charts/stable/owncloud-ocis/values.yaml @@ -14,8 +14,6 @@ env: PROXY_TLS: false PROXY_HTTP_ADDR: "0.0.0.0:{{ .Values.service.main.ports.main.port }}" OCIS_URL: "https://localhost:{{ .Values.service.main.ports.main.port }}" - -envValueFrom: OCIS_JWT_SECRET: secretKeyRef: name: ocis-secrets diff --git a/charts/stable/paperless-ng/Chart.yaml b/charts/stable/paperless-ng/Chart.yaml index ee810afa4d0..00522aec278 100644 --- a/charts/stable/paperless-ng/Chart.yaml +++ b/charts/stable/paperless-ng/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: paperless-ng -version: 2.0.31 +version: 3.0.0 appVersion: "1.7.1" description: Paperless-ngx is an application by Daniel Quinn and contributors that indexes your scanned documents. type: application @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/paperless-ng/SCALE/migrations/migrate b/charts/stable/paperless-ng/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/paperless-ng/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/paperless-ng/questions.yaml b/charts/stable/paperless-ng/questions.yaml index 0b96a92d7da..80a300edf38 100644 --- a/charts/stable/paperless-ng/questions.yaml +++ b/charts/stable/paperless-ng/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/paperless-ng/templates/common.yaml b/charts/stable/paperless-ng/templates/common.yaml index 946885f5bbd..fddadb2a1f7 100644 --- a/charts/stable/paperless-ng/templates/common.yaml +++ b/charts/stable/paperless-ng/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{ include "common.setup" . }} +{{ include "tc.common.loader.init" . }} {{/* Render secrets for paperlessng */}} {{- include "paperlessng.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/paperless-ng/values.yaml b/charts/stable/paperless-ng/values.yaml index 178a6a56108..1dc25ba61f8 100644 --- a/charts/stable/paperless-ng/values.yaml +++ b/charts/stable/paperless-ng/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: PAPERLESS_ADMIN_USER: "admin" PAPERLESS_ADMIN_PASSWORD: "admin" PAPERLESS_ADMIN_MAIL: "admin@admin.com" @@ -28,8 +28,6 @@ env: PAPERLESS_DBUSER: "{{ .Values.postgresql.postgresqlUsername }}" PAPERLESS_DBPORT: "5432" PAPERLESS_WEBSERVER_WORKERS: 2 - -envValueFrom: PAPERLESS_DBPASS: secretKeyRef: name: dbcreds diff --git a/charts/stable/papermerge/Chart.yaml b/charts/stable/papermerge/Chart.yaml index 72a08369621..e1105499bed 100644 --- a/charts/stable/papermerge/Chart.yaml +++ b/charts/stable/papermerge/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: papermerge -version: 1.0.23 +version: 2.0.0 appVersion: "2.0.1" description: Papermerge is an open source document management system (DMS) primarily designed for archiving and retrieving your digital documents. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: redis.enabled name: redis repository: https://charts.truecharts.org diff --git a/charts/stable/papermerge/SCALE/migrations/migrate b/charts/stable/papermerge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/papermerge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/papermerge/templates/common.yaml b/charts/stable/papermerge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/papermerge/templates/common.yaml +++ b/charts/stable/papermerge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/papermerge/values.yaml b/charts/stable/papermerge/values.yaml index 309af1bce3d..0638dcf5c90 100644 --- a/charts/stable/papermerge/values.yaml +++ b/charts/stable/papermerge/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -envValueFrom: +env: REDIS_URL: secretKeyRef: name: rediscreds diff --git a/charts/stable/pgadmin/Chart.yaml b/charts/stable/pgadmin/Chart.yaml index 46b96380e06..6395d0547fb 100644 --- a/charts/stable/pgadmin/Chart.yaml +++ b/charts/stable/pgadmin/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.10" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Web-Based postgresql database management utility home: https://github.com/truecharts/apps/tree/master/charts/stable/pgadmin @@ -21,7 +21,7 @@ name: pgadmin sources: - https://www.pgadmin.org/ type: application -version: 6.0.24 +version: 7.0.0 annotations: truecharts.org/catagories: | - management diff --git a/charts/stable/pgadmin/SCALE/migrations/migrate b/charts/stable/pgadmin/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pgadmin/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pgadmin/questions.yaml b/charts/stable/pgadmin/questions.yaml index 0510bf1d141..967f4f9a422 100644 --- a/charts/stable/pgadmin/questions.yaml +++ b/charts/stable/pgadmin/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/pgadmin/templates/common.yaml b/charts/stable/pgadmin/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/pgadmin/templates/common.yaml +++ b/charts/stable/pgadmin/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/pgadmin/values.yaml b/charts/stable/pgadmin/values.yaml index be365822898..68e2488cf05 100644 --- a/charts/stable/pgadmin/values.yaml +++ b/charts/stable/pgadmin/values.yaml @@ -19,7 +19,7 @@ service: port: 10024 targetPort: 80 -secret: +secretEnv: PGADMIN_DEFAULT_EMAIL: "replace@this.now" PGADMIN_DEFAULT_PASSWORD: "changeme" diff --git a/charts/stable/photoprism/Chart.yaml b/charts/stable/photoprism/Chart.yaml index fd684f7acc9..6184237d102 100644 --- a/charts/stable/photoprism/Chart.yaml +++ b/charts/stable/photoprism/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "220528" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -26,7 +26,7 @@ name: photoprism sources: - https://github.com/photoprism/photoprism - https://hub.docker.com/r/photoprism/photoprism -version: 8.0.28 +version: 9.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/photoprism/SCALE/migrations/migrate b/charts/stable/photoprism/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/photoprism/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/photoprism/questions.yaml b/charts/stable/photoprism/questions.yaml index 93319e34675..63622cc05de 100644 --- a/charts/stable/photoprism/questions.yaml +++ b/charts/stable/photoprism/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/photoprism/templates/common.yaml b/charts/stable/photoprism/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/photoprism/templates/common.yaml +++ b/charts/stable/photoprism/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/photoprism/values.yaml b/charts/stable/photoprism/values.yaml index 7e24f79f4f6..57c52eb617c 100644 --- a/charts/stable/photoprism/values.yaml +++ b/charts/stable/photoprism/values.yaml @@ -6,7 +6,7 @@ image: securityContext: readOnlyRootFilesystem: false -secret: +secretEnv: PHOTOPRISM_ADMIN_PASSWORD: "please-change" env: HOME: "/photoprism" @@ -25,8 +25,6 @@ env: PHOTOPRISM_DATABASE_DRIVER: "mysql" PHOTOPRISM_DATABASE_NAME: "photoprism" PHOTOPRISM_DATABASE_USER: "photoprism" - -envValueFrom: PHOTOPRISM_DATABASE_SERVER: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/photoshow/Chart.yaml b/charts/stable/photoshow/Chart.yaml index f2016037632..58ef4aa984b 100644 --- a/charts/stable/photoshow/Chart.yaml +++ b/charts/stable/photoshow/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "48aabb98" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A gallery software at its easiest, it doesn't even require a database. home: https://github.com/truecharts/apps/tree/master/charts/stable/photoshow icon: https://truecharts.org/_static/img/appicons/photoshow.png @@ -23,7 +23,7 @@ sources: - https://github.com/thibaud-rohmer/PhotoShow - https://github.com/linuxserver/docker-photoshow type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/photoshow/SCALE/migrations/migrate b/charts/stable/photoshow/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/photoshow/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/photoshow/templates/common.yaml b/charts/stable/photoshow/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/photoshow/templates/common.yaml +++ b/charts/stable/photoshow/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/photoview/Chart.yaml b/charts/stable/photoview/Chart.yaml index 563f075dda3..937cb3e88d4 100644 --- a/charts/stable/photoview/Chart.yaml +++ b/charts/stable/photoview/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.3.12" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: photoview sources: - https://github.com/photoview/photoview - https://hub.docker.com/r/viktorstrate/photoview -version: 2.0.23 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/photoview/SCALE/migrations/migrate b/charts/stable/photoview/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/photoview/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/photoview/templates/common.yaml b/charts/stable/photoview/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/photoview/templates/common.yaml +++ b/charts/stable/photoview/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/photoview/values.yaml b/charts/stable/photoview/values.yaml index b79c98ca150..5cdd7f572dc 100644 --- a/charts/stable/photoview/values.yaml +++ b/charts/stable/photoview/values.yaml @@ -11,8 +11,6 @@ env: PHOTOVIEW_DISABLE_FACE_RECOGNITION: false PHOTOVIEW_DISABLE_VIDEO_ENCODING: false PHOTOVIEW_DISABLE_RAW_PROCESSING: false - -envValueFrom: PHOTOVIEW_POSTGRES_URL: secretKeyRef: name: dbcreds diff --git a/charts/stable/phpldapadmin/Chart.yaml b/charts/stable/phpldapadmin/Chart.yaml index aa7347e83ac..a05d19b8b2c 100644 --- a/charts/stable/phpldapadmin/Chart.yaml +++ b/charts/stable/phpldapadmin/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.9.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Web-based LDAP browser to manage your LDAP server home: https://github.com/truecharts/apps/tree/master/charts/stable/phpldapadmin @@ -21,7 +21,7 @@ name: phpldapadmin sources: - https://gitlab.v2.rancher.geohub.space/g3s/i3s/i3s-helm-catalog type: application -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - management diff --git a/charts/stable/phpldapadmin/SCALE/migrations/migrate b/charts/stable/phpldapadmin/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/phpldapadmin/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/phpldapadmin/templates/common.yaml b/charts/stable/phpldapadmin/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/phpldapadmin/templates/common.yaml +++ b/charts/stable/phpldapadmin/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/piaware/Chart.yaml b/charts/stable/piaware/Chart.yaml index c9654663c78..74e81a2b893 100644 --- a/charts/stable/piaware/Chart.yaml +++ b/charts/stable/piaware/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "7.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Program for forwarding ADS-B data to FlightAware home: https://github.com/truecharts/apps/tree/master/charts/stable/piaware icon: https://truecharts.org/_static/img/appicons/piaware.png @@ -19,7 +19,7 @@ maintainers: name: piaware sources: - https://github.com/flightaware/piaware -version: 5.0.28 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/piaware/SCALE/migrations/migrate b/charts/stable/piaware/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/piaware/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/piaware/templates/common.yaml b/charts/stable/piaware/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/piaware/templates/common.yaml +++ b/charts/stable/piaware/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/picoshare/Chart.yaml b/charts/stable/picoshare/Chart.yaml index 4ad673a60f1..81b6a8c1aff 100644 --- a/charts/stable/picoshare/Chart.yaml +++ b/charts/stable/picoshare/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.1.7" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: PicoShare is a minimalist service that allows you to share files easily. home: https://github.com/truecharts/apps/tree/master/charts/stable/picoshare icon: https://truecharts.org/_static/img/appicons/picoshare.png @@ -18,7 +18,7 @@ name: picoshare sources: - https://github.com/mtlynch/picoshare - https://hub.docker.com/r/mtlynch/picoshare -version: 1.0.17 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/picoshare/SCALE/migrations/migrate b/charts/stable/picoshare/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/picoshare/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/picoshare/questions.yaml b/charts/stable/picoshare/questions.yaml index d6e486dd02e..e987264bedd 100644 --- a/charts/stable/picoshare/questions.yaml +++ b/charts/stable/picoshare/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/picoshare/templates/common.yaml b/charts/stable/picoshare/templates/common.yaml index a17e923ef88..ead65062525 100644 --- a/charts/stable/picoshare/templates/common.yaml +++ b/charts/stable/picoshare/templates/common.yaml @@ -1 +1 @@ -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/stable/picoshare/values.yaml b/charts/stable/picoshare/values.yaml index cc524db399f..bf0f89f5c5e 100644 --- a/charts/stable/picoshare/values.yaml +++ b/charts/stable/picoshare/values.yaml @@ -3,7 +3,7 @@ image: tag: v1.1.7@sha256:d495f21ef396bfd2a6f9c482de363c229fb865f9843c10875293ec057c3e3534 pullPolicy: IfNotPresent -secret: +secretEnv: PS_SHARED_SECRET: "somesecretcode" LITESTREAM_BUCKET: "" LITESTREAM_ENDPOINT: "" diff --git a/charts/stable/pidgin/Chart.yaml b/charts/stable/pidgin/Chart.yaml index 1fc9fb3a007..b42d45fd866 100644 --- a/charts/stable/pidgin/Chart.yaml +++ b/charts/stable/pidgin/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: pidgin -version: 1.0.19 +version: 2.0.0 appVersion: "2.14.8" description: Pidgin is a chat program which lets you log into accounts on multiple chat networks simultaneously. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/pidgin/SCALE/migrations/migrate b/charts/stable/pidgin/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pidgin/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pidgin/templates/common.yaml b/charts/stable/pidgin/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/pidgin/templates/common.yaml +++ b/charts/stable/pidgin/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/pihole/Chart.yaml b/charts/stable/pihole/Chart.yaml index 59b5db72b75..9674a86606d 100644 --- a/charts/stable/pihole/Chart.yaml +++ b/charts/stable/pihole/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.04.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: DNS and Ad-filtering for your network home: https://github.com/truecharts/apps/tree/master/charts/stable/pihole @@ -21,7 +21,7 @@ sources: - https://github.com/pi-hole - https://github.com/pi-hole/docker-pi-hole type: application -version: 5.0.22 +version: 6.0.0 annotations: truecharts.org/catagories: | - networking diff --git a/charts/stable/pihole/SCALE/migrations/migrate b/charts/stable/pihole/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pihole/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pihole/templates/common.yaml b/charts/stable/pihole/templates/common.yaml index a6f73771f8c..e4efbcaf8dc 100644 --- a/charts/stable/pihole/templates/common.yaml +++ b/charts/stable/pihole/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for pihole */}} {{- include "pihole.configmap" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/pinry/Chart.yaml b/charts/stable/pinry/Chart.yaml index 09b0bb6a168..b500dbd29e7 100644 --- a/charts/stable/pinry/Chart.yaml +++ b/charts/stable/pinry/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.1.12" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: The open-source core of Pinry, a tiling image board system for people who want to save, tag, and share images, videos and webpages in an easy to skim through format. home: https://github.com/truecharts/apps/tree/master/charts/stable/pinry icon: https://truecharts.org/_static/img/appicons/pinry.png @@ -17,7 +17,7 @@ maintainers: name: pinry sources: - https://github.com/pinry/pinry/ -version: 1.0.12 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/pinry/SCALE/migrations/migrate b/charts/stable/pinry/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pinry/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pinry/templates/common.yaml b/charts/stable/pinry/templates/common.yaml index e3ebec1561a..ab8ad167767 100644 --- a/charts/stable/pinry/templates/common.yaml +++ b/charts/stable/pinry/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for pinry */}} {{- include "pinry.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/pinry/values.yaml b/charts/stable/pinry/values.yaml index abe9ef41e85..0c0f667119b 100644 --- a/charts/stable/pinry/values.yaml +++ b/charts/stable/pinry/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -envValueFrom: +env: SECRET_KEY: secretKeyRef: name: pinry-secrets diff --git a/charts/stable/pixapop/Chart.yaml b/charts/stable/pixapop/Chart.yaml index 8fb88332b79..32cd3ea69e4 100644 --- a/charts/stable/pixapop/Chart.yaml +++ b/charts/stable/pixapop/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An open-source single page application to view your photos in the easiest way possible. home: https://github.com/truecharts/apps/tree/master/charts/stable/pixapop @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-pixapop - https://github.com/bierdok/pixapop type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/pixapop/SCALE/migrations/migrate b/charts/stable/pixapop/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pixapop/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pixapop/templates/common.yaml b/charts/stable/pixapop/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/pixapop/templates/common.yaml +++ b/charts/stable/pixapop/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/plex/Chart.yaml b/charts/stable/plex/Chart.yaml index 85e1b384536..54ab049c1ae 100644 --- a/charts/stable/plex/Chart.yaml +++ b/charts/stable/plex/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.26.2.579" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Plex Media Server home: https://github.com/truecharts/apps/tree/master/charts/stable/plex @@ -20,7 +20,7 @@ name: plex sources: - https://github.com/k8s-at-home/container-images/pkgs/container/plex type: application -version: 9.0.25 +version: 10.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/plex/SCALE/migrations/migrate b/charts/stable/plex/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/plex/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/plex/templates/common.yaml b/charts/stable/plex/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/plex/templates/common.yaml +++ b/charts/stable/plex/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/podgrab/Chart.yaml b/charts/stable/podgrab/Chart.yaml index 931180f4b76..ad06479d722 100644 --- a/charts/stable/podgrab/Chart.yaml +++ b/charts/stable/podgrab/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A self-hosted podcast manager to download episodes as soon as they become live. @@ -21,7 +21,7 @@ sources: - https://github.com/akhilrex/podgrab - https://hub.docker.com/r/akhilrex/podgrab type: application -version: 9.0.20 +version: 10.0.0 annotations: truecharts.org/catagories: | - mutlimedia diff --git a/charts/stable/podgrab/SCALE/migrations/migrate b/charts/stable/podgrab/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/podgrab/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/podgrab/questions.yaml b/charts/stable/podgrab/questions.yaml index 9c4cfd34f48..f6ec65355fc 100644 --- a/charts/stable/podgrab/questions.yaml +++ b/charts/stable/podgrab/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/podgrab/templates/common.yaml b/charts/stable/podgrab/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/podgrab/templates/common.yaml +++ b/charts/stable/podgrab/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/podgrab/values.yaml b/charts/stable/podgrab/values.yaml index d45c98f8c6d..c2b9c410048 100644 --- a/charts/stable/podgrab/values.yaml +++ b/charts/stable/podgrab/values.yaml @@ -17,7 +17,7 @@ service: port: 51080 targetPort: 51080 -secret: +secretEnv: PASSWORD: "secretpasswordgoeshere" env: diff --git a/charts/stable/pretend-youre-xyzzy/Chart.yaml b/charts/stable/pretend-youre-xyzzy/Chart.yaml index e9c4dce328c..91f28306acb 100644 --- a/charts/stable/pretend-youre-xyzzy/Chart.yaml +++ b/charts/stable/pretend-youre-xyzzy/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: pretend-youre-xyzzy, a cards against humanity clone home: https://github.com/truecharts/apps/tree/master/charts/stable/pretend-youre-xyzzy icon: https://truecharts.org/_static/img/appicons/pretend-youre-xyzzy.png @@ -21,7 +21,7 @@ name: pretend-youre-xyzzy sources: - https://github.com/ajanata/PretendYoureXyzzy - https://github.com/emcniece/DockerYourXyzzy -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/pretend-youre-xyzzy/SCALE/migrations/migrate b/charts/stable/pretend-youre-xyzzy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pretend-youre-xyzzy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pretend-youre-xyzzy/templates/common.yaml b/charts/stable/pretend-youre-xyzzy/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/pretend-youre-xyzzy/templates/common.yaml +++ b/charts/stable/pretend-youre-xyzzy/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/projectsend/Chart.yaml b/charts/stable/projectsend/Chart.yaml index 9d7f0c40d10..81ce606ad72 100644 --- a/charts/stable/projectsend/Chart.yaml +++ b/charts/stable/projectsend/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: projectsend -version: 1.0.23 +version: 2.0.0 appVersion: "2021.12.10" description: Projectsend is a self-hosted application that lets you upload files and assign them to specific clients that you create yourself. type: application @@ -14,7 +14,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ diff --git a/charts/stable/projectsend/SCALE/migrations/migrate b/charts/stable/projectsend/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/projectsend/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/projectsend/templates/common.yaml b/charts/stable/projectsend/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/projectsend/templates/common.yaml +++ b/charts/stable/projectsend/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/promcord/Chart.yaml b/charts/stable/promcord/Chart.yaml index d7d2a6070b7..f16fb44701c 100644 --- a/charts/stable/promcord/Chart.yaml +++ b/charts/stable/promcord/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Discord bot that provides metrics from a Discord server icon: https://truecharts.org/_static/img/appicons/promcord.png @@ -21,7 +21,7 @@ name: promcord sources: - https://github.com/nimarion/promcord type: application -version: 3.0.20 +version: 4.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/stable/promcord/SCALE/migrations/migrate b/charts/stable/promcord/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/promcord/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/promcord/questions.yaml b/charts/stable/promcord/questions.yaml index 64786019608..9ea57221532 100644 --- a/charts/stable/promcord/questions.yaml +++ b/charts/stable/promcord/questions.yaml @@ -3,7 +3,7 @@ portals: {} questions: # Include{global} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/promcord/templates/common.yaml b/charts/stable/promcord/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/stable/promcord/templates/common.yaml +++ b/charts/stable/promcord/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/minecraft-java/.helmignore b/charts/stable/prometheus/.helmignore similarity index 100% rename from charts/games/minecraft-java/.helmignore rename to charts/stable/prometheus/.helmignore diff --git a/charts/core/prometheus/CHANGELOG.md b/charts/stable/prometheus/CHANGELOG.md similarity index 100% rename from charts/core/prometheus/CHANGELOG.md rename to charts/stable/prometheus/CHANGELOG.md diff --git a/charts/games/minecraft-bedrock/CONFIG.md b/charts/stable/prometheus/CONFIG.md similarity index 100% rename from charts/games/minecraft-bedrock/CONFIG.md rename to charts/stable/prometheus/CONFIG.md diff --git a/charts/core/prometheus/Chart.yaml b/charts/stable/prometheus/Chart.yaml similarity index 97% rename from charts/core/prometheus/Chart.yaml rename to charts/stable/prometheus/Chart.yaml index 18b31ed0164..531f3f6500f 100644 --- a/charts/core/prometheus/Chart.yaml +++ b/charts/stable/prometheus/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.56.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: exporters.enabled,exporters.node-exporter.enabled name: node-exporter repository: https://charts.bitnami.com/bitnami @@ -28,7 +28,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 2.0.77 +version: 3.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/core/prometheus/README.md b/charts/stable/prometheus/README.md similarity index 100% rename from charts/core/prometheus/README.md rename to charts/stable/prometheus/README.md diff --git a/charts/core/prometheus/crds/crd-alertmanager-config.yaml b/charts/stable/prometheus/crds/crd-alertmanager-config.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-alertmanager-config.yaml rename to charts/stable/prometheus/crds/crd-alertmanager-config.yaml diff --git a/charts/core/prometheus/crds/crd-alertmanager.yaml b/charts/stable/prometheus/crds/crd-alertmanager.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-alertmanager.yaml rename to charts/stable/prometheus/crds/crd-alertmanager.yaml diff --git a/charts/core/prometheus/crds/crd-podmonitor.yaml b/charts/stable/prometheus/crds/crd-podmonitor.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-podmonitor.yaml rename to charts/stable/prometheus/crds/crd-podmonitor.yaml diff --git a/charts/core/prometheus/crds/crd-probes.yaml b/charts/stable/prometheus/crds/crd-probes.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-probes.yaml rename to charts/stable/prometheus/crds/crd-probes.yaml diff --git a/charts/core/prometheus/crds/crd-prometheus.yaml b/charts/stable/prometheus/crds/crd-prometheus.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-prometheus.yaml rename to charts/stable/prometheus/crds/crd-prometheus.yaml diff --git a/charts/core/prometheus/crds/crd-prometheusrules.yaml b/charts/stable/prometheus/crds/crd-prometheusrules.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-prometheusrules.yaml rename to charts/stable/prometheus/crds/crd-prometheusrules.yaml diff --git a/charts/core/prometheus/crds/crd-servicemonitor.yaml b/charts/stable/prometheus/crds/crd-servicemonitor.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-servicemonitor.yaml rename to charts/stable/prometheus/crds/crd-servicemonitor.yaml diff --git a/charts/core/prometheus/crds/crd-thanosrulers.yaml b/charts/stable/prometheus/crds/crd-thanosrulers.yaml similarity index 100% rename from charts/core/prometheus/crds/crd-thanosrulers.yaml rename to charts/stable/prometheus/crds/crd-thanosrulers.yaml diff --git a/charts/core/prometheus/helm-values.md b/charts/stable/prometheus/helm-values.md similarity index 100% rename from charts/core/prometheus/helm-values.md rename to charts/stable/prometheus/helm-values.md diff --git a/charts/core/prometheus/questions.yaml b/charts/stable/prometheus/questions.yaml similarity index 100% rename from charts/core/prometheus/questions.yaml rename to charts/stable/prometheus/questions.yaml diff --git a/charts/core/prometheus/security.md b/charts/stable/prometheus/security.md similarity index 100% rename from charts/core/prometheus/security.md rename to charts/stable/prometheus/security.md diff --git a/charts/core/prometheus/templates/_helpers.tpl b/charts/stable/prometheus/templates/_helpers.tpl similarity index 84% rename from charts/core/prometheus/templates/_helpers.tpl rename to charts/stable/prometheus/templates/_helpers.tpl index 25fe28a5c09..76bf0609ca3 100644 --- a/charts/core/prometheus/templates/_helpers.tpl +++ b/charts/stable/prometheus/templates/_helpers.tpl @@ -1,46 +1,46 @@ {{/* Name suffixed with operator */}} {{- define "kube-prometheus.fullname" -}} -{{- printf "%s" (include "common.names.fullname" . ) -}} +{{- printf "%s" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Name suffixed with operator */}} {{- define "kube-prometheus.name" -}} -{{- printf "%s" (include "common.names.fullname" . ) -}} +{{- printf "%s" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Name suffixed with operator */}} {{- define "kube-prometheus.operator.name" -}} -{{- printf "%s-operator" (include "common.names.fullname" . ) -}} +{{- printf "%s-operator" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Name suffixed with prometheus */}} {{- define "kube-prometheus.prometheus.name" -}} -{{- printf "%s-prometheus" (include "common.names.fullname" . ) -}} +{{- printf "%s-prometheus" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Name suffixed with alertmanager */}} {{- define "kube-prometheus.alertmanager.name" -}} -{{- printf "%s-alertmanager" (include "common.names.fullname" . ) -}} +{{- printf "%s-alertmanager" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Name suffixed with thanos */}} {{- define "kube-prometheus.thanos.name" -}} -{{- printf "%s-thanos" (include "common.names.fullname" . ) -}} +{{- printf "%s-thanos" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Fullname suffixed with operator */}} {{- define "kube-prometheus.operator.fullname" -}} -{{- printf "%s-operator" (include "common.names.fullname" . ) -}} +{{- printf "%s-operator" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Fullname suffixed with prometheus */}} {{- define "kube-prometheus.prometheus.fullname" -}} -{{- printf "%s-prometheus" (include "common.names.fullname" . ) -}} +{{- printf "%s-prometheus" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Fullname suffixed with alertmanager */}} {{- define "kube-prometheus.alertmanager.fullname" -}} -{{- printf "%s-alertmanager" (include "common.names.fullname" . ) -}} +{{- printf "%s-alertmanager" (include "tc.common.names.fullname" . ) -}} {{- end }} {{/* Fullname suffixed with thanos */}} @@ -56,7 +56,7 @@ Common Labels */}} {{- define "kube-prometheus.labels" -}} -{{ include "common.labels" . }} +{{ include "tc.common.labels" . }} {{- if .Values.global.labels }} {{ toYaml .Values.global.labels }} {{- end }} @@ -66,7 +66,7 @@ Common Labels Labels for operator */}} {{- define "kube-prometheus.operator.labels" -}} -{{ include "common.labels" . }} +{{ include "tc.common.labels" . }} app.kubernetes.io/component: operator {{- end -}} @@ -74,7 +74,7 @@ app.kubernetes.io/component: operator Labels for prometheus */}} {{- define "kube-prometheus.prometheus.labels" -}} -{{ include "common.labels" . }} +{{ include "tc.common.labels" . }} app.kubernetes.io/component: prometheus {{- end -}} @@ -82,7 +82,7 @@ app.kubernetes.io/component: prometheus Labels for alertmanager */}} {{- define "kube-prometheus.alertmanager.labels" -}} -{{ include "common.labels" . }} +{{ include "tc.common.labels" . }} app.kubernetes.io/component: alertmanager {{- end -}} @@ -90,7 +90,7 @@ app.kubernetes.io/component: alertmanager matchLabels for operator */}} {{- define "kube-prometheus.operator.matchLabels" -}} -{{ include "common.labels.selectorLabels" . }} +{{ include "tc.common.labels.selectorLabels" . }} app.kubernetes.io/component: operator {{- end -}} @@ -98,7 +98,7 @@ app.kubernetes.io/component: operator matchLabels for prometheus */}} {{- define "kube-prometheus.prometheus.matchLabels" -}} -{{ include "common.labels.selectorLabels" . }} +{{ include "tc.common.labels.selectorLabels" . }} app.kubernetes.io/component: prometheus {{- end -}} @@ -106,7 +106,7 @@ app.kubernetes.io/component: prometheus matchLabels for alertmanager */}} {{- define "kube-prometheus.alertmanager.matchLabels" -}} -{{ include "common.labels.selectorLabels" . }} +{{ include "tc.common.labels.selectorLabels" . }} app.kubernetes.io/component: alertmanager {{- end -}} diff --git a/charts/core/prometheus/templates/alertmanager/_alertmanager.tpl b/charts/stable/prometheus/templates/alertmanager/_alertmanager.tpl similarity index 78% rename from charts/core/prometheus/templates/alertmanager/_alertmanager.tpl rename to charts/stable/prometheus/templates/alertmanager/_alertmanager.tpl index c0a076034bb..05184dd3ca6 100644 --- a/charts/core/prometheus/templates/alertmanager/_alertmanager.tpl +++ b/charts/stable/prometheus/templates/alertmanager/_alertmanager.tpl @@ -27,10 +27,10 @@ spec: logLevel: {{ .Values.alertmanager.logLevel }} retention: {{ .Values.alertmanager.retention }} {{- if .Values.alertmanager.secrets }} - secrets: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.secrets "context" $) | nindent 4 }} + secrets: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.secrets "context" $) | nindent 4 }} {{- end }} {{- if .Values.alertmanager.configMaps }} - configMaps: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.configMaps "context" $) | nindent 4 }} + configMaps: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.configMaps "context" $) | nindent 4 }} {{- end }} resources: {{- toYaml .Values.alertmanager.resources | nindent 4 }} routePrefix: "{{ .Values.alertmanager.routePrefix }}" @@ -38,7 +38,7 @@ spec: securityContext: {{- omit .Values.alertmanager.podSecurityContext "enabled" | toYaml | nindent 4 }} {{- end }} {{- if .Values.alertmanager.storageSpec }} - storage: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.storageSpec "context" $) | nindent 4 }} + storage: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.storageSpec "context" $) | nindent 4 }} {{- else }} {{- if .Values.alertmanager.persistence.enabled }} storage: @@ -51,48 +51,48 @@ spec: resources: requests: storage: {{ .Values.alertmanager.persistence.size | quote }} - {{- include "common.storage.class" (dict "persistence" .Values.alertmanager.persistence "global" $ ) | nindent 8 }} + {{- include "tc.common.storage.class" (dict "persistence" .Values.alertmanager.persistence "global" $ ) | nindent 8 }} {{- end }} {{- end }} {{- if or .Values.alertmanager.podMetadata.labels .Values.alertmanager.podMetadata.annotations (eq .Values.alertmanager.podAntiAffinityPreset "soft") (eq .Values.alertmanager.podAntiAffinityPreset "hard") }} podMetadata: labels: {{- if .Values.alertmanager.podMetadata.labels }} - {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.podMetadata.labels "context" $) | nindent 6 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.podMetadata.labels "context" $) | nindent 6 }} {{- end }} {{- if or (eq .Values.alertmanager.podAntiAffinityPreset "soft") (eq .Values.alertmanager.podAntiAffinityPreset "hard") }} {{- include "kube-prometheus.alertmanager.matchLabels" . | nindent 6 }} {{- end }} {{- if .Values.alertmanager.podMetadata.annotations }} annotations: - {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.podMetadata.annotations "context" $) | nindent 6 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.podMetadata.annotations "context" $) | nindent 6 }} {{- end }} {{- end }} {{- if .Values.alertmanager.affinity }} - affinity: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.affinity "context" $) | nindent 4 }} + affinity: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.affinity "context" $) | nindent 4 }} {{- else }} affinity: {{- if not (empty .Values.alertmanager.podAffinityPreset) }} - podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.alertmanager.podAffinityPreset "component" "alertmanager" "context" $) | nindent 6 }} + podAffinity: {{- include "tc.common.affinities.pods" (dict "type" .Values.alertmanager.podAffinityPreset "component" "alertmanager" "context" $) | nindent 6 }} {{- end }} {{- if not (empty .Values.alertmanager.podAntiAffinityPreset) }} - podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.alertmanager.podAntiAffinityPreset "component" "alertmanager" "context" $) | nindent 6 }} + podAntiAffinity: {{- include "tc.common.affinities.pods" (dict "type" .Values.alertmanager.podAntiAffinityPreset "component" "alertmanager" "context" $) | nindent 6 }} {{- end }} {{- if not (empty .Values.alertmanager.nodeAffinityPreset.values) }} - nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.alertmanager.nodeAffinityPreset.type "key" .Values.alertmanager.nodeAffinityPreset.key "values" .Values.alertmanager.nodeAffinityPreset.values) | nindent 6 }} + nodeAffinity: {{- include "tc.common.affinities.nodes" (dict "type" .Values.alertmanager.nodeAffinityPreset.type "key" .Values.alertmanager.nodeAffinityPreset.key "values" .Values.alertmanager.nodeAffinityPreset.values) | nindent 6 }} {{- end }} {{- end }} {{- if .Values.alertmanager.nodeSelector }} - nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.nodeSelector "context" $) | nindent 4 }} + nodeSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.nodeSelector "context" $) | nindent 4 }} {{- end }} {{- if .Values.alertmanager.tolerations }} - tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.tolerations "context" $) | nindent 4 }} + tolerations: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.tolerations "context" $) | nindent 4 }} {{- end }} {{- if .Values.alertmanager.volumes }} - volumes: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.volumes "context" $) | nindent 4 }} + volumes: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.volumes "context" $) | nindent 4 }} {{- end }} {{- if .Values.alertmanager.volumeMounts }} - volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.volumeMounts "context" $) | nindent 4 }} + volumeMounts: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.volumeMounts "context" $) | nindent 4 }} {{- end }} {{- include "kube-prometheus.imagePullSecrets" . | indent 2 }} {{- if or .Values.alertmanager.containers .Values.alertmanager.containerSecurityContext.enabled .Values.operator.prometheusConfigReloader.containerSecurityContext.enabled }} @@ -164,7 +164,7 @@ spec: {{- end }} {{- end }} {{- if .Values.alertmanager.containers }} - {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.containers "context" $) | nindent 4 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.containers "context" $) | nindent 4 }} {{- end }} {{- end }} {{- if .Values.alertmanager.priorityClassName }} @@ -174,10 +174,10 @@ spec: additionalPeers: {{ .Values.alertmanager.additionalPeers }} {{- end }} {{- if .Values.alertmanager.configNamespaceSelector }} - alertmanagerConfigNamespaceSelector: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.configNamespaceSelector "context" $) | nindent 4 }} + alertmanagerConfigNamespaceSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.configNamespaceSelector "context" $) | nindent 4 }} {{- end }} {{- if .Values.alertmanager.configSelector }} - alertmanagerConfigSelector: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.configSelector "context" $) | nindent 4 }} + alertmanagerConfigSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.configSelector "context" $) | nindent 4 }} {{- end }} {{- end }} {{- end }} diff --git a/charts/core/prometheus/templates/alertmanager/secrets.yaml b/charts/stable/prometheus/templates/alertmanager/secrets.yaml similarity index 100% rename from charts/core/prometheus/templates/alertmanager/secrets.yaml rename to charts/stable/prometheus/templates/alertmanager/secrets.yaml diff --git a/charts/core/prometheus/templates/alertmanager/serviceaccount.yaml b/charts/stable/prometheus/templates/alertmanager/serviceaccount.yaml similarity index 76% rename from charts/core/prometheus/templates/alertmanager/serviceaccount.yaml rename to charts/stable/prometheus/templates/alertmanager/serviceaccount.yaml index 5535583fd86..0086398a45a 100644 --- a/charts/core/prometheus/templates/alertmanager/serviceaccount.yaml +++ b/charts/stable/prometheus/templates/alertmanager/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "kube-prometheus.alertmanager.labels" . | nindent 4 }} {{- if index .Values.alertmanager.serviceAccount "annotations" }} - annotations: {{- include "common.tplvalues.render" (dict "value" .Values.alertmanager.serviceAccount.annotations "context" $) | nindent 4 }} + annotations: {{- include "tc.common.tplvalues.render" (dict "value" .Values.alertmanager.serviceAccount.annotations "context" $) | nindent 4 }} {{- end }} {{- include "kube-prometheus.imagePullSecrets" . }} {{- end }} diff --git a/charts/core/prometheus/templates/alertmanager/servicemonitor.yaml b/charts/stable/prometheus/templates/alertmanager/servicemonitor.yaml similarity index 86% rename from charts/core/prometheus/templates/alertmanager/servicemonitor.yaml rename to charts/stable/prometheus/templates/alertmanager/servicemonitor.yaml index f056e402f83..56071b8e187 100644 --- a/charts/core/prometheus/templates/alertmanager/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/alertmanager/servicemonitor.yaml @@ -18,7 +18,7 @@ spec: {{- end }} path: {{ trimSuffix "/" .Values.alertmanager.routePrefix }}/metrics {{- if .Values.alertmanager.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.alertmanager.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.alertmanager.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.alertmanager.serviceMonitor.relabelings }} relabelings: {{- toYaml .Values.alertmanager.serviceMonitor.relabelings | nindent 8 }} diff --git a/charts/core/prometheus/templates/common.yaml b/charts/stable/prometheus/templates/common.yaml similarity index 88% rename from charts/core/prometheus/templates/common.yaml rename to charts/stable/prometheus/templates/common.yaml index 67ed1165751..ea4b5689cc6 100644 --- a/charts/core/prometheus/templates/common.yaml +++ b/charts/stable/prometheus/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{- $newArgs := (include "prometheus.operator.args" . | fromYaml) }} {{- $_ := set .Values "newArgs" $newArgs -}} @@ -15,4 +15,4 @@ {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/core/prometheus/templates/exporters/core-dns/service.yaml b/charts/stable/prometheus/templates/exporters/core-dns/service.yaml similarity index 100% rename from charts/core/prometheus/templates/exporters/core-dns/service.yaml rename to charts/stable/prometheus/templates/exporters/core-dns/service.yaml diff --git a/charts/core/prometheus/templates/exporters/core-dns/servicemonitor.yaml b/charts/stable/prometheus/templates/exporters/core-dns/servicemonitor.yaml similarity index 76% rename from charts/core/prometheus/templates/exporters/core-dns/servicemonitor.yaml rename to charts/stable/prometheus/templates/exporters/core-dns/servicemonitor.yaml index b75a7ab46da..1c8a6d34a92 100644 --- a/charts/core/prometheus/templates/exporters/core-dns/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/exporters/core-dns/servicemonitor.yaml @@ -21,9 +21,9 @@ spec: {{- end }} bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token {{- if .Values.coreDns.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" (dict "value" .Values.coreDns.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" (dict "value" .Values.coreDns.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} {{- end }} {{- if .Values.coreDns.serviceMonitor.relabelings }} - relabelings: {{- include "common.tplvalues.render" (dict "value" .Values.coreDns.serviceMonitor.relabelings "context" $) | nindent 6 }} + relabelings: {{- include "tc.common.tplvalues.render" (dict "value" .Values.coreDns.serviceMonitor.relabelings "context" $) | nindent 6 }} {{- end }} {{- end }} diff --git a/charts/core/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml b/charts/stable/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml similarity index 87% rename from charts/core/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml rename to charts/stable/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml index 31d2af289c6..5ce8694e41a 100644 --- a/charts/core/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml @@ -27,7 +27,7 @@ spec: interval: {{ .Values.kubeApiServer.serviceMonitor.interval }} {{- end }} {{- if .Values.kubeApiServer.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.kubeApiServer.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.kubeApiServer.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.kubeApiServer.serviceMonitor.relabelings }} relabelings: {{- toYaml .Values.kubeApiServer.serviceMonitor.relabelings | nindent 8 }} diff --git a/charts/core/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/stable/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml similarity index 100% rename from charts/core/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml rename to charts/stable/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml diff --git a/charts/core/prometheus/templates/exporters/kube-controller-manager/service.yaml b/charts/stable/prometheus/templates/exporters/kube-controller-manager/service.yaml similarity index 100% rename from charts/core/prometheus/templates/exporters/kube-controller-manager/service.yaml rename to charts/stable/prometheus/templates/exporters/kube-controller-manager/service.yaml diff --git a/charts/core/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/stable/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml similarity index 83% rename from charts/core/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml rename to charts/stable/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml index 3f4a1abafbc..5557af63959 100644 --- a/charts/core/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml @@ -32,9 +32,9 @@ spec: {{- end }} {{- end }} {{- if .Values.kubeControllerManager.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" (dict "value" .Values.kubeControllerManager.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" (dict "value" .Values.kubeControllerManager.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} {{- end }} {{- if .Values.kubeControllerManager.serviceMonitor.relabelings }} - relabelings: {{- include "common.tplvalues.render" (dict "value" .Values.kubeControllerManager.serviceMonitor.relabelings "context" $) | nindent 6 }} + relabelings: {{- include "tc.common.tplvalues.render" (dict "value" .Values.kubeControllerManager.serviceMonitor.relabelings "context" $) | nindent 6 }} {{- end }} {{- end }} diff --git a/charts/core/prometheus/templates/exporters/kube-scheduler/endpoints.yaml b/charts/stable/prometheus/templates/exporters/kube-scheduler/endpoints.yaml similarity index 100% rename from charts/core/prometheus/templates/exporters/kube-scheduler/endpoints.yaml rename to charts/stable/prometheus/templates/exporters/kube-scheduler/endpoints.yaml diff --git a/charts/core/prometheus/templates/exporters/kube-scheduler/service.yaml b/charts/stable/prometheus/templates/exporters/kube-scheduler/service.yaml similarity index 100% rename from charts/core/prometheus/templates/exporters/kube-scheduler/service.yaml rename to charts/stable/prometheus/templates/exporters/kube-scheduler/service.yaml diff --git a/charts/core/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/stable/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml similarity index 83% rename from charts/core/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml rename to charts/stable/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml index e844a3c623a..757ce98b7c0 100644 --- a/charts/core/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml @@ -32,9 +32,9 @@ spec: {{- end}} {{- end}} {{- if .Values.kubeScheduler.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" (dict "value" .Values.kubeScheduler.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" (dict "value" .Values.kubeScheduler.serviceMonitor.metricRelabelings "context" $) | nindent 6 }} {{- end }} {{- if .Values.kubeScheduler.serviceMonitor.relabelings }} - metricRelabelings: {{- include "common.tplvalues.render" (dict "value" .Values.kubeScheduler.serviceMonitor.relabelings "context" $) | nindent 6 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" (dict "value" .Values.kubeScheduler.serviceMonitor.relabelings "context" $) | nindent 6 }} {{- end }} {{- end }} diff --git a/charts/core/prometheus/templates/exporters/kubelet/servicemonitor.yaml b/charts/stable/prometheus/templates/exporters/kubelet/servicemonitor.yaml similarity index 82% rename from charts/core/prometheus/templates/exporters/kubelet/servicemonitor.yaml rename to charts/stable/prometheus/templates/exporters/kubelet/servicemonitor.yaml index be5f9a90a8b..30668f30489 100644 --- a/charts/core/prometheus/templates/exporters/kubelet/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/exporters/kubelet/servicemonitor.yaml @@ -28,7 +28,7 @@ spec: interval: {{ .Values.kubelet.serviceMonitor.interval }} {{- end }} {{- if .Values.kubelet.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.kubelet.serviceMonitor.relabelings }} relabelings: {{- toYaml .Values.kubelet.serviceMonitor.relabelings | nindent 8 }} @@ -46,7 +46,7 @@ spec: interval: {{ .Values.kubelet.serviceMonitor.interval }} {{- end }} {{- if .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.kubelet.serviceMonitor.cAdvisorRelabelings }} relabelings: {{- toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | nindent 8 }} @@ -61,7 +61,7 @@ spec: interval: {{ .Values.kubelet.serviceMonitor.interval }} {{- end }} {{- if .Values.kubelet.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.kubelet.serviceMonitor.relabelings }} relabelings: {{- toYaml .Values.kubelet.serviceMonitor.relabelings | nindent 8 }} @@ -76,7 +76,7 @@ spec: interval: {{ .Values.kubelet.serviceMonitor.interval }} {{- end }} {{- if .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.kubelet.serviceMonitor.cAdvisorMetricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.kubelet.serviceMonitor.cAdvisorRelabelings }} relabelings: {{- toYaml .Values.kubelet.serviceMonitor.cAdvisorRelabelings | nindent 8 }} diff --git a/charts/core/prometheus/templates/operator/_args.tpl b/charts/stable/prometheus/templates/operator/_args.tpl similarity index 100% rename from charts/core/prometheus/templates/operator/_args.tpl rename to charts/stable/prometheus/templates/operator/_args.tpl diff --git a/charts/core/prometheus/templates/operator/configmap.yaml b/charts/stable/prometheus/templates/operator/configmap.yaml similarity index 100% rename from charts/core/prometheus/templates/operator/configmap.yaml rename to charts/stable/prometheus/templates/operator/configmap.yaml diff --git a/charts/core/prometheus/templates/operator/servicemonitor.yaml b/charts/stable/prometheus/templates/operator/servicemonitor.yaml similarity index 84% rename from charts/core/prometheus/templates/operator/servicemonitor.yaml rename to charts/stable/prometheus/templates/operator/servicemonitor.yaml index df97749f06c..0bae6b50859 100644 --- a/charts/core/prometheus/templates/operator/servicemonitor.yaml +++ b/charts/stable/prometheus/templates/operator/servicemonitor.yaml @@ -12,7 +12,7 @@ spec: interval: {{ .Values.operator.serviceMonitor.interval }} {{- end }} {{- if .Values.operator.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.operator.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.operator.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.operator.serviceMonitor.relabelings }} relabelings: {{- toYaml .Values.operator.serviceMonitor.relabelings | nindent 8 }} diff --git a/charts/core/prometheus/templates/prometheus/_additionalPrometheusRules.tpl b/charts/stable/prometheus/templates/prometheus/_additionalPrometheusRules.tpl similarity index 100% rename from charts/core/prometheus/templates/prometheus/_additionalPrometheusRules.tpl rename to charts/stable/prometheus/templates/prometheus/_additionalPrometheusRules.tpl diff --git a/charts/core/prometheus/templates/prometheus/_additionalScrapeJobs.tpl b/charts/stable/prometheus/templates/prometheus/_additionalScrapeJobs.tpl similarity index 73% rename from charts/core/prometheus/templates/prometheus/_additionalScrapeJobs.tpl rename to charts/stable/prometheus/templates/prometheus/_additionalScrapeJobs.tpl index 481003a6d67..d28d5facace 100644 --- a/charts/core/prometheus/templates/prometheus/_additionalScrapeJobs.tpl +++ b/charts/stable/prometheus/templates/prometheus/_additionalScrapeJobs.tpl @@ -8,6 +8,6 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "kube-prometheus.prometheus.labels" . | nindent 4 }} data: - scrape-jobs.yaml: {{ include "common.tplvalues.render" ( dict "value" .Values.prometheus.additionalScrapeConfigs.internal.jobList "context" $ ) | b64enc | quote }} + scrape-jobs.yaml: {{ include "tc.common.tplvalues.render" ( dict "value" .Values.prometheus.additionalScrapeConfigs.internal.jobList "context" $ ) | b64enc | quote }} {{- end }} {{- end }} diff --git a/charts/core/prometheus/templates/prometheus/_prometheus.tpl b/charts/stable/prometheus/templates/prometheus/_prometheus.tpl similarity index 79% rename from charts/core/prometheus/templates/prometheus/_prometheus.tpl rename to charts/stable/prometheus/templates/prometheus/_prometheus.tpl index 995f85ddb2d..d7affa060af 100644 --- a/charts/core/prometheus/templates/prometheus/_prometheus.tpl +++ b/charts/stable/prometheus/templates/prometheus/_prometheus.tpl @@ -11,24 +11,24 @@ spec: replicas: {{ .Values.prometheus.replicaCount }} serviceAccountName: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} {{- if .Values.prometheus.serviceMonitorSelector }} - serviceMonitorSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.serviceMonitorSelector "context" $) | nindent 4 }} + serviceMonitorSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.serviceMonitorSelector "context" $) | nindent 4 }} {{- else }} serviceMonitorSelector: {} {{- end }} {{- if .Values.prometheus.podMonitorSelector }} - podMonitorSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.podMonitorSelector "context" $) | nindent 4 }} + podMonitorSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.podMonitorSelector "context" $) | nindent 4 }} {{- else }} podMonitorSelector: {} {{- end }} {{- if .Values.prometheus.probeSelector }} - probeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.probeSelector "context" $) | nindent 4 }} + probeSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.probeSelector "context" $) | nindent 4 }} {{- else }} probeSelector: {} {{- end }} alerting: alertmanagers: {{- if .Values.prometheus.alertingEndpoints }} - {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.alertingEndpoints "context" $) | nindent 6 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.alertingEndpoints "context" $) | nindent 6 }} {{- else if .Values.alertmanager.enabled }} - namespace: {{ .Release.Namespace }} name: {{ template "kube-prometheus.alertmanager.fullname" . }} @@ -41,7 +41,7 @@ spec: image: {{ template "kube-prometheus.prometheus.image" . }} {{- end }} {{- if .Values.prometheus.externalLabels }} - externalLabels: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.externalLabels "context" $) | nindent 4 }} + externalLabels: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.externalLabels "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.prometheusExternalLabelNameClear }} prometheusExternalLabelName: "" @@ -93,47 +93,47 @@ spec: portName: "{{ .Values.prometheus.portName }}" routePrefix: "{{ .Values.prometheus.routePrefix }}" {{- if .Values.prometheus.secrets }} - secrets: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.secrets "context" $) | nindent 4 }} + secrets: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.secrets "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.configMaps }} - configMaps: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.configMaps "context" $) | nindent 4 }} + configMaps: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.configMaps "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.serviceMonitorNamespaceSelector }} - serviceMonitorNamespaceSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.serviceMonitorNamespaceSelector "context" $) | nindent 4 }} + serviceMonitorNamespaceSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.serviceMonitorNamespaceSelector "context" $) | nindent 4 }} {{- else }} serviceMonitorNamespaceSelector: {} {{- end }} {{- if .Values.prometheus.podMonitorNamespaceSelector }} - podMonitorNamespaceSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.podMonitorNamespaceSelector "context" $) | nindent 4 }} + podMonitorNamespaceSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.podMonitorNamespaceSelector "context" $) | nindent 4 }} {{- else }} podMonitorNamespaceSelector: {} {{- end }} {{- if .Values.prometheus.probeNamespaceSelector }} - probeNamespaceSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.probeNamespaceSelector "context" $) | nindent 4 }} + probeNamespaceSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.probeNamespaceSelector "context" $) | nindent 4 }} {{- else }} probeNamespaceSelector: {} {{- end }} {{- if .Values.prometheus.remoteRead }} - remoteRead: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.remoteRead "context" $) | nindent 4 }} + remoteRead: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.remoteRead "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.remoteWrite }} - remoteWrite: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.remoteWrite "context" $) | nindent 4 }} + remoteWrite: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.remoteWrite "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.podSecurityContext.enabled }} securityContext: {{- omit .Values.prometheus.podSecurityContext "enabled" | toYaml | nindent 4 }} {{- end }} {{- if .Values.prometheus.ruleNamespaceSelector }} - ruleNamespaceSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.ruleNamespaceSelector "context" $) | nindent 4 }} + ruleNamespaceSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.ruleNamespaceSelector "context" $) | nindent 4 }} {{- else }} ruleNamespaceSelector: {} {{- end }} {{- if .Values.prometheus.ruleSelector }} - ruleSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.ruleSelector "context" $) | nindent 4 }} + ruleSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.ruleSelector "context" $) | nindent 4 }} {{- else }} ruleSelector: {} {{- end }} {{- if .Values.prometheus.storageSpec }} - storage: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.storageSpec "context" $) | nindent 4 }} + storage: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.storageSpec "context" $) | nindent 4 }} {{- else if .Values.prometheus.persistence.enabled }} storage: volumeClaimTemplate: @@ -145,50 +145,50 @@ spec: resources: requests: storage: {{ .Values.prometheus.persistence.size | quote }} - {{- include "common.storage.class" (dict "persistence" .Values.prometheus.persistence "global" $ ) | nindent 8 }} + {{- include "tc.common.storage.class" (dict "persistence" .Values.prometheus.persistence "global" $ ) | nindent 8 }} {{- end }} {{- if or .Values.prometheus.podMetadata.labels .Values.prometheus.podMetadata.annotations (eq .Values.prometheus.podAntiAffinityPreset "soft") (eq .Values.prometheus.podAntiAffinityPreset "hard") }} podMetadata: labels: {{- if .Values.prometheus.podMetadata.labels }} - {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.podMetadata.labels "context" $) | nindent 6 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.podMetadata.labels "context" $) | nindent 6 }} {{- end }} {{- if or (eq .Values.prometheus.podAntiAffinityPreset "soft") (eq .Values.prometheus.podAntiAffinityPreset "hard") }} {{- include "kube-prometheus.prometheus.matchLabels" . | nindent 6 }} {{- end }} {{- if .Values.prometheus.podMetadata.annotations }} annotations: - {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.podMetadata.annotations "context" $) | nindent 6 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.podMetadata.annotations "context" $) | nindent 6 }} {{- end }} {{- end }} {{- if .Values.prometheus.querySpec }} - query: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.querySpec "context" $) | nindent 4 }} + query: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.querySpec "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.affinity }} - affinity: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.affinity "context" $) | nindent 4 }} + affinity: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.affinity "context" $) | nindent 4 }} {{- else }} affinity: {{- if not (empty .Values.prometheus.podAffinityPreset) }} - podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.prometheus.podAffinityPreset "component" "prometheus" "context" $) | nindent 6 }} + podAffinity: {{- include "tc.common.affinities.pods" (dict "type" .Values.prometheus.podAffinityPreset "component" "prometheus" "context" $) | nindent 6 }} {{- end }} {{- if not (empty .Values.prometheus.podAntiAffinityPreset) }} - podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.prometheus.podAntiAffinityPreset "component" "prometheus" "context" $) | nindent 6 }} + podAntiAffinity: {{- include "tc.common.affinities.pods" (dict "type" .Values.prometheus.podAntiAffinityPreset "component" "prometheus" "context" $) | nindent 6 }} {{- end }} {{- if not (empty .Values.prometheus.nodeAffinityPreset.values) }} - nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.prometheus.nodeAffinityPreset.type "key" .Values.prometheus.nodeAffinityPreset.key "values" .Values.prometheus.nodeAffinityPreset.values) | nindent 6 }} + nodeAffinity: {{- include "tc.common.affinities.nodes" (dict "type" .Values.prometheus.nodeAffinityPreset.type "key" .Values.prometheus.nodeAffinityPreset.key "values" .Values.prometheus.nodeAffinityPreset.values) | nindent 6 }} {{- end }} {{- end }} {{- if .Values.prometheus.nodeSelector }} - nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.nodeSelector "context" $) | nindent 4 }} + nodeSelector: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.nodeSelector "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.tolerations }} - tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.tolerations "context" $) | nindent 4 }} + tolerations: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.tolerations "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.volumes }} - volumes: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.volumes "context" $) | nindent 4 }} + volumes: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.volumes "context" $) | nindent 4 }} {{- end }} {{- if .Values.prometheus.volumeMounts }} - volumeMounts: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.volumeMounts "context" $) | nindent 4 }} + volumeMounts: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.volumeMounts "context" $) | nindent 4 }} {{- end }} {{- if or .Values.prometheus.additionalScrapeConfigs.enabled .Values.prometheus.additionalScrapeConfigsExternal.enabled }} additionalScrapeConfigs: @@ -252,7 +252,7 @@ spec: subPath: prometheus-db {{- end }} {{- if .Values.prometheus.thanos.extraVolumeMounts }} - {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.thanos.extraVolumeMounts "context" $) | nindent 8 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.thanos.extraVolumeMounts "context" $) | nindent 8 }} {{- end }} {{- if .Values.prometheus.thanos.containerSecurityContext.enabled }} # yamllint disable rule:indentation @@ -351,7 +351,7 @@ spec: {{- end }} {{- end }} {{- if .Values.prometheus.containers }} - {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.containers "context" $) | nindent 4 }} + {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.containers "context" $) | nindent 4 }} {{- end }} {{- end }} {{- if .Values.prometheus.priorityClassName }} diff --git a/charts/core/prometheus/templates/prometheus/_servicemonitor.tpl b/charts/stable/prometheus/templates/prometheus/_servicemonitor.tpl similarity index 87% rename from charts/core/prometheus/templates/prometheus/_servicemonitor.tpl rename to charts/stable/prometheus/templates/prometheus/_servicemonitor.tpl index 64d15cf54e1..d9a57023535 100644 --- a/charts/core/prometheus/templates/prometheus/_servicemonitor.tpl +++ b/charts/stable/prometheus/templates/prometheus/_servicemonitor.tpl @@ -20,7 +20,7 @@ spec: {{- end }} path: {{ trimSuffix "/" .Values.prometheus.routePrefix }}/metrics {{- if .Values.prometheus.serviceMonitor.metricRelabelings }} - metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.prometheus.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + metricRelabelings: {{- include "tc.common.tplvalues.render" ( dict "value" .Values.prometheus.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} {{- end }} {{- if .Values.prometheus.serviceMonitor.relabelings }} relabelings: {{- toYaml .Values.prometheus.serviceMonitor.relabelings | nindent 8 }} diff --git a/charts/core/prometheus/templates/prometheus/clusterrole.yaml b/charts/stable/prometheus/templates/prometheus/clusterrole.yaml similarity index 100% rename from charts/core/prometheus/templates/prometheus/clusterrole.yaml rename to charts/stable/prometheus/templates/prometheus/clusterrole.yaml diff --git a/charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml b/charts/stable/prometheus/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml rename to charts/stable/prometheus/templates/prometheus/clusterrolebinding.yaml diff --git a/charts/core/prometheus/templates/prometheus/serviceaccount.yaml b/charts/stable/prometheus/templates/prometheus/serviceaccount.yaml similarity index 76% rename from charts/core/prometheus/templates/prometheus/serviceaccount.yaml rename to charts/stable/prometheus/templates/prometheus/serviceaccount.yaml index 9dcc43a732f..02b175f2b4d 100644 --- a/charts/core/prometheus/templates/prometheus/serviceaccount.yaml +++ b/charts/stable/prometheus/templates/prometheus/serviceaccount.yaml @@ -6,7 +6,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{- include "kube-prometheus.prometheus.labels" . | nindent 4 }} {{- if index .Values.prometheus.serviceAccount "annotations" }} - annotations: {{- include "common.tplvalues.render" (dict "value" .Values.prometheus.serviceAccount.annotations "context" $) | nindent 4 }} + annotations: {{- include "tc.common.tplvalues.render" (dict "value" .Values.prometheus.serviceAccount.annotations "context" $) | nindent 4 }} {{- end }} {{- include "kube-prometheus.imagePullSecrets" . }} {{- end }} diff --git a/charts/core/prometheus/values.yaml b/charts/stable/prometheus/values.yaml similarity index 95% rename from charts/core/prometheus/values.yaml rename to charts/stable/prometheus/values.yaml index 73956ada9e4..07e48e95ee5 100644 --- a/charts/core/prometheus/values.yaml +++ b/charts/stable/prometheus/values.yaml @@ -1,10 +1,10 @@ image: repository: tccr.io/truecharts/prometheus-operator - tag: v0.56.3@sha256:ca522eac0e6aa92bcffe94f9f88323bff907cf5ab3e7bbd202a70d2c15b2a796 + tag: v0.56.3@sha256:4693c647ec28e28f0cbcb31098a28403f929d94d90e54958624469597f023203 prometheusImage: repository: tccr.io/truecharts/prometheus - tag: v2.36.0@sha256:cb5214513636f51ca2d81279dffa50e2a445b474009b2697110b0f473112abad + tag: v2.36.0@sha256:b8351beeda0039e5d40d100d05a138aaefb95ecb2771c9b7889a07e82d32bbbd thanosImage: repository: tccr.io/truecharts/thanos @@ -12,7 +12,7 @@ thanosImage: alertmanagerImage: repository: tccr.io/truecharts/alertmanager - tag: v0.24.0@sha256:b1638f220ed89ab46f23eeb9dd141984e044aed924c703c3eff60306861db146 + tag: v0.24.0@sha256:a5e9d47e6a4c6a37219cddba6839472f6e0372b127d30f419f61d9a07de53f56 global: labels: {} @@ -70,7 +70,7 @@ ingress: ## Operator Config #### -envValueFrom: +env: PROMETHEUS_CONFIG_RELOADER: configMapKeyRef: name: prometheus-operator-config @@ -78,103 +78,105 @@ envValueFrom: # -- Whether Role Based Access Control objects like roles and rolebindings should be created rbac: - enabled: true - rules: - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - apiGroups: - - apiextensions.k8s.io - resourceNames: - - alertmanagers.monitoring.coreos.com - - podmonitors.monitoring.coreos.com - - prometheuses.monitoring.coreos.com - - prometheusrules.monitoring.coreos.com - - servicemonitors.monitoring.coreos.com - - thanosrulers.monitoring.coreos.com - - probes.monitoring.coreos.com - resources: - - customresourcedefinitions - verbs: - - get - - update - - apiGroups: - - monitoring.coreos.com - resources: - - alertmanagers - - alertmanagers/finalizers - - alertmanagerconfigs - - prometheuses - - prometheuses/finalizers - - thanosrulers - - thanosrulers/finalizers - - servicemonitors - - podmonitors - - probes - - prometheusrules - verbs: - - '*' - - apiGroups: - - apps - resources: - - statefulsets - verbs: - - '*' - - apiGroups: - - "" - resources: - - configmaps - - secrets - verbs: - - '*' - - apiGroups: - - "" - resources: - - pods - verbs: - - list - - delete - - apiGroups: - - "" - resources: - - services - - services/finalizers - - endpoints - verbs: - - get - - create - - update - - delete - - apiGroups: - - "" - resources: - - nodes - verbs: - - list - - watch - - apiGroups: - - "" - resources: - - namespaces - verbs: - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - get - - list - - watch + main: + enabled: true + rules: + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - create + - apiGroups: + - apiextensions.k8s.io + resourceNames: + - alertmanagers.monitoring.coreos.com + - podmonitors.monitoring.coreos.com + - prometheuses.monitoring.coreos.com + - prometheusrules.monitoring.coreos.com + - servicemonitors.monitoring.coreos.com + - thanosrulers.monitoring.coreos.com + - probes.monitoring.coreos.com + resources: + - customresourcedefinitions + verbs: + - get + - update + - apiGroups: + - monitoring.coreos.com + resources: + - alertmanagers + - alertmanagers/finalizers + - alertmanagerconfigs + - prometheuses + - prometheuses/finalizers + - thanosrulers + - thanosrulers/finalizers + - servicemonitors + - podmonitors + - probes + - prometheusrules + verbs: + - '*' + - apiGroups: + - apps + resources: + - statefulsets + verbs: + - '*' + - apiGroups: + - "" + resources: + - configmaps + - secrets + verbs: + - '*' + - apiGroups: + - "" + resources: + - pods + verbs: + - list + - delete + - apiGroups: + - "" + resources: + - services + - services/finalizers + - endpoints + verbs: + - get + - create + - update + - delete + - apiGroups: + - "" + resources: + - nodes + verbs: + - list + - watch + - apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - networking.k8s.io + resources: + - ingresses + verbs: + - get + - list + - watch # -- The service account the pods will use to interact with the Kubernetes API serviceAccount: - create: true + main: + create: true securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/protonmail-bridge/Chart.yaml b/charts/stable/protonmail-bridge/Chart.yaml index 8d3a45668e2..fdd715a0d4e 100644 --- a/charts/stable/protonmail-bridge/Chart.yaml +++ b/charts/stable/protonmail-bridge/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.8.10" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Container for protonmail bridge to work on the network. home: https://github.com/truecharts/apps/tree/master/charts/stable/protonmail-bridge icon: https://truecharts.org/_static/img/appicons/protonmail-bridge.png @@ -19,7 +19,7 @@ name: protonmail-bridge sources: - https://github.com/shenxn/protonmail-bridge-docker - https://hub.docker.com/r/shenxn/protonmail-bridge -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/protonmail-bridge/SCALE/migrations/migrate b/charts/stable/protonmail-bridge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/protonmail-bridge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/protonmail-bridge/templates/common.yaml b/charts/stable/protonmail-bridge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/protonmail-bridge/templates/common.yaml +++ b/charts/stable/protonmail-bridge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/prowlarr/Chart.yaml b/charts/stable/prowlarr/Chart.yaml index 0fbba2e9ba2..3b826b6a84e 100644 --- a/charts/stable/prowlarr/Chart.yaml +++ b/charts/stable/prowlarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.4.0.1802" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Indexer manager/proxy built on the popular arr net base stack to integrate with your various PVR apps. home: https://github.com/truecharts/apps/tree/master/charts/stable/prowlarr @@ -21,7 +21,7 @@ name: prowlarr sources: - https://github.com/Prowlarr/Prowlarr - https://github.com/k8s-at-home/container-images -version: 5.0.44 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/prowlarr/SCALE/migrations/migrate b/charts/stable/prowlarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/prowlarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/prowlarr/templates/common.yaml b/charts/stable/prowlarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/prowlarr/templates/common.yaml +++ b/charts/stable/prowlarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/pwndrop/Chart.yaml b/charts/stable/pwndrop/Chart.yaml index ec9e6c2f338..981920b0726 100644 --- a/charts/stable/pwndrop/Chart.yaml +++ b/charts/stable/pwndrop/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: pwndrop -version: 1.0.19 +version: 2.0.0 appVersion: "1.0.1" description: Pwndrop is a self-deployable file hosting service for sending out red teaming payloads or securely sharing your private files over HTTP and WebDAV. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/pwndrop/SCALE/migrations/migrate b/charts/stable/pwndrop/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pwndrop/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pwndrop/templates/common.yaml b/charts/stable/pwndrop/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/pwndrop/templates/common.yaml +++ b/charts/stable/pwndrop/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/pydio-cells/Chart.yaml b/charts/stable/pydio-cells/Chart.yaml index 345930e5f89..a31675408b2 100644 --- a/charts/stable/pydio-cells/Chart.yaml +++ b/charts/stable/pydio-cells/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: pydio-cells -version: 2.0.25 +version: 3.0.0 appVersion: "3.0.7" description: Pydio-cells is the nextgen file sharing platform for organizations. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ diff --git a/charts/stable/pydio-cells/SCALE/migrations/migrate b/charts/stable/pydio-cells/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pydio-cells/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pydio-cells/templates/_configmap.tpl b/charts/stable/pydio-cells/templates/_configmap.tpl deleted file mode 100644 index fe2feae8354..00000000000 --- a/charts/stable/pydio-cells/templates/_configmap.tpl +++ /dev/null @@ -1,22 +0,0 @@ -{{- define "pydiocells.configmap" -}} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-install - labels: - {{- include "common.labels" . | nindent 4 }} -data: - pydiocells-install: |- - frontendapplicationtitle: {{ .Values.pydioinstall.title }} - frontendlogin: {{ .Values.pydioinstall.username }} - frontendpassword: {{ .Values.pydioinstall.password }} - frontendrepeatpassword: {{ .Values.pydioinstall.password }} - dbconnectiontype: tcp - dbtcphostname: {{ printf "%v-%v" .Release.Name "mariadb" }} - dbtcpport: 3306 - dbtcpname: {{ .Values.mariadb.mariadbDatabase }} - dbtcpuser: {{ .Values.mariadb.mariadbUsername }} - dbtcppassword: {{ .Values.mariadb.mariadbPassword | trimAll "\"" }} - -{{- end -}} diff --git a/charts/stable/pydio-cells/templates/common.yaml b/charts/stable/pydio-cells/templates/common.yaml index 57c94523e6d..eacdafa9525 100644 --- a/charts/stable/pydio-cells/templates/common.yaml +++ b/charts/stable/pydio-cells/templates/common.yaml @@ -1,20 +1,4 @@ -{{- include "common.setup" . }} - -{{/* Append the hardcoded settings */}} -{{- define "pydiocells.harcodedValues" -}} -persistence: - pydiocells-install: - enabled: "true" - mountPath: "/cells/install.yml" - subPath: "pydiocells-install" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-install" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "pydiocells.harcodedValues" . | fromYaml) -}} - -{{- include "pydiocells.configmap" . }} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/pydio-cells/values.yaml b/charts/stable/pydio-cells/values.yaml index f5d624aa27c..05883602a86 100644 --- a/charts/stable/pydio-cells/values.yaml +++ b/charts/stable/pydio-cells/values.yaml @@ -11,6 +11,22 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 +configmap: + install: + enabled: true + data: + pydiocells-install: |- + frontendapplicationtitle: {{ .Values.pydioinstall.title }} + frontendlogin: {{ .Values.pydioinstall.username }} + frontendpassword: {{ .Values.pydioinstall.password }} + frontendrepeatpassword: {{ .Values.pydioinstall.password }} + dbconnectiontype: tcp + dbtcphostname: {{ printf "%v-%v" .Release.Name "mariadb" }} + dbtcpport: 3306 + dbtcpname: {{ .Values.mariadb.mariadbDatabase }} + dbtcpuser: {{ .Values.mariadb.mariadbUsername }} + dbtcppassword: {{ .Values.mariadb.mariadbPassword | trimAll "\"" }} + env: CELLS_EXTERNAL: "" CELLS_GRPC_EXTERNAL: "{{ .Values.service.gprc.ports.gprc.port }}" @@ -82,6 +98,14 @@ persistence: services: enabled: true mountPath: "/cells/services" + pydiocells-install: + enabled: "true" + mountPath: "/cells/install.yml" + subPath: "pydiocells-install" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-install" (include "tc.common.names.fullname" .) }}' mariadb: enabled: true diff --git a/charts/stable/pyload/Chart.yaml b/charts/stable/pyload/Chart.yaml index 2e36730461c..2f94c1f42d5 100644 --- a/charts/stable/pyload/Chart.yaml +++ b/charts/stable/pyload/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "5de90278" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: pyLoad is a Free and Open Source download manager written in Python and designed to be extremely lightweight, easily extensible and fully manageable via web. @@ -21,7 +21,7 @@ name: pyload sources: - https://github.com/pyload/pyload - https://hub.docker.com/r/linuxserver/pyload -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/pyload/SCALE/migrations/migrate b/charts/stable/pyload/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pyload/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pyload/templates/common.yaml b/charts/stable/pyload/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/pyload/templates/common.yaml +++ b/charts/stable/pyload/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/pylon/Chart.yaml b/charts/stable/pylon/Chart.yaml index 55a3f21cc27..1c2b9d58c1e 100644 --- a/charts/stable/pylon/Chart.yaml +++ b/charts/stable/pylon/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: pylon -version: 1.0.20 +version: 2.0.0 appVersion: "2.8.0" description: Pylon is a web based integrated development environment. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/pylon/SCALE/migrations/migrate b/charts/stable/pylon/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/pylon/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/pylon/questions.yaml b/charts/stable/pylon/questions.yaml index 91300bf63b4..b2f91deab50 100644 --- a/charts/stable/pylon/questions.yaml +++ b/charts/stable/pylon/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/pylon/templates/common.yaml b/charts/stable/pylon/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/pylon/templates/common.yaml +++ b/charts/stable/pylon/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/pylon/values.yaml b/charts/stable/pylon/values.yaml index b8bab4e25d4..16cfd53e6c1 100644 --- a/charts/stable/pylon/values.yaml +++ b/charts/stable/pylon/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: PYUSER: "" PYPASS: "" diff --git a/charts/stable/qbittorrent/Chart.yaml b/charts/stable/qbittorrent/Chart.yaml index d1c36fd7923..1f2cd8b79cc 100644 --- a/charts/stable/qbittorrent/Chart.yaml +++ b/charts/stable/qbittorrent/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.4.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: qBittorrent is a cross-platform free and open-source BitTorrent client home: https://github.com/truecharts/apps/tree/master/charts/stable/qbittorrent @@ -20,7 +20,7 @@ name: qbittorrent sources: - https://github.com/qbittorrent/qBittorrent type: application -version: 10.0.22 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/qbittorrent/SCALE/migrations/migrate b/charts/stable/qbittorrent/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/qbittorrent/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/qbittorrent/templates/_configmap.tpl b/charts/stable/qbittorrent/templates/_configmap.tpl index ebcc4bf64af..b5d6f3cfd15 100644 --- a/charts/stable/qbittorrent/templates/_configmap.tpl +++ b/charts/stable/qbittorrent/templates/_configmap.tpl @@ -5,9 +5,9 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "common.names.fullname" . }}-scripts + name: {{ template "tc.common.names.fullname" . }}-scripts labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} data: {{- $bittorrentPort := "" -}} {{- $bittorrentPort = .Values.service.torrent.ports.torrent.port -}} diff --git a/charts/stable/qbittorrent/templates/common.yaml b/charts/stable/qbittorrent/templates/common.yaml index bcb4715aa18..a6f2d0e33f8 100644 --- a/charts/stable/qbittorrent/templates/common.yaml +++ b/charts/stable/qbittorrent/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} {{/* Render the configmap */}} diff --git a/charts/stable/qinglong/Chart.yaml b/charts/stable/qinglong/Chart.yaml index 3eb15fb6df1..0dd9f38e2d4 100644 --- a/charts/stable/qinglong/Chart.yaml +++ b/charts/stable/qinglong/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: qinglong -version: 1.0.24 +version: 2.0.0 appVersion: "2.13.2" description: A timed task management panel that supports typescript, javaScript, python3, and shell type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/qinglong/SCALE/migrations/migrate b/charts/stable/qinglong/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/qinglong/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/qinglong/templates/common.yaml b/charts/stable/qinglong/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/qinglong/templates/common.yaml +++ b/charts/stable/qinglong/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/quassel-core/Chart.yaml b/charts/stable/quassel-core/Chart.yaml index fa7b490be1f..8839bc3374a 100644 --- a/charts/stable/quassel-core/Chart.yaml +++ b/charts/stable/quassel-core/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: quassel-core -version: 1.0.23 +version: 2.0.0 appVersion: "0.14.0" description: Quassel-core is a modern, cross-platform, distributed IRC client. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/quassel-core/SCALE/migrations/migrate b/charts/stable/quassel-core/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/quassel-core/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/quassel-core/templates/common.yaml b/charts/stable/quassel-core/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/quassel-core/templates/common.yaml +++ b/charts/stable/quassel-core/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/quassel-core/values.yaml b/charts/stable/quassel-core/values.yaml index ed1a381b695..3e9880b30c9 100644 --- a/charts/stable/quassel-core/values.yaml +++ b/charts/stable/quassel-core/values.yaml @@ -21,8 +21,6 @@ env: DB_PGSQL_PORT: 5432 AUTH_AUTHENTICATOR: "Database" RUN_OPTS: "--config-from-environment" - -envValueFrom: DB_PGSQL_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/quassel-web/Chart.yaml b/charts/stable/quassel-web/Chart.yaml index d47642abb4e..c2db4f61cbf 100644 --- a/charts/stable/quassel-web/Chart.yaml +++ b/charts/stable/quassel-web/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: quassel-web -version: 1.0.19 +version: 2.0.0 appVersion: "2021.12.16" description: Quassel-web is a web client for Quassel. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/quassel-web/SCALE/migrations/migrate b/charts/stable/quassel-web/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/quassel-web/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/quassel-web/templates/common.yaml b/charts/stable/quassel-web/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/quassel-web/templates/common.yaml +++ b/charts/stable/quassel-web/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/radarr/Chart.yaml b/charts/stable/radarr/Chart.yaml index e6c68609eb1..a182b31a879 100644 --- a/charts/stable/radarr/Chart.yaml +++ b/charts/stable/radarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.1.0.6175" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: "A fork of Sonarr to work with movies \xE0 la Couchpotato" home: https://github.com/truecharts/apps/tree/master/charts/stable/radarr @@ -21,7 +21,7 @@ name: radarr sources: - https://github.com/Radarr/Radarr type: application -version: 10.0.21 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/radarr/SCALE/migrations/migrate b/charts/stable/radarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/radarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/radarr/templates/common.yaml b/charts/stable/radarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/radarr/templates/common.yaml +++ b/charts/stable/radarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/readarr/Chart.yaml b/charts/stable/readarr/Chart.yaml index 7526ac5c5e4..45d17bb3f0a 100644 --- a/charts/stable/readarr/Chart.yaml +++ b/charts/stable/readarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.1.1.1352" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A fork of Radarr to work with Books & AudioBooks home: https://github.com/truecharts/apps/tree/master/charts/stable/readarr @@ -24,7 +24,7 @@ sources: - https://github.com/Readarr/Readarr - https://readarr.com type: application -version: 10.0.28 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/readarr/SCALE/migrations/migrate b/charts/stable/readarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/readarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/readarr/templates/common.yaml b/charts/stable/readarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/readarr/templates/common.yaml +++ b/charts/stable/readarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/recipes/Chart.yaml b/charts/stable/recipes/Chart.yaml index 14ae48fd9dc..265c29a3e25 100644 --- a/charts/stable/recipes/Chart.yaml +++ b/charts/stable/recipes/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.2.7" description: Recipes is a Django application to manage, tag and search recipes using either built in models or external storage providers hosting PDF's, Images or other files. name: recipes -version: 6.0.39 +version: 7.0.0 kubeVersion: ">=1.16.0-0" keywords: - recipes @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/recipes/SCALE/migrations/migrate b/charts/stable/recipes/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/recipes/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/recipes/templates/common.yaml b/charts/stable/recipes/templates/common.yaml index b68b3c0a511..5f340b75fcf 100644 --- a/charts/stable/recipes/templates/common.yaml +++ b/charts/stable/recipes/templates/common.yaml @@ -1,21 +1,7 @@ -{{- include "common.setup" . }} - -{{/* Append the hardcoded settings */}} -{{- define "recipes.harcodedValues" -}} -persistence: - recipes-config: - enabled: "true" - mountPath: "/etc/nginx/nginx.conf" - subPath: "nginx.conf" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-config" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "recipes.harcodedValues" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for recipes */}} {{- include "recipes.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/recipes/templates/configmap.yaml b/charts/stable/recipes/templates/configmap.yaml deleted file mode 100644 index 449b0d71f71..00000000000 --- a/charts/stable/recipes/templates/configmap.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - nginx-config: |- - events { - worker_connections 1024; - } - http { - include /etc/nginx/mime.types; - server { - listen 80; - server_name _; - client_max_body_size 16M; - # serve media files - location /media/ { - alias /media/; - } - # serve static files - location /static/ { - alias /static/; - } - # pass requests for dynamic content to gunicorn - location / { - proxy_set_header Host $host; - proxy_pass http://localhost:8080; - } - } - } diff --git a/charts/stable/recipes/values.yaml b/charts/stable/recipes/values.yaml index f7061d025c9..b5e716ef543 100644 --- a/charts/stable/recipes/values.yaml +++ b/charts/stable/recipes/values.yaml @@ -20,6 +20,36 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 +configmap: + config: + enabled: true + data: + nginx-config: |- + events { + worker_connections 1024; + } + http { + include /etc/nginx/mime.types; + server { + listen 80; + server_name _; + client_max_body_size 16M; + # serve media files + location /media/ { + alias /media/; + } + # serve static files + location /static/ { + alias /static/; + } + # pass requests for dynamic content to gunicorn + location / { + proxy_set_header Host $host; + proxy_pass http://localhost:8080; + } + } + } + # -- environment variables. See [project docs](https://raw.githubusercontent.com/vabene1111/recipes/master/.env.template) for more details. # @default -- See below env: @@ -34,8 +64,6 @@ env: POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}" POSTGRES_USER: "{{ .Values.postgresql.postgresqlUsername }}" POSTGRES_PORT: "5432" - -envValueFrom: POSTGRES_PASSWORD: secretKeyRef: name: dbcreds @@ -85,6 +113,14 @@ persistence: enabled: true type: emptyDir mountPath: "/opt/recipes/staticfiles" + recipes-config: + enabled: "true" + mountPath: "/etc/nginx/nginx.conf" + subPath: "nginx.conf" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-config" (include "tc.common.names.fullname" .) }}' # Enabled postgres postgresql: diff --git a/charts/stable/redmine/Chart.yaml b/charts/stable/redmine/Chart.yaml index cdb7956fc27..8b74d1c2c82 100644 --- a/charts/stable/redmine/Chart.yaml +++ b/charts/stable/redmine/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 appVersion: "5.0.1" kubeVersion: '>=1.16.0-0' -version: 1.0.33 +version: 2.0.0 name: redmine description: Redmine is a flexible project management web application written using Ruby on Rails framework. type: application @@ -19,7 +19,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/redmine/SCALE/migrations/migrate b/charts/stable/redmine/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/redmine/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/redmine/templates/common.yaml b/charts/stable/redmine/templates/common.yaml index d469613d00b..37aa2b11c73 100644 --- a/charts/stable/redmine/templates/common.yaml +++ b/charts/stable/redmine/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for redmine */}} {{- include "redmine.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/redmine/values.yaml b/charts/stable/redmine/values.yaml index 8f6de6a6e08..06cd7422325 100644 --- a/charts/stable/redmine/values.yaml +++ b/charts/stable/redmine/values.yaml @@ -11,12 +11,6 @@ env: # Anything but empty means true, empty means false REDMINE_NO_DB_MIGRATE: "{{ ternary \"true\" \"\" .Values.redmine.no_db_migrate }}" REDMINE_PLUGINS_MIGRATE: "{{ ternary \"true\" \"\" .Values.redmine.plugins_migrate }}" - -redmine: - plugins_migrate: true - no_db_migrate: false - -envValueFrom: REDMINE_DB_PASSWORD: secretKeyRef: name: dbcreds @@ -29,6 +23,9 @@ envValueFrom: secretKeyRef: name: redmine-secrets key: REDMINE_SECRET_KEY_BASE +redmine: + plugins_migrate: true + no_db_migrate: false securityContext: readOnlyRootFilesystem: false diff --git a/charts/stable/reg/Chart.yaml b/charts/stable/reg/Chart.yaml index 8a2b96b3362..97cf76da929 100644 --- a/charts/stable/reg/Chart.yaml +++ b/charts/stable/reg/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.16.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Docker registry v2 command line client and repo listing generator with security checks. home: https://github.com/truecharts/apps/tree/master/charts/stable/reg @@ -19,7 +19,7 @@ name: reg sources: - https://github.com/genuinetools/reg - https://github.com/k8s-at-home/container-images/ -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/reg/SCALE/migrations/migrate b/charts/stable/reg/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/reg/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/reg/templates/common.yaml b/charts/stable/reg/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/reg/templates/common.yaml +++ b/charts/stable/reg/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/remmina/Chart.yaml b/charts/stable/remmina/Chart.yaml index fbbd241072b..3dfe73c2b49 100644 --- a/charts/stable/remmina/Chart.yaml +++ b/charts/stable/remmina/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.2.0-rcgi" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A remote desktop client written in GTK home: https://github.com/truecharts/apps/tree/master/charts/stable/remmina icon: https://truecharts.org/_static/img/appicons/remmina.png @@ -22,7 +22,7 @@ sources: - https://github.com/linuxserver/docker-remmina - https://remmina.org/ type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/remmina/SCALE/migrations/migrate b/charts/stable/remmina/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/remmina/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/remmina/templates/common.yaml b/charts/stable/remmina/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/remmina/templates/common.yaml +++ b/charts/stable/remmina/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/requestrr/Chart.yaml b/charts/stable/requestrr/Chart.yaml index 5c139d4c7d9..ab3c702d191 100644 --- a/charts/stable/requestrr/Chart.yaml +++ b/charts/stable/requestrr/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: requestrr -version: 1.0.20 +version: 2.0.0 appVersion: "2.1.2" description: Requestrr is a chatbot used to simplify using services like Sonarr/Radarr/Ombi via the use of chat. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/requestrr/SCALE/migrations/migrate b/charts/stable/requestrr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/requestrr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/requestrr/templates/common.yaml b/charts/stable/requestrr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/requestrr/templates/common.yaml +++ b/charts/stable/requestrr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/resilio-sync/Chart.yaml b/charts/stable/resilio-sync/Chart.yaml index db4dc2638ae..73155ca2c92 100644 --- a/charts/stable/resilio-sync/Chart.yaml +++ b/charts/stable/resilio-sync/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.7.2.1375" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Resilio Sync is a fast, reliable, and simple file sync and share solution, powered by P2P technology home: https://github.com/truecharts/apps/tree/master/charts/stable/resilio-sync @@ -21,7 +21,7 @@ maintainers: name: resilio-sync sources: - https://github.com/orgs/linuxserver/packages/container/package/resilio-sync -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/resilio-sync/SCALE/migrations/migrate b/charts/stable/resilio-sync/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/resilio-sync/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/resilio-sync/templates/common.yaml b/charts/stable/resilio-sync/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/resilio-sync/templates/common.yaml +++ b/charts/stable/resilio-sync/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/rsnapshot/Chart.yaml b/charts/stable/rsnapshot/Chart.yaml index b9ea62ea993..5c3f3f2c9f2 100644 --- a/charts/stable/rsnapshot/Chart.yaml +++ b/charts/stable/rsnapshot/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: rsnapshot -version: 1.0.19 +version: 2.0.0 appVersion: "1.4.3" description: Rsnapshot is a filesystem snapshot utility based on rsync. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/rsnapshot/SCALE/migrations/migrate b/charts/stable/rsnapshot/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/rsnapshot/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/rsnapshot/templates/common.yaml b/charts/stable/rsnapshot/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/rsnapshot/templates/common.yaml +++ b/charts/stable/rsnapshot/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/rss-bridge/Chart.yaml b/charts/stable/rss-bridge/Chart.yaml index fb26aad547e..9beb1bbf298 100644 --- a/charts/stable/rss-bridge/Chart.yaml +++ b/charts/stable/rss-bridge/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: RSS-Bridge is a PHP project capable of generating RSS and Atom feeds for websites that don't have one. home: https://github.com/truecharts/apps/tree/master/charts/stable/rss-bridge icon: https://truecharts.org/_static/img/appicons/rss-bridge.png @@ -17,7 +17,7 @@ maintainers: name: rss-bridge sources: - https://github.com/RSS-Bridge/rss-bridge -version: 1.0.10 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/rss-bridge/SCALE/migrations/migrate b/charts/stable/rss-bridge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/rss-bridge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/rss-bridge/templates/common.yaml b/charts/stable/rss-bridge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/rss-bridge/templates/common.yaml +++ b/charts/stable/rss-bridge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/rsshub/Chart.yaml b/charts/stable/rsshub/Chart.yaml index 9a0d9d712e3..a3b27a28d6e 100644 --- a/charts/stable/rsshub/Chart.yaml +++ b/charts/stable/rsshub/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: rsshub -version: 1.0.41 +version: 2.0.0 appVersion: "latest" description: RSSHub can generate RSS feeds from pretty much everything type: application @@ -17,7 +17,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: redis.enabled name: redis repository: https://charts.truecharts.org diff --git a/charts/stable/rsshub/SCALE/migrations/migrate b/charts/stable/rsshub/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/rsshub/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/rsshub/questions.yaml b/charts/stable/rsshub/questions.yaml index 2e0ba558660..cbe732adc24 100644 --- a/charts/stable/rsshub/questions.yaml +++ b/charts/stable/rsshub/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/rsshub/templates/common.yaml b/charts/stable/rsshub/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/rsshub/templates/common.yaml +++ b/charts/stable/rsshub/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/rsshub/values.yaml b/charts/stable/rsshub/values.yaml index bf1b436ec41..92e63aaaaec 100644 --- a/charts/stable/rsshub/values.yaml +++ b/charts/stable/rsshub/values.yaml @@ -1,19 +1,13 @@ image: repository: tccr.io/truecharts/rsshub pullPolicy: IfNotPresent - tag: latest@sha256:73ef935db216aaac86f00a212338f6ad6765b87a3e4ed8d0c7e90bd6ff99605c + tag: latest@sha256:af727bc923259af5579afefbe38a9a97b430f6a5a38a79ab604288f0cc000012 browserlessImage: repository: tccr.io/truecharts/browserless-chrome tag: v1.53.0-chrome@sha256:bba7c84a5c8c3c2b9518d8543f08b3669eeeda16837af4dc4c8065b7d87be08e -envValueFrom: - REDIS_URL: - secretKeyRef: - name: rediscreds - key: url - -secret: +secretEnv: HTTP_BASIC_AUTH_NAME: "" HTTP_BASIC_AUTH_PASS: "" BITBUCKET_USERNAME: "" @@ -34,6 +28,10 @@ env: # ALLOW_ORIGIN: "" DISALLOW_ROBOT: false TITLE_LENGTH_LIMIT: 150 + REDIS_URL: + secretKeyRef: + name: rediscreds + key: url service: main: diff --git a/charts/stable/sabnzbd/Chart.yaml b/charts/stable/sabnzbd/Chart.yaml index 3d9e98511af..bda3d1edb08 100644 --- a/charts/stable/sabnzbd/Chart.yaml +++ b/charts/stable/sabnzbd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.5.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Free and easy binary newsreader home: https://github.com/truecharts/apps/tree/master/charts/stable/sabnzbd @@ -20,7 +20,7 @@ name: sabnzbd sources: - https://sabnzbd.org/ type: application -version: 10.0.20 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/sabnzbd/SCALE/migrations/migrate b/charts/stable/sabnzbd/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/sabnzbd/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/sabnzbd/templates/common.yaml b/charts/stable/sabnzbd/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/sabnzbd/templates/common.yaml +++ b/charts/stable/sabnzbd/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/satisfactory/.helmignore b/charts/stable/satisfactory/.helmignore similarity index 100% rename from charts/games/satisfactory/.helmignore rename to charts/stable/satisfactory/.helmignore diff --git a/charts/games/satisfactory/CHANGELOG.md b/charts/stable/satisfactory/CHANGELOG.md similarity index 100% rename from charts/games/satisfactory/CHANGELOG.md rename to charts/stable/satisfactory/CHANGELOG.md diff --git a/charts/games/minecraft-java/CONFIG.md b/charts/stable/satisfactory/CONFIG.md similarity index 100% rename from charts/games/minecraft-java/CONFIG.md rename to charts/stable/satisfactory/CONFIG.md diff --git a/charts/games/satisfactory/Chart.yaml b/charts/stable/satisfactory/Chart.yaml similarity index 95% rename from charts/games/satisfactory/Chart.yaml rename to charts/stable/satisfactory/Chart.yaml index 983a50db239..bc0bd6417b8 100644 --- a/charts/games/satisfactory/Chart.yaml +++ b/charts/stable/satisfactory/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.2.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Satisfactory Dedicated Server home: https://github.com/truecharts/apps/tree/master/charts/games/satisfactory @@ -20,7 +20,7 @@ sources: - https://github.com/wolveix/satisfactory-server - https://hub.docker.com/r/wolveix/satisfactory-server type: application -version: 1.0.7 +version: 2.0.0 annotations: truecharts.org/catagories: | - games diff --git a/charts/games/satisfactory/README.md b/charts/stable/satisfactory/README.md similarity index 100% rename from charts/games/satisfactory/README.md rename to charts/stable/satisfactory/README.md diff --git a/charts/stable/satisfactory/SCALE/migrations/migrate b/charts/stable/satisfactory/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/satisfactory/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/games/satisfactory/helm-values.md b/charts/stable/satisfactory/helm-values.md similarity index 100% rename from charts/games/satisfactory/helm-values.md rename to charts/stable/satisfactory/helm-values.md diff --git a/charts/games/satisfactory/questions.yaml b/charts/stable/satisfactory/questions.yaml similarity index 100% rename from charts/games/satisfactory/questions.yaml rename to charts/stable/satisfactory/questions.yaml diff --git a/charts/games/satisfactory/security.md b/charts/stable/satisfactory/security.md similarity index 100% rename from charts/games/satisfactory/security.md rename to charts/stable/satisfactory/security.md diff --git a/charts/stable/satisfactory/templates/common.yaml b/charts/stable/satisfactory/templates/common.yaml new file mode 100644 index 00000000000..c1a366e1cf0 --- /dev/null +++ b/charts/stable/satisfactory/templates/common.yaml @@ -0,0 +1 @@ +{{ include "tc.common.loader.all" . }} diff --git a/charts/games/satisfactory/values.yaml b/charts/stable/satisfactory/values.yaml similarity index 100% rename from charts/games/satisfactory/values.yaml rename to charts/stable/satisfactory/values.yaml diff --git a/charts/stable/scrutiny/Chart.yaml b/charts/stable/scrutiny/Chart.yaml index 646a0934b85..0519b54d619 100644 --- a/charts/stable/scrutiny/Chart.yaml +++ b/charts/stable/scrutiny/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: scrutiny -version: 1.0.19 +version: 2.0.0 appVersion: "2021.12.16" description: Scrutiny WebUI for smartd S.M.A.R.T monitoring. Scrutiny is a Hard Drive Health Dashboard & Monitoring solution. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/scrutiny/SCALE/migrations/migrate b/charts/stable/scrutiny/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/scrutiny/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/scrutiny/templates/common.yaml b/charts/stable/scrutiny/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/scrutiny/templates/common.yaml +++ b/charts/stable/scrutiny/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/ser2sock/Chart.yaml b/charts/stable/ser2sock/Chart.yaml index a53cbb821d4..d251b79c0d6 100644 --- a/charts/stable/ser2sock/Chart.yaml +++ b/charts/stable/ser2sock/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Serial to Socket Redirector home: https://github.com/truecharts/apps/tree/master/charts/stable/ser2sock icon: https://truecharts.org/_static/img/appicons/ser2sock.png @@ -18,7 +18,7 @@ name: ser2sock sources: - https://github.com/nutechsoftware/ser2sock - https://github.com/tenstartups/ser2sock -version: 5.0.19 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/ser2sock/SCALE/migrations/migrate b/charts/stable/ser2sock/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ser2sock/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ser2sock/templates/common.yaml b/charts/stable/ser2sock/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ser2sock/templates/common.yaml +++ b/charts/stable/ser2sock/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/shiori/Chart.yaml b/charts/stable/shiori/Chart.yaml index 7c79910ec77..a79f4b70836 100644 --- a/charts/stable/shiori/Chart.yaml +++ b/charts/stable/shiori/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 appVersion: "1.5.0" -version: 5.0.23 +version: 6.0.0 kubeVersion: '>=1.16.0-0' name: shiori description: A simple bookmark manager built with Go @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/shiori/SCALE/migrations/migrate b/charts/stable/shiori/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/shiori/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/shiori/templates/common.yaml b/charts/stable/shiori/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/shiori/templates/common.yaml +++ b/charts/stable/shiori/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/shiori/values.yaml b/charts/stable/shiori/values.yaml index a25f1fc611d..1596ffeb586 100644 --- a/charts/stable/shiori/values.yaml +++ b/charts/stable/shiori/values.yaml @@ -16,8 +16,6 @@ podSecurityContext: env: SHIORI_PG_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" SHIORI_PG_USER: "{{ .Values.postgresql.postgresqlUsername }}" - -envValueFrom: SHIORI_PG_PASS: secretKeyRef: name: dbcreds diff --git a/charts/stable/shlink-web-client/Chart.yaml b/charts/stable/shlink-web-client/Chart.yaml index 49220bd1534..7826825f17d 100644 --- a/charts/stable/shlink-web-client/Chart.yaml +++ b/charts/stable/shlink-web-client/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.7.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A ReactJS-based progressive web application for Shlink. home: https://github.com/truecharts/apps/tree/master/charts/stable/shlink-web-client icon: https://truecharts.org/_static/img/appicons/shlink-web-client.png @@ -20,7 +20,7 @@ name: shlink-web-client sources: - https://github.com/shlinkio/shlink-web-client type: application -version: 2.0.20 +version: 3.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/shlink-web-client/SCALE/migrations/migrate b/charts/stable/shlink-web-client/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/shlink-web-client/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/shlink-web-client/templates/common.yaml b/charts/stable/shlink-web-client/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/shlink-web-client/templates/common.yaml +++ b/charts/stable/shlink-web-client/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/shlink/Chart.yaml b/charts/stable/shlink/Chart.yaml index 1d0b9250ba0..4879ec76a79 100644 --- a/charts/stable/shlink/Chart.yaml +++ b/charts/stable/shlink/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.1.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -28,7 +28,7 @@ name: shlink sources: - https://github.com/shlinkio/shlink type: application -version: 2.0.27 +version: 3.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/shlink/SCALE/migrations/migrate b/charts/stable/shlink/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/shlink/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/shlink/templates/common.yaml b/charts/stable/shlink/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/shlink/templates/common.yaml +++ b/charts/stable/shlink/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/shlink/values.yaml b/charts/stable/shlink/values.yaml index 19bb55ab922..179de7e2502 100644 --- a/charts/stable/shlink/values.yaml +++ b/charts/stable/shlink/values.yaml @@ -36,8 +36,6 @@ env: DB_DRIVER: "postgres" DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" - -envValueFrom: DB_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/shorturl/Chart.yaml b/charts/stable/shorturl/Chart.yaml index 2a0eebc1559..1ecbbfd2694 100644 --- a/charts/stable/shorturl/Chart.yaml +++ b/charts/stable/shorturl/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.1.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Self hosted web app for shortening urls (URL shortener) home: https://github.com/truecharts/apps/tree/master/charts/stable/shorturl icon: https://truecharts.org/_static/img/appicons/shorturl.png @@ -22,7 +22,7 @@ sources: - https://github.com/prologic/shorturl - https://github.com/nicholaswilde/docker-shorturl type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/shorturl/SCALE/migrations/migrate b/charts/stable/shorturl/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/shorturl/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/shorturl/templates/common.yaml b/charts/stable/shorturl/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/shorturl/templates/common.yaml +++ b/charts/stable/shorturl/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/sickchill/Chart.yaml b/charts/stable/sickchill/Chart.yaml index 637e8b9bd99..e2d3a763b6e 100644 --- a/charts/stable/sickchill/Chart.yaml +++ b/charts/stable/sickchill/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2022.2.20" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An Automatic Video Library Manager for TV Shows home: https://github.com/truecharts/apps/tree/master/charts/stable/sickchill icon: https://truecharts.org/_static/img/appicons/sickchill.png @@ -22,7 +22,7 @@ sources: - https://github.com/linuxserver/docker-sickchill - https://github.com/SickChill/SickChill type: application -version: 2.0.26 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/sickchill/SCALE/migrations/migrate b/charts/stable/sickchill/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/sickchill/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/sickchill/templates/common.yaml b/charts/stable/sickchill/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/sickchill/templates/common.yaml +++ b/charts/stable/sickchill/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/sickgear/Chart.yaml b/charts/stable/sickgear/Chart.yaml index dee9ffd522d..48a3b910635 100644 --- a/charts/stable/sickgear/Chart.yaml +++ b/charts/stable/sickgear/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.25.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Provides management of TV shows and/or Anime, it detects new episodes, links downloader apps, and more home: https://github.com/truecharts/apps/tree/master/charts/stable/sickgear @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-sickgear - https://github.com/SickGear/SickGear type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/sickgear/SCALE/migrations/migrate b/charts/stable/sickgear/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/sickgear/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/sickgear/templates/common.yaml b/charts/stable/sickgear/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/sickgear/templates/common.yaml +++ b/charts/stable/sickgear/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/smokeping/Chart.yaml b/charts/stable/smokeping/Chart.yaml index e932ea20c99..d02a6bb31ae 100644 --- a/charts/stable/smokeping/Chart.yaml +++ b/charts/stable/smokeping/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.7.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Keep track of your network latency. home: https://github.com/truecharts/apps/tree/master/charts/stable/smokeping icon: https://truecharts.org/_static/img/appicons/smokeping.png @@ -21,7 +21,7 @@ sources: - https://oss.oetiker.ch/smokeping/ - https://hub.docker.com/r/linuxserver/smokeping type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/smokeping/SCALE/migrations/migrate b/charts/stable/smokeping/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/smokeping/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/smokeping/templates/common.yaml b/charts/stable/smokeping/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/smokeping/templates/common.yaml +++ b/charts/stable/smokeping/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/snapdrop/Chart.yaml b/charts/stable/snapdrop/Chart.yaml index ad066ca4291..3bf6fb1f29b 100644 --- a/charts/stable/snapdrop/Chart.yaml +++ b/charts/stable/snapdrop/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Snapdrop A local file sharing in your browser. Inspired by Apple's Airdrop. home: https://github.com/truecharts/apps/tree/master/charts/stable/snapdrop icon: https://truecharts.org/_static/img/appicons/snapdrop.png @@ -17,7 +17,7 @@ maintainers: name: snapdrop sources: - https://github.com/linuxserver/docker-snapdrop -version: 1.0.14 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/snapdrop/SCALE/migrations/migrate b/charts/stable/snapdrop/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/snapdrop/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/snapdrop/templates/common.yaml b/charts/stable/snapdrop/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/snapdrop/templates/common.yaml +++ b/charts/stable/snapdrop/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/snipe-it/Chart.yaml b/charts/stable/snipe-it/Chart.yaml index db0d057ecd1..a9f38da5b98 100644 --- a/charts/stable/snipe-it/Chart.yaml +++ b/charts/stable/snipe-it/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.0.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -29,7 +29,7 @@ name: snipe-it sources: - https://snipeitapp.com/ - https://hub.docker.com/r/linuxserver/ -version: 2.0.27 +version: 3.0.0 annotations: truecharts.org/catagories: | - management diff --git a/charts/stable/snipe-it/SCALE/migrations/migrate b/charts/stable/snipe-it/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/snipe-it/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/snipe-it/templates/common.yaml b/charts/stable/snipe-it/templates/common.yaml index 4c91ac2d4f2..4f31f22f8ab 100644 --- a/charts/stable/snipe-it/templates/common.yaml +++ b/charts/stable/snipe-it/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render secrets for snipeit */}} {{- include "snipeit.secrets" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/snipe-it/values.yaml b/charts/stable/snipe-it/values.yaml index 431825b17a1..98d13167d59 100644 --- a/charts/stable/snipe-it/values.yaml +++ b/charts/stable/snipe-it/values.yaml @@ -38,8 +38,6 @@ env: # Login LOGIN_MAX_ATTEMPTS: 5 LOGIN_LOCKOUT_DURATION: 60 - -envValueFrom: DB_HOST: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/sonarr/Chart.yaml b/charts/stable/sonarr/Chart.yaml index 7184c1a62e7..08863145a30 100644 --- a/charts/stable/sonarr/Chart.yaml +++ b/charts/stable/sonarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.0.8.1507" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Smart PVR for newsgroup and bittorrent users home: https://github.com/truecharts/apps/tree/master/charts/stable/sonarr @@ -21,7 +21,7 @@ name: sonarr sources: - https://github.com/Sonarr/Sonarr type: application -version: 10.0.21 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/sonarr/SCALE/migrations/migrate b/charts/stable/sonarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/sonarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/sonarr/templates/common.yaml b/charts/stable/sonarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/sonarr/templates/common.yaml +++ b/charts/stable/sonarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/speedtest-exporter/Chart.yaml b/charts/stable/speedtest-exporter/Chart.yaml index fcd3a191bf2..7dce40e616b 100644 --- a/charts/stable/speedtest-exporter/Chart.yaml +++ b/charts/stable/speedtest-exporter/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.5.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Speedtest Exporter made in python using the official speedtest bin icon: https://truecharts.org/_static/img/appicons/speedtest-exporter.png @@ -21,7 +21,7 @@ name: speedtest-exporter sources: - https://github.com/MiguelNdeCarvalho/speedtest-exporter/ type: application -version: 2.0.24 +version: 3.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/stable/speedtest-exporter/SCALE/migrations/migrate b/charts/stable/speedtest-exporter/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/speedtest-exporter/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/speedtest-exporter/templates/common.yaml b/charts/stable/speedtest-exporter/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/speedtest-exporter/templates/common.yaml +++ b/charts/stable/speedtest-exporter/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/speedtest-exporter/values.yaml b/charts/stable/speedtest-exporter/values.yaml index 7542ace20bc..879465d0bd2 100644 --- a/charts/stable/speedtest-exporter/values.yaml +++ b/charts/stable/speedtest-exporter/values.yaml @@ -56,7 +56,7 @@ metrics: # description: Internet download speed is averaging {{ "{{ humanize $value }}" }} Mbps. # summary: SpeedTest slow internet download. # expr: | - # avg_over_time(speedtest_download_bits_per_second{job=~".*{{ include "common.names.fullname" . }}.*"}[4h]) + # avg_over_time(speedtest_download_bits_per_second{job=~".*{{ include "tc.common.names.fullname" . }}.*"}[4h]) # < {{ .Values.metrics.prometheusRule.downloadLimit }} # for: 0m # labels: diff --git a/charts/stable/spotweb/Chart.yaml b/charts/stable/spotweb/Chart.yaml index b776a45a06d..482062c3424 100644 --- a/charts/stable/spotweb/Chart.yaml +++ b/charts/stable/spotweb/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 appVersion: "1.5.1" kubeVersion: '>=1.16.0-0' -version: 2.0.15 +version: 3.0.0 name: spotweb description: Spotweb is a decentralized usenet community based on the Spotnet protocol. type: application @@ -18,7 +18,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/spotweb/SCALE/migrations/migrate b/charts/stable/spotweb/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/spotweb/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/spotweb/questions.yaml b/charts/stable/spotweb/questions.yaml index aa92a6bd0c4..380a60be352 100644 --- a/charts/stable/spotweb/questions.yaml +++ b/charts/stable/spotweb/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/spotweb/templates/common.yaml b/charts/stable/spotweb/templates/common.yaml index 903d4c81e3d..6d90e9bc83e 100644 --- a/charts/stable/spotweb/templates/common.yaml +++ b/charts/stable/spotweb/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/spotweb/values.yaml b/charts/stable/spotweb/values.yaml index 56c77926599..d2847983e1d 100644 --- a/charts/stable/spotweb/values.yaml +++ b/charts/stable/spotweb/values.yaml @@ -16,8 +16,6 @@ env: DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" DB_SCHEMA: "public" - -envValueFrom: DB_PASSWORD: secretKeyRef: name: dbcreds @@ -27,7 +25,7 @@ envValueFrom: name: dbcreds key: plainhost -secret: +secretEnv: SPOTWEB_USERNAME: "myawesomeuser" SPOTWEB_PASSWORD: "changeme" diff --git a/charts/stable/sqlitebrowser/Chart.yaml b/charts/stable/sqlitebrowser/Chart.yaml index 83329ea99b4..e926a15ee5e 100644 --- a/charts/stable/sqlitebrowser/Chart.yaml +++ b/charts/stable/sqlitebrowser/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.12.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A high quality, visual, open source tool to create, design, and edit database files compatible with SQLite home: https://github.com/truecharts/apps/tree/master/charts/stable/sqlitebrowser @@ -23,7 +23,7 @@ sources: - https://github.com/linuxserver/docker-sqlitebrowser - https://sqlitebrowser.org/ type: application -version: 2.0.20 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/sqlitebrowser/SCALE/migrations/migrate b/charts/stable/sqlitebrowser/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/sqlitebrowser/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/sqlitebrowser/templates/common.yaml b/charts/stable/sqlitebrowser/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/sqlitebrowser/templates/common.yaml +++ b/charts/stable/sqlitebrowser/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/stash/Chart.yaml b/charts/stable/stash/Chart.yaml index a9e489ad726..2e2a38830cf 100644 --- a/charts/stable/stash/Chart.yaml +++ b/charts/stable/stash/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.15.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: An organizer for your porn, written in Go home: https://github.com/truecharts/apps/tree/master/charts/stable/stash icon: https://truecharts.org/_static/img/appicons/stash.png @@ -18,7 +18,7 @@ name: stash sources: - https://github.com/stashapp/stash - https://hub.docker.com/r/stashapp/stash -version: 6.0.22 +version: 7.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/stash/SCALE/migrations/migrate b/charts/stable/stash/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/stash/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/stash/templates/common.yaml b/charts/stable/stash/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/stash/templates/common.yaml +++ b/charts/stable/stash/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/static/Chart.yaml b/charts/stable/static/Chart.yaml index b02ec54b4b3..bac235bd68a 100644 --- a/charts/stable/static/Chart.yaml +++ b/charts/stable/static/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "ee8a20c" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A self-hosted static file serving app which does nothing more than just serve up static files from a mounted volume. home: https://github.com/truecharts/apps/tree/master/charts/stable/static @@ -23,7 +23,7 @@ sources: - https://github.com/prologic/static - https://github.com/nicholaswilde/docker-static type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/static/SCALE/migrations/migrate b/charts/stable/static/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/static/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/static/templates/common.yaml b/charts/stable/static/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/static/templates/common.yaml +++ b/charts/stable/static/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/statping/Chart.yaml b/charts/stable/statping/Chart.yaml index a6cc394244f..1ffaa444d4e 100644 --- a/charts/stable/statping/Chart.yaml +++ b/charts/stable/statping/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "0.90.78" description: Status page for monitoring your websites and applications name: statping -version: 5.0.25 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - statping @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/statping/SCALE/migrations/migrate b/charts/stable/statping/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/statping/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/statping/questions.yaml b/charts/stable/statping/questions.yaml index 77b921fdc06..66a0c55fbd1 100644 --- a/charts/stable/statping/questions.yaml +++ b/charts/stable/statping/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/statping/templates/common.yaml b/charts/stable/statping/templates/common.yaml index 86e494807ae..21f0c9783c3 100644 --- a/charts/stable/statping/templates/common.yaml +++ b/charts/stable/statping/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Append the hardcoded settings */}} {{- define "statping.hardcodedValues" -}} @@ -9,4 +9,4 @@ env: {{- $_ := mergeOverwrite .Values (include "statping.hardcodedValues" . | fromYaml) -}} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/statping/values.yaml b/charts/stable/statping/values.yaml index 5361376971a..6ab4968ff6a 100644 --- a/charts/stable/statping/values.yaml +++ b/charts/stable/statping/values.yaml @@ -8,7 +8,7 @@ image: # -- environment variables. See [application docs](https://github.com/statping/statping/wiki/Config-with-.env-File) for more details. # @default -- See below -secret: +secretEnv: # -- dashboard admin user (needed to edit) ADMIN_USER: "admin" # -- dashboard admin password (needed to edit) @@ -32,8 +32,6 @@ env: DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" DB_PORT: "5432" POSTGRES_SSLMODE: "disable" - -envValueFrom: DB_PASS: secretKeyRef: name: dbcreds diff --git a/charts/stable/storj-node/Chart.yaml b/charts/stable/storj-node/Chart.yaml index c9562c8e0d3..efa09aa1a6c 100644 --- a/charts/stable/storj-node/Chart.yaml +++ b/charts/stable/storj-node/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.56.4" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Storj is an S3-compatible platform and suite of decentralized applications that allows you to store data in a secure and decentralized manner home: https://github.com/truecharts/apps/tree/master/charts/stable/storj-node icon: https://truecharts.org/_static/img/appicons/storj-node.png @@ -20,7 +20,7 @@ sources: - https://github.com/storj/storj - https://docs.storj.io/node/ - https://hub.docker.com/r/storjlabs/storagenode -version: 1.0.28 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/storj-node/SCALE/migrations/migrate b/charts/stable/storj-node/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/storj-node/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/storj-node/questions.yaml b/charts/stable/storj-node/questions.yaml index 4562f6fa174..d375babb4d1 100644 --- a/charts/stable/storj-node/questions.yaml +++ b/charts/stable/storj-node/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/storj-node/templates/common.yaml b/charts/stable/storj-node/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/storj-node/templates/common.yaml +++ b/charts/stable/storj-node/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/storj-node/values.yaml b/charts/stable/storj-node/values.yaml index bf36b88a5b3..dea415ae713 100644 --- a/charts/stable/storj-node/values.yaml +++ b/charts/stable/storj-node/values.yaml @@ -10,7 +10,7 @@ securityContext: podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: WALLET: "walletaddress" diff --git a/charts/stable/strapi/Chart.yaml b/charts/stable/strapi/Chart.yaml index e679a4c0a39..fd79d099dd1 100644 --- a/charts/stable/strapi/Chart.yaml +++ b/charts/stable/strapi/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.6.8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -24,7 +24,7 @@ sources: - https://hub.docker.com/r/strapi/strapi - https://github.com/strapi/strapi - https://docs.strapi.io/developer-docs/latest/setup-deployment-guides/installation/docker.html#creating-a-strapi-project -version: 2.0.23 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/strapi/SCALE/migrations/migrate b/charts/stable/strapi/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/strapi/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/strapi/templates/common.yaml b/charts/stable/strapi/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/strapi/templates/common.yaml +++ b/charts/stable/strapi/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/strapi/values.yaml b/charts/stable/strapi/values.yaml index ccbd29773d8..9b134a9234d 100644 --- a/charts/stable/strapi/values.yaml +++ b/charts/stable/strapi/values.yaml @@ -18,8 +18,6 @@ env: DATABASE_USERNAME: "{{ .Values.postgresql.postgresqlUsername }}" NODE_ENV: "production" EXTRA_ARGS: "" - -envValueFrom: DATABASE_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/synapse/Chart.yaml b/charts/stable/synapse/Chart.yaml index b1480b61f86..f364d61ea8a 100644 --- a/charts/stable/synapse/Chart.yaml +++ b/charts/stable/synapse/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.60.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -24,7 +24,7 @@ maintainers: name: synapse sources: [] type: application -version: 2.1.9 +version: 3.0.0 annotations: truecharts.org/catagories: | - cloud diff --git a/charts/stable/synapse/SCALE/migrations/migrate b/charts/stable/synapse/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/synapse/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/synapse/templates/_configmap.tpl b/charts/stable/synapse/templates/_configmap.tpl index 9b66796a21a..bc1c4c5a890 100644 --- a/charts/stable/synapse/templates/_configmap.tpl +++ b/charts/stable/synapse/templates/_configmap.tpl @@ -6,7 +6,7 @@ kind: ConfigMap metadata: name: synapse-config labels: - {{ include "common.labels" . | nindent 4 }} + {{ include "tc.common.labels" . | nindent 4 }} annotations: rollme: {{ randAlphaNum 5 | quote }} data: diff --git a/charts/stable/synapse/templates/_secret.tpl b/charts/stable/synapse/templates/_secret.tpl index 14f6c977d46..5c5ea0e576e 100644 --- a/charts/stable/synapse/templates/_secret.tpl +++ b/charts/stable/synapse/templates/_secret.tpl @@ -11,7 +11,7 @@ kind: Secret metadata: name: synapse-secret-macaroon labels: - {{ include "common.labels" . | nindent 4 }} + {{ include "tc.common.labels" . | nindent 4 }} annotations: rollme: {{ randAlphaNum 5 | quote }} data: @@ -22,7 +22,7 @@ kind: Secret metadata: name: synapse-secret labels: - {{ include "common.labels" . | nindent 4 }} + {{ include "tc.common.labels" . | nindent 4 }} annotations: rollme: {{ randAlphaNum 5 | quote }} stringData: diff --git a/charts/stable/synapse/templates/common.yaml b/charts/stable/synapse/templates/common.yaml index e9582539afe..5ffbc215874 100644 --- a/charts/stable/synapse/templates/common.yaml +++ b/charts/stable/synapse/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for synapse */}} {{- include "synapse.config" . }} @@ -11,4 +11,4 @@ {{- $_ := set .Values.ingress.main "fixedMiddlewares" $newMiddlewares -}} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/synapse/values.yaml b/charts/stable/synapse/values.yaml index a5e23a259f2..7dde05db409 100644 --- a/charts/stable/synapse/values.yaml +++ b/charts/stable/synapse/values.yaml @@ -43,7 +43,7 @@ service: securityContext: allowPrivilegeEscalation: true -secret: {} +secretEnv: {} installContainers: generate-signing-key: diff --git a/charts/stable/synclounge/Chart.yaml b/charts/stable/synclounge/Chart.yaml index 9dd362b6ac4..d72e70860e2 100644 --- a/charts/stable/synclounge/Chart.yaml +++ b/charts/stable/synclounge/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: synclounge -version: 1.0.21 +version: 2.0.0 appVersion: "5.1.117" description: Synclounge is a third party tool that allows you to watch Plex in sync with your friends/family, wherever you are. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/synclounge/SCALE/migrations/migrate b/charts/stable/synclounge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/synclounge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/synclounge/templates/common.yaml b/charts/stable/synclounge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/synclounge/templates/common.yaml +++ b/charts/stable/synclounge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/syncthing/Chart.yaml b/charts/stable/syncthing/Chart.yaml index 2555f472e57..8cc98f623d6 100644 --- a/charts/stable/syncthing/Chart.yaml +++ b/charts/stable/syncthing/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.20.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: P2P file synchronization application home: https://github.com/truecharts/apps/tree/master/charts/stable/syncthing @@ -21,7 +21,7 @@ sources: - https://github.com/syncthing/syncthing - https://hub.docker.com/r/syncthing/syncthing type: application -version: 10.0.22 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/syncthing/SCALE/migrations/migrate b/charts/stable/syncthing/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/syncthing/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/syncthing/templates/common.yaml b/charts/stable/syncthing/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/syncthing/templates/common.yaml +++ b/charts/stable/syncthing/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/syslog-ng/Chart.yaml b/charts/stable/syslog-ng/Chart.yaml index 79fcb24ee50..b4751f4c905 100644 --- a/charts/stable/syslog-ng/Chart.yaml +++ b/charts/stable/syslog-ng/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: syslog-ng -version: 1.0.20 +version: 2.0.0 appVersion: "3.36.1" description: syslog-ng allows you to flexibly collect, parse, classify, rewrite and correlate logs. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/syslog-ng/SCALE/migrations/migrate b/charts/stable/syslog-ng/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/syslog-ng/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/syslog-ng/templates/common.yaml b/charts/stable/syslog-ng/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/syslog-ng/templates/common.yaml +++ b/charts/stable/syslog-ng/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/tautulli/Chart.yaml b/charts/stable/tautulli/Chart.yaml index 3672d3cdc5b..94df18f1638 100644 --- a/charts/stable/tautulli/Chart.yaml +++ b/charts/stable/tautulli/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.10.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A Python based monitoring and tracking tool for Plex Media Server home: https://github.com/truecharts/apps/tree/master/charts/stable/tautulli @@ -20,7 +20,7 @@ name: tautulli sources: - https://github.com/Tautulli/Tautulli type: application -version: 10.0.22 +version: 11.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/tautulli/SCALE/migrations/migrate b/charts/stable/tautulli/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/tautulli/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/tautulli/templates/common.yaml b/charts/stable/tautulli/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/tautulli/templates/common.yaml +++ b/charts/stable/tautulli/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/tdarr-node/Chart.yaml b/charts/stable/tdarr-node/Chart.yaml index 5f5635e3bb8..6b0df5f8287 100644 --- a/charts/stable/tdarr-node/Chart.yaml +++ b/charts/stable/tdarr-node/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.00.18.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Audio/Video library transcoding automation home: https://github.com/truecharts/apps/tree/master/charts/stable/tdarr-node @@ -22,7 +22,7 @@ sources: - https://github.com/HaveAGitGat/Tdarr - https://hub.docker.com/r/haveagitgat/tdarr_node type: application -version: 1.0.6 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/tdarr-node/SCALE/migrations/migrate b/charts/stable/tdarr-node/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/tdarr-node/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/tdarr-node/templates/common.yaml b/charts/stable/tdarr-node/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/tdarr-node/templates/common.yaml +++ b/charts/stable/tdarr-node/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/tdarr/Chart.yaml b/charts/stable/tdarr/Chart.yaml index 0fc7ffa3ef5..d1fff3c2fbe 100644 --- a/charts/stable/tdarr/Chart.yaml +++ b/charts/stable/tdarr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.00.18.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Audio/Video library transcoding automation home: https://github.com/truecharts/apps/tree/master/charts/stable/tdarr @@ -22,7 +22,7 @@ sources: - https://github.com/HaveAGitGat/Tdarr - https://hub.docker.com/r/haveagitgat/tdarr type: application -version: 1.0.7 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/tdarr/SCALE/migrations/migrate b/charts/stable/tdarr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/tdarr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/tdarr/templates/common.yaml b/charts/stable/tdarr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/tdarr/templates/common.yaml +++ b/charts/stable/tdarr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/teamspeak3/Chart.yaml b/charts/stable/teamspeak3/Chart.yaml index 4625eb8fd7a..860e90f31f7 100644 --- a/charts/stable/teamspeak3/Chart.yaml +++ b/charts/stable/teamspeak3/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.13.6" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: TeamSpeak is software for quality voice communication via the Internet. home: https://github.com/truecharts/apps/tree/master/charts/stable/teamspeak3 @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/_/teamspeak - https://www.teamspeak.com/en/ type: application -version: 3.0.21 +version: 4.0.0 annotations: truecharts.org/catagories: | - voice diff --git a/charts/stable/teamspeak3/SCALE/migrations/migrate b/charts/stable/teamspeak3/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/teamspeak3/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/teamspeak3/templates/common.yaml b/charts/stable/teamspeak3/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/teamspeak3/templates/common.yaml +++ b/charts/stable/teamspeak3/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/teedy/Chart.yaml b/charts/stable/teedy/Chart.yaml index ee681cb358e..ca5eaf829a3 100644 --- a/charts/stable/teedy/Chart.yaml +++ b/charts/stable/teedy/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "1.10" description: Teedy is an open source, lightweight document management system for individuals and businesses. name: teedy -version: 5.0.23 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - teedy @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/teedy/SCALE/migrations/migrate b/charts/stable/teedy/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/teedy/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/teedy/questions.yaml b/charts/stable/teedy/questions.yaml index 468334ccae7..d9a0c294bf0 100644 --- a/charts/stable/teedy/questions.yaml +++ b/charts/stable/teedy/questions.yaml @@ -75,7 +75,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/teedy/templates/common.yaml b/charts/stable/teedy/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/teedy/templates/common.yaml +++ b/charts/stable/teedy/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/teedy/values.yaml b/charts/stable/teedy/values.yaml index 57798593229..9da3d50b669 100644 --- a/charts/stable/teedy/values.yaml +++ b/charts/stable/teedy/values.yaml @@ -8,7 +8,7 @@ image: # -- environment variables. See [application docs](https://github.com/sismics/docs) for more details. # @default -- See below -secret: +secretEnv: # -- Defines the e-mail-address the admin user should have upon initialization DOCS_ADMIN_EMAIL_INIT: "" # -- Defines the password the admin user should have upon initialization. Needs to be a bcrypt hash. @@ -28,8 +28,6 @@ env: # -- The port of the SMTP-Server which should be used DOCS_SMTP_PORT: 0 DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}" - -envValueFrom: DATABASE_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/stable/thelounge/Chart.yaml b/charts/stable/thelounge/Chart.yaml index 6f0493a03db..7fa88098e48 100644 --- a/charts/stable/thelounge/Chart.yaml +++ b/charts/stable/thelounge/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.3.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: The Lounge, modern web IRC client designed for self-hosting home: https://github.com/truecharts/apps/tree/master/charts/stable/thelounge icon: https://truecharts.org/_static/img/appicons/thelounge.png @@ -21,7 +21,7 @@ maintainers: name: thelounge sources: - https://github.com/thelounge/thelounge -version: 5.0.31 +version: 6.0.0 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/thelounge/SCALE/migrations/migrate b/charts/stable/thelounge/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/thelounge/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/thelounge/templates/common.yaml b/charts/stable/thelounge/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/thelounge/templates/common.yaml +++ b/charts/stable/thelounge/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/tinymediamanager/Chart.yaml b/charts/stable/tinymediamanager/Chart.yaml index b76d7609ea5..9f3efcd9cde 100644 --- a/charts/stable/tinymediamanager/Chart.yaml +++ b/charts/stable/tinymediamanager/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.2.8" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: TinyMediaManager is a full featured media manager to organize and clean up your media library. home: https://github.com/truecharts/apps/tree/master/charts/stable/tinymediamanager icon: https://truecharts.org/_static/img/appicons/tinymediamanager.png @@ -20,7 +20,7 @@ name: tinymediamanager sources: - https://hub.docker.com/r/tinymediamanager/tinymediamanager - https://gitlab.com/tinyMediaManager/tinyMediaManager -version: 1.0.18 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/tinymediamanager/SCALE/migrations/migrate b/charts/stable/tinymediamanager/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/tinymediamanager/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/tinymediamanager/questions.yaml b/charts/stable/tinymediamanager/questions.yaml index 02d68a879c4..1020a5271c2 100644 --- a/charts/stable/tinymediamanager/questions.yaml +++ b/charts/stable/tinymediamanager/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/tinymediamanager/templates/common.yaml b/charts/stable/tinymediamanager/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/tinymediamanager/templates/common.yaml +++ b/charts/stable/tinymediamanager/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/tinymediamanager/values.yaml b/charts/stable/tinymediamanager/values.yaml index 4fd980f090b..cadd40198a3 100644 --- a/charts/stable/tinymediamanager/values.yaml +++ b/charts/stable/tinymediamanager/values.yaml @@ -11,7 +11,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: PASSWORD: "" service: diff --git a/charts/stable/traccar/Chart.yaml b/charts/stable/traccar/Chart.yaml index cb77a80dbe6..c57fa466f3c 100644 --- a/charts/stable/traccar/Chart.yaml +++ b/charts/stable/traccar/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "5.0" description: Traccar is an open source GPS tracking system. name: traccar -version: 5.0.24 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - traccar @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/traccar/SCALE/migrations/migrate b/charts/stable/traccar/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/traccar/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/traccar/templates/common.yaml b/charts/stable/traccar/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/traccar/templates/common.yaml +++ b/charts/stable/traccar/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/traccar/values.yaml b/charts/stable/traccar/values.yaml index 7697860f316..761e86d45f9 100644 --- a/charts/stable/traccar/values.yaml +++ b/charts/stable/traccar/values.yaml @@ -15,8 +15,6 @@ env: LOGGER_CONSOLE: true DATABASE_DRIVER: "org.postgresql.Driver" DATABASE_USER: "{{ .Values.postgresql.postgresqlUsername }}" - -envValueFrom: DATABASE_PASSWORD: secretKeyRef: name: dbcreds diff --git a/charts/core/traefik/.helmignore b/charts/stable/traefik/.helmignore similarity index 100% rename from charts/core/traefik/.helmignore rename to charts/stable/traefik/.helmignore diff --git a/charts/core/traefik/CHANGELOG.md b/charts/stable/traefik/CHANGELOG.md similarity index 100% rename from charts/core/traefik/CHANGELOG.md rename to charts/stable/traefik/CHANGELOG.md diff --git a/charts/games/minetest/CONFIG.md b/charts/stable/traefik/CONFIG.md similarity index 100% rename from charts/games/minetest/CONFIG.md rename to charts/stable/traefik/CONFIG.md diff --git a/charts/core/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml similarity index 95% rename from charts/core/traefik/Chart.yaml rename to charts/stable/traefik/Chart.yaml index 60b4386e8c0..86f544d5459 100644 --- a/charts/core/traefik/Chart.yaml +++ b/charts/stable/traefik/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.6.7" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Traefik is a flexible reverse proxy and Ingress Provider. home: https://github.com/truecharts/apps/tree/master/charts/core/traefik @@ -22,7 +22,7 @@ sources: - https://github.com/traefik/traefik-helm-chart - https://traefik.io/ type: application -version: 11.3.9 +version: 12.0.0 annotations: truecharts.org/catagories: | - network diff --git a/charts/core/traefik/README.md b/charts/stable/traefik/README.md similarity index 100% rename from charts/core/traefik/README.md rename to charts/stable/traefik/README.md diff --git a/charts/core/traefik/crds/ingressroute.yaml b/charts/stable/traefik/crds/ingressroute.yaml similarity index 100% rename from charts/core/traefik/crds/ingressroute.yaml rename to charts/stable/traefik/crds/ingressroute.yaml diff --git a/charts/core/traefik/crds/ingressroutetcp.yaml b/charts/stable/traefik/crds/ingressroutetcp.yaml similarity index 100% rename from charts/core/traefik/crds/ingressroutetcp.yaml rename to charts/stable/traefik/crds/ingressroutetcp.yaml diff --git a/charts/core/traefik/crds/ingressrouteudp.yaml b/charts/stable/traefik/crds/ingressrouteudp.yaml similarity index 100% rename from charts/core/traefik/crds/ingressrouteudp.yaml rename to charts/stable/traefik/crds/ingressrouteudp.yaml diff --git a/charts/core/traefik/crds/middlewares.yaml b/charts/stable/traefik/crds/middlewares.yaml similarity index 100% rename from charts/core/traefik/crds/middlewares.yaml rename to charts/stable/traefik/crds/middlewares.yaml diff --git a/charts/core/traefik/crds/middlewarestcp.yaml b/charts/stable/traefik/crds/middlewarestcp.yaml similarity index 100% rename from charts/core/traefik/crds/middlewarestcp.yaml rename to charts/stable/traefik/crds/middlewarestcp.yaml diff --git a/charts/core/traefik/crds/serverstransports.yaml b/charts/stable/traefik/crds/serverstransports.yaml similarity index 100% rename from charts/core/traefik/crds/serverstransports.yaml rename to charts/stable/traefik/crds/serverstransports.yaml diff --git a/charts/core/traefik/crds/tlsoptions.yaml b/charts/stable/traefik/crds/tlsoptions.yaml similarity index 100% rename from charts/core/traefik/crds/tlsoptions.yaml rename to charts/stable/traefik/crds/tlsoptions.yaml diff --git a/charts/core/traefik/crds/tlsstores.yaml b/charts/stable/traefik/crds/tlsstores.yaml similarity index 100% rename from charts/core/traefik/crds/tlsstores.yaml rename to charts/stable/traefik/crds/tlsstores.yaml diff --git a/charts/core/traefik/crds/traefikservices.yaml b/charts/stable/traefik/crds/traefikservices.yaml similarity index 100% rename from charts/core/traefik/crds/traefikservices.yaml rename to charts/stable/traefik/crds/traefikservices.yaml diff --git a/charts/core/traefik/helm-values.md b/charts/stable/traefik/helm-values.md similarity index 100% rename from charts/core/traefik/helm-values.md rename to charts/stable/traefik/helm-values.md diff --git a/charts/core/traefik/questions.yaml b/charts/stable/traefik/questions.yaml similarity index 100% rename from charts/core/traefik/questions.yaml rename to charts/stable/traefik/questions.yaml diff --git a/charts/core/traefik/security.md b/charts/stable/traefik/security.md similarity index 100% rename from charts/core/traefik/security.md rename to charts/stable/traefik/security.md diff --git a/charts/core/traefik/templates/_args.tpl b/charts/stable/traefik/templates/_args.tpl similarity index 100% rename from charts/core/traefik/templates/_args.tpl rename to charts/stable/traefik/templates/_args.tpl diff --git a/charts/core/traefik/templates/_helpers.tpl b/charts/stable/traefik/templates/_helpers.tpl similarity index 94% rename from charts/core/traefik/templates/_helpers.tpl rename to charts/stable/traefik/templates/_helpers.tpl index 8c6c4ac96bc..ab55e4e7ec6 100644 --- a/charts/core/traefik/templates/_helpers.tpl +++ b/charts/stable/traefik/templates/_helpers.tpl @@ -5,7 +5,7 @@ service generated. Users can provide an override for an explicit service they want bound via `.Values.providers.kubernetesIngress.publishedService.pathOverride` */}} {{- define "providers.kubernetesIngress.publishedServicePath" -}} -{{- $fullName := include "common.names.fullname" . -}} +{{- $fullName := include "tc.common.names.fullname" . -}} {{- $defServiceName := printf "%s/%s-tcp" .Release.Namespace $fullName -}} {{- $servicePath := default $defServiceName .Values.providers.kubernetesIngress.publishedService.pathOverride }} {{- print $servicePath | trimSuffix "-" -}} diff --git a/charts/core/traefik/templates/_ingressclass.tpl b/charts/stable/traefik/templates/_ingressclass.tpl similarity index 94% rename from charts/core/traefik/templates/_ingressclass.tpl rename to charts/stable/traefik/templates/_ingressclass.tpl index 681ecc6fd0c..909e249d6a5 100644 --- a/charts/core/traefik/templates/_ingressclass.tpl +++ b/charts/stable/traefik/templates/_ingressclass.tpl @@ -16,7 +16,7 @@ metadata: annotations: ingressclass.kubernetes.io/is-default-class: {{ .Values.ingressClass.isDefaultClass | quote }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} name: {{ .Release.Name }} spec: controller: traefik.io/ingress-controller diff --git a/charts/core/traefik/templates/_ingressroute.tpl b/charts/stable/traefik/templates/_ingressroute.tpl similarity index 82% rename from charts/core/traefik/templates/_ingressroute.tpl rename to charts/stable/traefik/templates/_ingressroute.tpl index ac0deaff2a3..7f012c92350 100644 --- a/charts/core/traefik/templates/_ingressroute.tpl +++ b/charts/stable/traefik/templates/_ingressroute.tpl @@ -5,13 +5,13 @@ apiVersion: traefik.containo.us/v1alpha1 kind: IngressRoute metadata: - name: {{ include "common.names.fullname" . }}-dashboard + name: {{ include "tc.common.names.fullname" . }}-dashboard annotations: {{- with .Values.ingressRoute.dashboard.annotations }} {{- toYaml . | nindent 4 }} {{- end }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "tc.common.labels" . | nindent 4 }} spec: entryPoints: - main diff --git a/charts/core/traefik/templates/_portalhook.tpl b/charts/stable/traefik/templates/_portalhook.tpl similarity index 100% rename from charts/core/traefik/templates/_portalhook.tpl rename to charts/stable/traefik/templates/_portalhook.tpl diff --git a/charts/core/traefik/templates/_tlsoptions.tpl b/charts/stable/traefik/templates/_tlsoptions.tpl similarity index 100% rename from charts/core/traefik/templates/_tlsoptions.tpl rename to charts/stable/traefik/templates/_tlsoptions.tpl diff --git a/charts/core/traefik/templates/common.yaml b/charts/stable/traefik/templates/common.yaml similarity index 90% rename from charts/core/traefik/templates/common.yaml rename to charts/stable/traefik/templates/common.yaml index c87583e25bd..d078b251c20 100644 --- a/charts/core/traefik/templates/common.yaml +++ b/charts/stable/traefik/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{- if .Values.metrics }} {{- if .Values.metrics.prometheus }} @@ -21,4 +21,4 @@ {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/core/traefik/templates/middlewares/basic-middleware.yaml b/charts/stable/traefik/templates/middlewares/basic-middleware.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/basic-middleware.yaml rename to charts/stable/traefik/templates/middlewares/basic-middleware.yaml diff --git a/charts/core/traefik/templates/middlewares/basicauth.yaml b/charts/stable/traefik/templates/middlewares/basicauth.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/basicauth.yaml rename to charts/stable/traefik/templates/middlewares/basicauth.yaml diff --git a/charts/core/traefik/templates/middlewares/chain.yaml b/charts/stable/traefik/templates/middlewares/chain.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/chain.yaml rename to charts/stable/traefik/templates/middlewares/chain.yaml diff --git a/charts/core/traefik/templates/middlewares/forwardauth.yaml b/charts/stable/traefik/templates/middlewares/forwardauth.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/forwardauth.yaml rename to charts/stable/traefik/templates/middlewares/forwardauth.yaml diff --git a/charts/core/traefik/templates/middlewares/ipwhitelist.yaml b/charts/stable/traefik/templates/middlewares/ipwhitelist.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/ipwhitelist.yaml rename to charts/stable/traefik/templates/middlewares/ipwhitelist.yaml diff --git a/charts/core/traefik/templates/middlewares/ratelimit.yaml b/charts/stable/traefik/templates/middlewares/ratelimit.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/ratelimit.yaml rename to charts/stable/traefik/templates/middlewares/ratelimit.yaml diff --git a/charts/core/traefik/templates/middlewares/redirectScheme.yaml b/charts/stable/traefik/templates/middlewares/redirectScheme.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/redirectScheme.yaml rename to charts/stable/traefik/templates/middlewares/redirectScheme.yaml diff --git a/charts/core/traefik/templates/middlewares/redirectregex.yaml b/charts/stable/traefik/templates/middlewares/redirectregex.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/redirectregex.yaml rename to charts/stable/traefik/templates/middlewares/redirectregex.yaml diff --git a/charts/core/traefik/templates/middlewares/stripPrefixRegex.yaml b/charts/stable/traefik/templates/middlewares/stripPrefixRegex.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/stripPrefixRegex.yaml rename to charts/stable/traefik/templates/middlewares/stripPrefixRegex.yaml diff --git a/charts/core/traefik/templates/middlewares/tc-chains.yaml b/charts/stable/traefik/templates/middlewares/tc-chains.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/tc-chains.yaml rename to charts/stable/traefik/templates/middlewares/tc-chains.yaml diff --git a/charts/core/traefik/templates/middlewares/tc-headers.yaml b/charts/stable/traefik/templates/middlewares/tc-headers.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/tc-headers.yaml rename to charts/stable/traefik/templates/middlewares/tc-headers.yaml diff --git a/charts/core/traefik/templates/middlewares/tc-nextcloud.yaml b/charts/stable/traefik/templates/middlewares/tc-nextcloud.yaml similarity index 100% rename from charts/core/traefik/templates/middlewares/tc-nextcloud.yaml rename to charts/stable/traefik/templates/middlewares/tc-nextcloud.yaml diff --git a/charts/core/traefik/values.yaml b/charts/stable/traefik/values.yaml similarity index 89% rename from charts/core/traefik/values.yaml rename to charts/stable/traefik/values.yaml index 6322145ac05..101257e56c5 100644 --- a/charts/core/traefik/values.yaml +++ b/charts/stable/traefik/values.yaml @@ -237,55 +237,57 @@ probes: # -- Whether Role Based Access Control objects like roles and rolebindings should be created rbac: - enabled: true - rules: - - apiGroups: - - "" - resources: - - services - - endpoints - - secrets - verbs: - - get - - list - - watch - - apiGroups: - - extensions - - networking.k8s.io - resources: - - ingresses - - ingressclasses - verbs: - - get - - list - - watch - - apiGroups: - - extensions - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - traefik.containo.us - resources: - - ingressroutes - - ingressroutetcps - - ingressrouteudps - - middlewares - - middlewaretcps - - tlsoptions - - tlsstores - - traefikservices - - serverstransports - verbs: - - get - - list - - watch + main: + enabled: true + rules: + - apiGroups: + - "" + resources: + - services + - endpoints + - secrets + verbs: + - get + - list + - watch + - apiGroups: + - extensions + - networking.k8s.io + resources: + - ingresses + - ingressclasses + verbs: + - get + - list + - watch + - apiGroups: + - extensions + - networking.k8s.io + resources: + - ingresses/status + verbs: + - update + - apiGroups: + - traefik.containo.us + resources: + - ingressroutes + - ingressroutetcps + - ingressrouteudps + - middlewares + - middlewaretcps + - tlsoptions + - tlsstores + - traefikservices + - serverstransports + verbs: + - get + - list + - watch # -- The service account the pods will use to interact with the Kubernetes API serviceAccount: - create: true + main: + create: true # -- SCALE Middleware Handlers middlewares: diff --git a/charts/stable/transmission/Chart.yaml b/charts/stable/transmission/Chart.yaml index e72cce0c881..aa868f82058 100644 --- a/charts/stable/transmission/Chart.yaml +++ b/charts/stable/transmission/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.00" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: API Support for your favorite torrent trackers. home: https://github.com/truecharts/apps/tree/master/charts/stable/transmission @@ -22,7 +22,7 @@ sources: - https://github.com/transmission/transmission - https://hub.docker.com/r/linuxserver/transmission type: application -version: 11.0.19 +version: 12.0.0 annotations: truecharts.org/catagories: | - download-tools diff --git a/charts/stable/transmission/SCALE/migrations/migrate b/charts/stable/transmission/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/transmission/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/transmission/questions.yaml b/charts/stable/transmission/questions.yaml index c49376d2d25..5d78742a975 100644 --- a/charts/stable/transmission/questions.yaml +++ b/charts/stable/transmission/questions.yaml @@ -75,7 +75,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/transmission/templates/common.yaml b/charts/stable/transmission/templates/common.yaml index f6d3b6d3a08..cbf66c20818 100644 --- a/charts/stable/transmission/templates/common.yaml +++ b/charts/stable/transmission/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Render the templates */}} -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/transmission/values.yaml b/charts/stable/transmission/values.yaml index 6d8a1568021..1454e291ac9 100644 --- a/charts/stable/transmission/values.yaml +++ b/charts/stable/transmission/values.yaml @@ -24,7 +24,7 @@ service: port: 51414 targetPort: 51414 protocol: UDP -secret: {} +secretEnv: {} # TRANSMISSION_RPC_USERNAME: "" # TRANSMISSION_RPC_PASSWORD: "" env: diff --git a/charts/stable/trilium-notes/Chart.yaml b/charts/stable/trilium-notes/Chart.yaml index 07aa87bdbdd..c808c82a972 100644 --- a/charts/stable/trilium-notes/Chart.yaml +++ b/charts/stable/trilium-notes/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.51.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases. home: https://github.com/truecharts/apps/tree/master/charts/stable/trilium-notes @@ -23,7 +23,7 @@ sources: - https://hub.docker.com/r/zadam/trilium - https://github.com/zadam/trilium type: application -version: 2.0.21 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/trilium-notes/SCALE/migrations/migrate b/charts/stable/trilium-notes/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/trilium-notes/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/trilium-notes/templates/common.yaml b/charts/stable/trilium-notes/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/trilium-notes/templates/common.yaml +++ b/charts/stable/trilium-notes/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/truecommand/Chart.yaml b/charts/stable/truecommand/Chart.yaml index a5d84858e7b..1ad056e16ef 100644 --- a/charts/stable/truecommand/Chart.yaml +++ b/charts/stable/truecommand/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Aggregated management of TrueNAS devices home: https://github.com/truecharts/apps/tree/master/charts/stable/truecommand @@ -19,7 +19,7 @@ name: truecommand sources: - https://hub.docker.com/r/ixsystems/truecommand type: application -version: 10.0.20 +version: 11.0.0 annotations: truecharts.org/catagories: | - Administration diff --git a/charts/stable/truecommand/SCALE/migrations/migrate b/charts/stable/truecommand/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/truecommand/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/truecommand/templates/common.yaml b/charts/stable/truecommand/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/truecommand/templates/common.yaml +++ b/charts/stable/truecommand/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/tt-rss/Chart.yaml b/charts/stable/tt-rss/Chart.yaml index 43ea5587295..af8852fe6de 100644 --- a/charts/stable/tt-rss/Chart.yaml +++ b/charts/stable/tt-rss/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.0.9113" description: Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator name: tt-rss -version: 5.1.3 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - tt-rss @@ -13,7 +13,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/tt-rss/SCALE/migrations/migrate b/charts/stable/tt-rss/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/tt-rss/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/tt-rss/templates/common.yaml b/charts/stable/tt-rss/templates/common.yaml index 1826eaca3da..45d48a1f3ae 100644 --- a/charts/stable/tt-rss/templates/common.yaml +++ b/charts/stable/tt-rss/templates/common.yaml @@ -1,2 +1,2 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.all" . }} +{{- include "tc.common.loader.all" . }} diff --git a/charts/stable/tt-rss/values.yaml b/charts/stable/tt-rss/values.yaml index b1d2da11a35..634ce9f9b49 100644 --- a/charts/stable/tt-rss/values.yaml +++ b/charts/stable/tt-rss/values.yaml @@ -34,8 +34,6 @@ env: TTRSS_DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" TTRSS_DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" TTRSS_DB_PORT: "5432" - -envValueFrom: TTRSS_DB_PASS: secretKeyRef: name: dbcreds diff --git a/charts/stable/tvheadend/Chart.yaml b/charts/stable/tvheadend/Chart.yaml index c8dd67b5fa1..9f2743c4d35 100644 --- a/charts/stable/tvheadend/Chart.yaml +++ b/charts/stable/tvheadend/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "63784405" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: TVheadend - a TV streaming server and digital video recorder home: https://github.com/truecharts/apps/tree/master/charts/stable/tvheadend @@ -22,7 +22,7 @@ name: tvheadend sources: - https://github.com/tvheadend/tvheadend type: application -version: 11.0.19 +version: 12.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/tvheadend/SCALE/migrations/migrate b/charts/stable/tvheadend/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/tvheadend/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/tvheadend/templates/common.yaml b/charts/stable/tvheadend/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/tvheadend/templates/common.yaml +++ b/charts/stable/tvheadend/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/twtxt/Chart.yaml b/charts/stable/twtxt/Chart.yaml index 5db79ee3961..e0897d93a9d 100644 --- a/charts/stable/twtxt/Chart.yaml +++ b/charts/stable/twtxt/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.1.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: "A Self-Hosted, Twitter\u2122-like Decentralised microBlogging platform.\ \ No ads, no tracking, your content, your data!" home: https://github.com/truecharts/apps/tree/master/charts/stable/twtxt @@ -23,7 +23,7 @@ sources: - https://github.com/prologic/twtxt - https://github.com/nicholaswilde/docker-twtxt type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/twtxt/SCALE/migrations/migrate b/charts/stable/twtxt/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/twtxt/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/twtxt/questions.yaml b/charts/stable/twtxt/questions.yaml index 5a04149eb76..eb5508036ba 100644 --- a/charts/stable/twtxt/questions.yaml +++ b/charts/stable/twtxt/questions.yaml @@ -75,7 +75,7 @@ questions: description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/twtxt/templates/common.yaml b/charts/stable/twtxt/templates/common.yaml index 9705d4f5fa6..76759c7a0c9 100644 --- a/charts/stable/twtxt/templates/common.yaml +++ b/charts/stable/twtxt/templates/common.yaml @@ -1,2 +1,2 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/twtxt/values.yaml b/charts/stable/twtxt/values.yaml index 738dd150527..f9a16807b8f 100644 --- a/charts/stable/twtxt/values.yaml +++ b/charts/stable/twtxt/values.yaml @@ -3,7 +3,7 @@ image: pullPolicy: IfNotPresent tag: version-0.1.1@sha256:9f34f0557d2a46aa7952c55f5a368c130659fafa0780785a647721edd001cdaa -secret: +secretEnv: COOKIE_SECRET: supersecretchangeme securityContext: diff --git a/charts/stable/typecho/Chart.yaml b/charts/stable/typecho/Chart.yaml index 2fb3bcf350e..6fa26e8d989 100644 --- a/charts/stable/typecho/Chart.yaml +++ b/charts/stable/typecho/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.2.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: typecho sources: - https://github.com/typecho/typecho - https://hub.docker.com/r/joyqi/typecho -version: 1.0.10 +version: 2.0.0 annotations: truecharts.org/catagories: | - hosting diff --git a/charts/stable/typecho/SCALE/migrations/migrate b/charts/stable/typecho/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/typecho/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/typecho/questions.yaml b/charts/stable/typecho/questions.yaml index b60ddaf0014..df6f2efdb1d 100644 --- a/charts/stable/typecho/questions.yaml +++ b/charts/stable/typecho/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/typecho/templates/common.yaml b/charts/stable/typecho/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/typecho/templates/common.yaml +++ b/charts/stable/typecho/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/typecho/values.yaml b/charts/stable/typecho/values.yaml index 036e14e39e6..14723757392 100644 --- a/charts/stable/typecho/values.yaml +++ b/charts/stable/typecho/values.yaml @@ -29,8 +29,6 @@ env: TYPECHO_USER_NAME: "typecho" TYPECHO_USER_PASSWORD: "testtypecho" TYPECHO_USER_MAIL: "test@truecharts.org" - -envValueFrom: TYPECHO_DB_HOST: secretKeyRef: name: mariadbcreds diff --git a/charts/stable/ubooquity/Chart.yaml b/charts/stable/ubooquity/Chart.yaml index 60163352ebf..48c74638df8 100644 --- a/charts/stable/ubooquity/Chart.yaml +++ b/charts/stable/ubooquity/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ubooquity -version: 2.0.21 +version: 3.0.0 appVersion: "2.1.2" description: Ubooquity is a free, lightweight and easy-to-use home server for your comics and ebooks. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/ubooquity/SCALE/migrations/migrate b/charts/stable/ubooquity/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/ubooquity/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/ubooquity/templates/common.yaml b/charts/stable/ubooquity/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/ubooquity/templates/common.yaml +++ b/charts/stable/ubooquity/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/unifi/Chart.yaml b/charts/stable/unifi/Chart.yaml index 0ad53f8aa67..e76f5dfd1ef 100644 --- a/charts/stable/unifi/Chart.yaml +++ b/charts/stable/unifi/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "7.1.66" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Ubiquiti Network's Unifi Controller home: https://github.com/truecharts/apps/tree/master/charts/stable/unifi @@ -21,7 +21,7 @@ sources: - https://github.com/jacobalberty/unifi-docker - https://unifi-network.ui.com type: application -version: 10.0.23 +version: 11.0.0 annotations: truecharts.org/catagories: | - Networking diff --git a/charts/stable/unifi/SCALE/migrations/migrate b/charts/stable/unifi/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/unifi/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/unifi/templates/common.yaml b/charts/stable/unifi/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/unifi/templates/common.yaml +++ b/charts/stable/unifi/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/unmanic/Chart.yaml b/charts/stable/unmanic/Chart.yaml index 5cf71c99b5b..9818282176c 100644 --- a/charts/stable/unmanic/Chart.yaml +++ b/charts/stable/unmanic/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.2.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Unmanic is a simple tool for optimising your file library. home: https://github.com/truecharts/apps/tree/master/charts/stable/unmanic icon: https://truecharts.org/_static/img/appicons/unmanic.png @@ -18,7 +18,7 @@ name: unmanic sources: - https://github.com/Unmanic/unmanic - https://hub.docker.com/r/josh5/unmanic -version: 2.0.22 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/unmanic/SCALE/migrations/migrate b/charts/stable/unmanic/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/unmanic/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/unmanic/templates/common.yaml b/charts/stable/unmanic/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/unmanic/templates/common.yaml +++ b/charts/stable/unmanic/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/unmanic/values.yaml b/charts/stable/unmanic/values.yaml index 8922b170065..58839181d5e 100644 --- a/charts/stable/unmanic/values.yaml +++ b/charts/stable/unmanic/values.yaml @@ -1,6 +1,6 @@ image: repository: tccr.io/truecharts/unmanic - tag: v0.2.2@sha256:0c9b1d1b0569ee55f7fc85d6c75cd0956fd3e2ee92463dda7a7c71c27024be6b + tag: v0.2.3@sha256:3c538e17a78f5af7bb2c2aa08f3815f147c4baaafe76a0a78fd82b3c0ab0a5bf pullPolicy: IfNotPresent securityContext: diff --git a/charts/stable/unpackerr/Chart.yaml b/charts/stable/unpackerr/Chart.yaml index 5effc54bedc..275391f0adb 100644 --- a/charts/stable/unpackerr/Chart.yaml +++ b/charts/stable/unpackerr/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.10.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: This application runs as a daemon on your download host. It checks for completed downloads and extracts them so Radarr, Lidarr, Sonarr, and Readarr may @@ -26,7 +26,7 @@ sources: - https://github.com/davidnewhall/unpackerr - https://hub.docker.com/r/golift/unpackerr type: application -version: 5.0.20 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/unpackerr/SCALE/migrations/migrate b/charts/stable/unpackerr/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/unpackerr/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/unpackerr/questions.yaml b/charts/stable/unpackerr/questions.yaml index 1b84027c3d9..7fd5389895d 100644 --- a/charts/stable/unpackerr/questions.yaml +++ b/charts/stable/unpackerr/questions.yaml @@ -88,41 +88,7 @@ questions: additional_attrs: true type: dict attrs: - - variable: type - label: "Type of Storage" - description: "Sets the persistence type, Anything other than PVC could break rollback!" - schema: - type: string - default: "simpleHP" - enum: - - value: "simplePVC" - description: "PVC (simple)" - - value: "simpleHP" - description: "HostPath (simple)" - - value: "emptyDir" - description: "emptyDir" - - value: "pvc" - description: "pvc" - - value: "hostPath" - description: "hostPath" # Include{persistenceBasic} - - variable: hostPath - label: "hostPath" - description: "Path inside the container the storage is mounted" - schema: - show_if: [["type", "=", "hostPath"]] - type: hostpath - - variable: medium - label: "EmptyDir Medium" - schema: - show_if: [["type", "=", "emptyDir"]] - type: string - default: "" - enum: - - value: "" - description: "Default" - - value: "Memory" - description: "Memory" # Include{persistenceAdvanced} # Include{persistenceList} diff --git a/charts/stable/unpackerr/templates/common.yaml b/charts/stable/unpackerr/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/unpackerr/templates/common.yaml +++ b/charts/stable/unpackerr/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/unpoller/Chart.yaml b/charts/stable/unpoller/Chart.yaml index 792f38c0c53..0c01c093836 100644 --- a/charts/stable/unpoller/Chart.yaml +++ b/charts/stable/unpoller/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.1.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus icon: https://truecharts.org/_static/img/appicons/unpoller.png @@ -22,7 +22,7 @@ sources: - https://github.com/unifi-poller/unifi-poller - https://hub.docker.com/r/golift/unifi-poller type: application -version: 2.0.19 +version: 3.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/stable/unpoller/SCALE/migrations/migrate b/charts/stable/unpoller/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/unpoller/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/unpoller/questions.yaml b/charts/stable/unpoller/questions.yaml index e7bb02d97b9..4ecdbd1e7e6 100644 --- a/charts/stable/unpoller/questions.yaml +++ b/charts/stable/unpoller/questions.yaml @@ -4,7 +4,7 @@ portals: {} questions: # Include{global} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Secret Image Environment" schema: diff --git a/charts/stable/unpoller/templates/common.yaml b/charts/stable/unpoller/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/unpoller/templates/common.yaml +++ b/charts/stable/unpoller/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/uptime-kuma/Chart.yaml b/charts/stable/uptime-kuma/Chart.yaml index 3a64e0f2ea0..a8d917f44c9 100644 --- a/charts/stable/uptime-kuma/Chart.yaml +++ b/charts/stable/uptime-kuma/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.16.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: A fancy self-hosted monitoring tool home: https://github.com/truecharts/apps/tree/master/charts/stable/uptime-kuma @@ -20,7 +20,7 @@ name: uptime-kuma sources: - https://github.com/louislam/uptime-kuma type: application -version: 2.0.27 +version: 3.0.0 annotations: truecharts.org/catagories: | - monitoring diff --git a/charts/stable/uptime-kuma/SCALE/migrations/migrate b/charts/stable/uptime-kuma/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/uptime-kuma/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/uptime-kuma/templates/common.yaml b/charts/stable/uptime-kuma/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/uptime-kuma/templates/common.yaml +++ b/charts/stable/uptime-kuma/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/uptimerobot-prometheus/Chart.yaml b/charts/stable/uptimerobot-prometheus/Chart.yaml index b6d5021fe0c..6e6975495c6 100644 --- a/charts/stable/uptimerobot-prometheus/Chart.yaml +++ b/charts/stable/uptimerobot-prometheus/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.0.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Prometheus Exporter for the official uptimerobot CLI icon: https://truecharts.org/_static/img/appicons/uptimerobot-prometheus.png @@ -23,7 +23,7 @@ sources: - https://github.com/lekpamartin/uptimerobot_exporter - https://github.com/k8s-at-home/charts/tree/master/charts/uptimerobot-prometheus type: application -version: 3.0.19 +version: 4.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/stable/uptimerobot-prometheus/SCALE/migrations/migrate b/charts/stable/uptimerobot-prometheus/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/uptimerobot-prometheus/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/uptimerobot-prometheus/questions.yaml b/charts/stable/uptimerobot-prometheus/questions.yaml index 116d04b8b4f..301e3ac9011 100644 --- a/charts/stable/uptimerobot-prometheus/questions.yaml +++ b/charts/stable/uptimerobot-prometheus/questions.yaml @@ -3,7 +3,7 @@ portals: {} questions: # Include{global} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/uptimerobot-prometheus/templates/common.yaml b/charts/stable/uptimerobot-prometheus/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/uptimerobot-prometheus/templates/common.yaml +++ b/charts/stable/uptimerobot-prometheus/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/uptimerobot-prometheus/values.yaml b/charts/stable/uptimerobot-prometheus/values.yaml index 0b50c14beba..21fc7309410 100644 --- a/charts/stable/uptimerobot-prometheus/values.yaml +++ b/charts/stable/uptimerobot-prometheus/values.yaml @@ -8,7 +8,7 @@ image: # -- environment variables. See [application docs](https://github.com/lekpamartin/uptimerobot_exporter/blob/master/docker-compose.yml) for more details. # @default -- See below -secret: +secretEnv: # -- Set the uptimerobot API key UPTIMEROBOT_API_KEY: "" diff --git a/charts/games/valheim/.helmignore b/charts/stable/valheim/.helmignore similarity index 100% rename from charts/games/valheim/.helmignore rename to charts/stable/valheim/.helmignore diff --git a/charts/games/valheim/CHANGELOG.md b/charts/stable/valheim/CHANGELOG.md similarity index 100% rename from charts/games/valheim/CHANGELOG.md rename to charts/stable/valheim/CHANGELOG.md diff --git a/charts/games/satisfactory/CONFIG.md b/charts/stable/valheim/CONFIG.md similarity index 100% rename from charts/games/satisfactory/CONFIG.md rename to charts/stable/valheim/CONFIG.md diff --git a/charts/games/valheim/Chart.yaml b/charts/stable/valheim/Chart.yaml similarity index 95% rename from charts/games/valheim/Chart.yaml rename to charts/stable/valheim/Chart.yaml index 83b7f204c6c..f07ca292752 100644 --- a/charts/games/valheim/Chart.yaml +++ b/charts/stable/valheim/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Valheim dedicated gameserver with automatic update and world backup support home: https://github.com/truecharts/apps/tree/master/charts/games/valheim icon: https://truecharts.org/_static/img/appicons/valheim.png @@ -18,7 +18,7 @@ name: valheim sources: - https://github.com/lloesche/valheim-server-docker - https://hub.docker.com/r/lloesche/valheim-server -version: 2.0.50 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/games/valheim/README.md b/charts/stable/valheim/README.md similarity index 100% rename from charts/games/valheim/README.md rename to charts/stable/valheim/README.md diff --git a/charts/stable/valheim/SCALE/migrations/migrate b/charts/stable/valheim/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/valheim/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/valheim/SCALE/migrations/migrate_from_0.0.60 b/charts/stable/valheim/SCALE/migrations/migrate_from_0.0.60 new file mode 100644 index 00000000000..b1485990d75 --- /dev/null +++ b/charts/stable/valheim/SCALE/migrations/migrate_from_0.0.60 @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + 'secretEnv': values.get('secret'), + 'secret': {} + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/games/valheim/helm-values.md b/charts/stable/valheim/helm-values.md similarity index 100% rename from charts/games/valheim/helm-values.md rename to charts/stable/valheim/helm-values.md diff --git a/charts/games/valheim/questions.yaml b/charts/stable/valheim/questions.yaml similarity index 99% rename from charts/games/valheim/questions.yaml rename to charts/stable/valheim/questions.yaml index 250e4d590ce..ded4aa4e60b 100644 --- a/charts/games/valheim/questions.yaml +++ b/charts/stable/valheim/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/games/valheim/security.md b/charts/stable/valheim/security.md similarity index 100% rename from charts/games/valheim/security.md rename to charts/stable/valheim/security.md diff --git a/charts/games/valheim/templates/common.yaml b/charts/stable/valheim/templates/common.yaml similarity index 79% rename from charts/games/valheim/templates/common.yaml rename to charts/stable/valheim/templates/common.yaml index ed68b8e6fed..d8f17cf6d44 100644 --- a/charts/games/valheim/templates/common.yaml +++ b/charts/stable/valheim/templates/common.yaml @@ -1,4 +1,4 @@ -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Append the hardcoded settings */}} {{- define "valheim.hardcodedValues" -}} @@ -13,4 +13,4 @@ probes: {{- $_ := mergeOverwrite .Values (include "valheim.hardcodedValues" . | fromYaml) -}} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/games/valheim/values.yaml b/charts/stable/valheim/values.yaml similarity index 93% rename from charts/games/valheim/values.yaml rename to charts/stable/valheim/values.yaml index 7457de88060..fd7a3e9c918 100644 --- a/charts/games/valheim/values.yaml +++ b/charts/stable/valheim/values.yaml @@ -1,9 +1,9 @@ image: repository: tccr.io/truecharts/valheim-server - tag: latest@sha256:d16c2205d542728e1f5f74fa35fc4ce83474f9ff7e8020dd16c63a88268bd88d + tag: latest@sha256:74bf895e8a34ac66bb646aa0d66eca744a1997e7296a31207d5fc79b82837dfd pullPolicy: IfNotPresent -secret: +secretEnv: SUPERVISOR_HTTP_USER: admin SUPERVISOR_HTTP_PASS: secret SERVER_PASS: secret diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml index a32c5c5954f..3a289d67216 100644 --- a/charts/stable/vaultwarden/Chart.yaml +++ b/charts/stable/vaultwarden/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.25.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -28,7 +28,7 @@ name: vaultwarden sources: - https://github.com/dani-garcia/vaultwarden type: application -version: 14.0.26 +version: 15.0.0 annotations: truecharts.org/catagories: | - security diff --git a/charts/stable/vaultwarden/SCALE/migrations/migrate b/charts/stable/vaultwarden/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/vaultwarden/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/vaultwarden/questions.yaml b/charts/stable/vaultwarden/questions.yaml index bd31cddcf15..fde879ece16 100644 --- a/charts/stable/vaultwarden/questions.yaml +++ b/charts/stable/vaultwarden/questions.yaml @@ -117,7 +117,7 @@ questions: schema: type: string default: "" - - variable: secretKey + - variable: secretEnvKey label: "Yubico Secret Key" schema: type: string diff --git a/charts/stable/vaultwarden/templates/common.yaml b/charts/stable/vaultwarden/templates/common.yaml index ae3fa08a44d..577816b14ce 100644 --- a/charts/stable/vaultwarden/templates/common.yaml +++ b/charts/stable/vaultwarden/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render configmap for vaultwarden */}} @@ -10,7 +10,7 @@ {{/* Define path for websocket */}} {{- define "vaultwarden.websocket" -}} -{{- $fullname := include "common.names.fullname" . -}} +{{- $fullname := include "tc.common.names.fullname" . -}} path: "/notifications/hub" # -- Ignored if not kubeVersion >= 1.14-0 pathType: Prefix @@ -36,4 +36,4 @@ service: {{- include "vaultwarden.websocketinjector" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml index 8df0f03e11c..631ede1f30c 100644 --- a/charts/stable/vaultwarden/values.yaml +++ b/charts/stable/vaultwarden/values.yaml @@ -19,6 +19,10 @@ service: env: DOMAIN: "https://{{ if .Values.ingress }}{{ if .Values.ingress.main.enabled }}{{ ( index .Values.ingress.main.hosts 0 ).host }}{{ else }}placeholder.com{{ end }}{{ else }}placeholder.com{{ end }}" + DATABASE_URL: + secretKeyRef: + name: dbcreds + key: url envFrom: - configMapRef: @@ -26,12 +30,6 @@ envFrom: - secretRef: name: vaultwardensecret -envValueFrom: - DATABASE_URL: - secretKeyRef: - name: dbcreds - key: url - database: # Database type, must be one of: 'sqlite', 'mysql' or 'postgresql'. type: postgresql diff --git a/charts/stable/verysync/Chart.yaml b/charts/stable/verysync/Chart.yaml index fb60c5a592b..467a1114841 100644 --- a/charts/stable/verysync/Chart.yaml +++ b/charts/stable/verysync/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.13.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: very sync is an easy-to-use multi-platform file synchronization software home: https://github.com/truecharts/apps/tree/master/charts/stable/verysync icon: https://truecharts.org/_static/img/appicons/verysync.png @@ -20,7 +20,7 @@ maintainers: name: verysync sources: - https://hub.docker.com/r/jonnyan404/verysync -version: 1.0.13 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/verysync/SCALE/migrations/migrate b/charts/stable/verysync/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/verysync/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/verysync/templates/common.yaml b/charts/stable/verysync/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/verysync/templates/common.yaml +++ b/charts/stable/verysync/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/vikunja/Chart.yaml b/charts/stable/vikunja/Chart.yaml index ee60bb5b3ac..c14ba18824f 100644 --- a/charts/stable/vikunja/Chart.yaml +++ b/charts/stable/vikunja/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.18.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -25,7 +25,7 @@ maintainers: name: vikunja sources: - https://vikunja.io/docs -version: 1.0.13 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/vikunja/SCALE/migrations/migrate b/charts/stable/vikunja/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/vikunja/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/vikunja/templates/common.yaml b/charts/stable/vikunja/templates/common.yaml index 30e4276f842..0c4c67c3f4e 100644 --- a/charts/stable/vikunja/templates/common.yaml +++ b/charts/stable/vikunja/templates/common.yaml @@ -1,19 +1,5 @@ -{{- include "common.setup" . }} - -{{/* Append the general configMap volume to the volumes */}} -{{- define "vikunja.harcodedValues" -}} -persistence: - vikunja-config: - enabled: "true" - mountPath: "/etc/nginx/conf.d/default.conf" - subPath: "nginx-config" - type: "custom" - volumeSpec: - configMap: - name: {{ printf "%v-config" (include "common.names.fullname" .) }} -{{- end -}} -{{- $_ := mergeOverwrite .Values (include "vikunja.harcodedValues" . | fromYaml) -}} +{{- include "tc.common.loader.init" . }} {{- include "vikunja.secrets" . }} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/vikunja/templates/configmap.yaml b/charts/stable/vikunja/templates/configmap.yaml deleted file mode 100644 index 6fcc6172553..00000000000 --- a/charts/stable/vikunja/templates/configmap.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.names.fullname" . }}-config - labels: - {{- include "common.labels" . | nindent 4 }} -data: - nginx-config: |- - server { - listen 8080; - - location / { - proxy_pass http://localhost:80; - } - - location ~* ^/(api|dav|\.well-known)/ { - proxy_pass http://localhost:3456; - client_max_body_size {{ .Values.env.VIKUNJA_FILES_MAXSIZE | upper | trimSuffix "B" }}; - } - } diff --git a/charts/stable/vikunja/values.yaml b/charts/stable/vikunja/values.yaml index 477a8fd7572..0797295553c 100644 --- a/charts/stable/vikunja/values.yaml +++ b/charts/stable/vikunja/values.yaml @@ -20,6 +20,24 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 +configmap: + config: + enabled: true + data: + nginx-config: |- + server { + listen 8080; + + location / { + proxy_pass http://localhost:80; + } + + location ~* ^/(api|dav|\.well-known)/ { + proxy_pass http://localhost:3456; + client_max_body_size {{ .Values.env.VIKUNJA_FILES_MAXSIZE | upper | trimSuffix "B" }}; + } + } + env: VIKUNJA_REDIS_ENABLED: 1 VIKUNJA_CACHE_ENABLED: 1 @@ -46,8 +64,6 @@ env: VIKUNJA_RATELIMIT_ENABLED: false VIKUNJA_RATELIMIT_PERIOD: 60 VIKUNJA_RATELIMIT_LIMIT: 100 - -envValueFrom: VIKUNJA_DATABASE_HOST: secretKeyRef: name: dbcreds @@ -96,6 +112,14 @@ persistence: files: enabled: true mountPath: "/app/vikunja/files" + vikunja-config: + enabled: "true" + mountPath: "/etc/nginx/conf.d/default.conf" + subPath: "nginx-config" + type: "custom" + volumeSpec: + configMap: + name: '{{ printf "%v-config" (include "tc.common.names.fullname" .) }}' postgresql: enabled: true diff --git a/charts/stable/webgrabplus/Chart.yaml b/charts/stable/webgrabplus/Chart.yaml index ea4c872ef30..6ebe25499b5 100644 --- a/charts/stable/webgrabplus/Chart.yaml +++ b/charts/stable/webgrabplus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: webgrabplus -version: 1.0.21 +version: 2.0.0 appVersion: "4.2.3" description: Webgrabplus is a multi-site incremental xmltv epg grabber. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/webgrabplus/SCALE/migrations/migrate b/charts/stable/webgrabplus/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/webgrabplus/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/webgrabplus/templates/common.yaml b/charts/stable/webgrabplus/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/webgrabplus/templates/common.yaml +++ b/charts/stable/webgrabplus/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/weblate/Chart.yaml b/charts/stable/weblate/Chart.yaml index d024ec18ca9..b1726363605 100644 --- a/charts/stable/weblate/Chart.yaml +++ b/charts/stable/weblate/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "4.12.1" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -28,7 +28,7 @@ sources: - https://github.com/WeblateOrg/docker - https://github.com/WeblateOrg/docker-compose - https://docs.weblate.org/en/latest/ -version: 2.0.26 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/weblate/SCALE/migrations/migrate b/charts/stable/weblate/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/weblate/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/weblate/templates/common.yaml b/charts/stable/weblate/templates/common.yaml index 9da2e155178..a1cd3db97c7 100644 --- a/charts/stable/weblate/templates/common.yaml +++ b/charts/stable/weblate/templates/common.yaml @@ -1,8 +1,8 @@ {{/* Make sure all variables are set properly */}} -{{ include "common.setup" . }} +{{ include "tc.common.loader.init" . }} {{/* Render configmap for weblate */}} {{- include "weblate.configmap" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/weblate/values.yaml b/charts/stable/weblate/values.yaml index 068a80b72ae..4ee595a4e52 100644 --- a/charts/stable/weblate/values.yaml +++ b/charts/stable/weblate/values.yaml @@ -18,6 +18,22 @@ env: POSTGRES_PORT: 5432 REDIS_PORT: 6379 REDIS_DB: "0" + POSTGRES_PASSWORD: + secretKeyRef: + name: dbcreds + key: postgresql-password + POSTGRES_HOST: + secretKeyRef: + name: dbcreds + key: plainhost + REDIS_HOST: + secretKeyRef: + name: rediscreds + key: plainhost + REDIS_PASSWORD: + secretKeyRef: + name: rediscreds + key: redis-password weblate: general: @@ -193,24 +209,6 @@ envFrom: - configMapRef: name: weblate-env -envValueFrom: - POSTGRES_PASSWORD: - secretKeyRef: - name: dbcreds - key: postgresql-password - POSTGRES_HOST: - secretKeyRef: - name: dbcreds - key: plainhost - REDIS_HOST: - secretKeyRef: - name: rediscreds - key: plainhost - REDIS_PASSWORD: - secretKeyRef: - name: rediscreds - key: redis-password - probes: liveness: path: "/healthz" diff --git a/charts/stable/website-shot/Chart.yaml b/charts/stable/website-shot/Chart.yaml index 854e1789c49..a38ee06e076 100644 --- a/charts/stable/website-shot/Chart.yaml +++ b/charts/stable/website-shot/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "latest" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Generate a full web-page screenshot with our service, that provides rich interface to make any kind of web screenshots online for free with no limits. The simplest way to take a full page screenshot. home: https://github.com/truecharts/apps/tree/master/charts/stable/website-shot icon: https://truecharts.org/_static/img/appicons/website-shot.png @@ -17,7 +17,7 @@ maintainers: name: website-shot sources: - https://github.com/Flowko/website-shot -version: 1.0.9 +version: 2.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/website-shot/SCALE/migrations/migrate b/charts/stable/website-shot/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/website-shot/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/website-shot/templates/common.yaml b/charts/stable/website-shot/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/website-shot/templates/common.yaml +++ b/charts/stable/website-shot/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/wekan/Chart.yaml b/charts/stable/wekan/Chart.yaml index 287efb3e112..7b3e4bae1ef 100644 --- a/charts/stable/wekan/Chart.yaml +++ b/charts/stable/wekan/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.27" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mongodb.enabled name: mongodb repository: https://charts.truecharts.org @@ -23,7 +23,7 @@ name: wekan sources: - https://github.com/wekan/wekan - https://wekan.github.io/ -version: 2.0.17 +version: 3.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/wekan/SCALE/migrations/migrate b/charts/stable/wekan/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/wekan/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/wekan/templates/common.yaml b/charts/stable/wekan/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/wekan/templates/common.yaml +++ b/charts/stable/wekan/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/wekan/values.yaml b/charts/stable/wekan/values.yaml index 205136be614..70f35ba8449 100644 --- a/charts/stable/wekan/values.yaml +++ b/charts/stable/wekan/values.yaml @@ -7,8 +7,6 @@ env: WRITABLE_PATH: "/data" # User Defined ROOT_URL: "http://localhost:8080" - -envValueFrom: MONGO_URL: secretKeyRef: name: mongodbcreds diff --git a/charts/stable/whoogle/Chart.yaml b/charts/stable/whoogle/Chart.yaml index a792807d51c..61cba3a9dbd 100644 --- a/charts/stable/whoogle/Chart.yaml +++ b/charts/stable/whoogle/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.7.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: A self-hosted, ad-free, privacy-respecting metasearch engine home: https://github.com/truecharts/apps/tree/master/charts/stable/whoogle icon: https://truecharts.org/_static/img/appicons/whoogle.png @@ -20,7 +20,7 @@ maintainers: name: whoogle sources: - https://github.com/benbusby/whoogle-search -version: 2.0.21 +version: 3.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/whoogle/SCALE/migrations/migrate b/charts/stable/whoogle/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/whoogle/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/whoogle/templates/common.yaml b/charts/stable/whoogle/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/whoogle/templates/common.yaml +++ b/charts/stable/whoogle/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/wikijs/Chart.yaml b/charts/stable/wikijs/Chart.yaml index ede285fb0eb..fce6d2e6cfe 100644 --- a/charts/stable/wikijs/Chart.yaml +++ b/charts/stable/wikijs/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: "2.5.283" description: Make documentation a joy to write using Wiki.js's beautiful and intuitive interface! name: wikijs -version: 5.0.30 +version: 6.0.0 kubeVersion: ">=1.16.0-0" keywords: - wiki @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ diff --git a/charts/stable/wikijs/SCALE/migrations/migrate b/charts/stable/wikijs/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/wikijs/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/wikijs/templates/common.yaml b/charts/stable/wikijs/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/wikijs/templates/common.yaml +++ b/charts/stable/wikijs/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/wikijs/values.yaml b/charts/stable/wikijs/values.yaml index 375adba2b42..e4cb7b8feb2 100644 --- a/charts/stable/wikijs/values.yaml +++ b/charts/stable/wikijs/values.yaml @@ -8,8 +8,6 @@ env: DB_NAME: "{{ .Values.postgresql.postgresqlDatabase }}" DB_USER: "{{ .Values.postgresql.postgresqlUsername }}" DB_PORT: "5432" - -envValueFrom: DB_PASS: secretKeyRef: name: dbcreds diff --git a/charts/stable/wireshark/Chart.yaml b/charts/stable/wireshark/Chart.yaml index e579fc8b994..964cae2dc01 100644 --- a/charts/stable/wireshark/Chart.yaml +++ b/charts/stable/wireshark/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: wireshark -version: 1.0.20 +version: 2.0.0 appVersion: "3.4.13" description: Wireshark is the world’s foremost and widely-used network protocol analyzer. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/wireshark/SCALE/migrations/migrate b/charts/stable/wireshark/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/wireshark/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/wireshark/templates/common.yaml b/charts/stable/wireshark/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/wireshark/templates/common.yaml +++ b/charts/stable/wireshark/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/xbackbone/Chart.yaml b/charts/stable/xbackbone/Chart.yaml index 07a99b2777e..13217c29e87 100644 --- a/charts/stable/xbackbone/Chart.yaml +++ b/charts/stable/xbackbone/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "3.3.3" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: mariadb.enabled name: mariadb repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: xbackbone sources: - https://github.com/SergiX44/XBackBone - https://hub.docker.com/r/pe46dro/xbackbone-docker -version: 1.0.23 +version: 2.0.0 annotations: truecharts.org/catagories: | - files diff --git a/charts/stable/xbackbone/SCALE/migrations/migrate b/charts/stable/xbackbone/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/xbackbone/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/xbackbone/templates/common.yaml b/charts/stable/xbackbone/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/xbackbone/templates/common.yaml +++ b/charts/stable/xbackbone/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/xbackbone/values.yaml b/charts/stable/xbackbone/values.yaml index 8e8b502c01f..1eea17aa143 100644 --- a/charts/stable/xbackbone/values.yaml +++ b/charts/stable/xbackbone/values.yaml @@ -17,7 +17,14 @@ env: DB_TYPE: mysql MYSQL_DATABASE: xbackbone MYSQL_USER: xbackbone - + MYSQL_HOST: + secretKeyRef: + name: mariadbcreds + key: plainhost + MYSQL_PASSWORD: + secretKeyRef: + name: mariadbcreds + key: mariadb-password # -- Configures service settings for the chart. # @default -- See values.yaml @@ -35,15 +42,6 @@ persistence: enabled: true mountPath: "/app/config" -envValueFrom: - MYSQL_HOST: - secretKeyRef: - name: mariadbcreds - key: plainhost - MYSQL_PASSWORD: - secretKeyRef: - name: mariadbcreds - key: mariadb-password mariadb: enabled: true diff --git a/charts/stable/xteve/Chart.yaml b/charts/stable/xteve/Chart.yaml index 2955948390f..6b8ac516afd 100644 --- a/charts/stable/xteve/Chart.yaml +++ b/charts/stable/xteve/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "2.2.0.200" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: M3U Proxy for Plex DVR and Emby Live TV. home: https://github.com/truecharts/apps/tree/master/charts/stable/xteve icon: https://truecharts.org/_static/img/appicons/xteve.png @@ -21,7 +21,7 @@ name: xteve sources: - https://github.com/xteve-project/xTeVe - https://github.com/k8s-at-home/container-images -version: 5.0.21 +version: 6.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/xteve/SCALE/migrations/migrate b/charts/stable/xteve/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/xteve/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/xteve/templates/common.yaml b/charts/stable/xteve/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/xteve/templates/common.yaml +++ b/charts/stable/xteve/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/xwiki/Chart.yaml b/charts/stable/xwiki/Chart.yaml index 980b4e37693..466a9f274a4 100644 --- a/charts/stable/xwiki/Chart.yaml +++ b/charts/stable/xwiki/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "14.4.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 - condition: postgresql.enabled name: postgresql repository: https://charts.truecharts.org/ @@ -23,7 +23,7 @@ name: xwiki sources: - https://hub.docker.com/_/xwiki - https://github.com/xwiki/xwiki-docker -version: 1.0.19 +version: 2.0.0 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/stable/xwiki/SCALE/migrations/migrate b/charts/stable/xwiki/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/xwiki/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/xwiki/templates/common.yaml b/charts/stable/xwiki/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/xwiki/templates/common.yaml +++ b/charts/stable/xwiki/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/xwiki/values.yaml b/charts/stable/xwiki/values.yaml index c3616af92c6..0a36d68abb1 100644 --- a/charts/stable/xwiki/values.yaml +++ b/charts/stable/xwiki/values.yaml @@ -16,8 +16,6 @@ env: DB_DATABASE: "{{ .Values.postgresql.postgresqlDatabase }}" # User Defined JAVA_OPTS: "" - -envValueFrom: DB_HOST: secretKeyRef: name: dbcreds diff --git a/charts/stable/zerotier/Chart.yaml b/charts/stable/zerotier/Chart.yaml index c1f0a07398c..cfd57c7f230 100644 --- a/charts/stable/zerotier/Chart.yaml +++ b/charts/stable/zerotier/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: zerotier -version: 1.0.22 +version: 2.0.0 appVersion: "1.8.10" description: ZeroTier is a smart programmable Ethernet switch for planet Earth type: application @@ -16,7 +16,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/zerotier/SCALE/migrations/migrate b/charts/stable/zerotier/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/zerotier/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/zerotier/questions.yaml b/charts/stable/zerotier/questions.yaml index 0dee3e83b95..3cfd5ccbf35 100644 --- a/charts/stable/zerotier/questions.yaml +++ b/charts/stable/zerotier/questions.yaml @@ -52,7 +52,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/zerotier/templates/common.yaml b/charts/stable/zerotier/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/zerotier/templates/common.yaml +++ b/charts/stable/zerotier/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/zerotier/values.yaml b/charts/stable/zerotier/values.yaml index 84a05939456..884d9bb6596 100644 --- a/charts/stable/zerotier/values.yaml +++ b/charts/stable/zerotier/values.yaml @@ -14,7 +14,7 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 -secret: +secretEnv: ZEROTIER_API_SECRET: "" ZEROTIER_IDENTITY_PUBLIC: "" ZEROTIER_IDENTITY_SECRET: "" diff --git a/charts/stable/zigbee2mqtt/Chart.yaml b/charts/stable/zigbee2mqtt/Chart.yaml index 3bc7ba79ad9..7984e69d7f2 100644 --- a/charts/stable/zigbee2mqtt/Chart.yaml +++ b/charts/stable/zigbee2mqtt/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.25.2" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 description: Bridges events and allows you to control your Zigbee devices via MQTT home: https://github.com/truecharts/apps/tree/master/charts/stable/zigbee2mqtt icon: https://truecharts.org/_static/img/appicons/zigbee2mqtt.png @@ -19,7 +19,7 @@ maintainers: name: zigbee2mqtt sources: - https://github.com/Koenkk/zigbee2mqtt -version: 3.0.14 +version: 4.0.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/zigbee2mqtt/SCALE/migrations/migrate b/charts/stable/zigbee2mqtt/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/zigbee2mqtt/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/zigbee2mqtt/questions.yaml b/charts/stable/zigbee2mqtt/questions.yaml index f001d8780f5..d8852df3d18 100644 --- a/charts/stable/zigbee2mqtt/questions.yaml +++ b/charts/stable/zigbee2mqtt/questions.yaml @@ -74,7 +74,7 @@ questions: - value: "OnDelete" description: "(Legacy) OnDelete: ignore .spec.template changes" # Include{controllerExpert} - - variable: secret + - variable: secretEnv group: "Container Configuration" label: "Image Secrets" schema: diff --git a/charts/stable/zigbee2mqtt/templates/common.yaml b/charts/stable/zigbee2mqtt/templates/common.yaml index da58e96d9e0..b9e7208f382 100644 --- a/charts/stable/zigbee2mqtt/templates/common.yaml +++ b/charts/stable/zigbee2mqtt/templates/common.yaml @@ -1,5 +1,5 @@ {{/* Make sure all variables are set properly */}} -{{- include "common.setup" . }} +{{- include "tc.common.loader.init" . }} {{/* Render the templates */}} -{{ include "common.postSetup" . }} +{{ include "tc.common.loader.apply" . }} diff --git a/charts/stable/zigbee2mqtt/values.yaml b/charts/stable/zigbee2mqtt/values.yaml index ce5d2c753b1..b3a3e1b7c49 100644 --- a/charts/stable/zigbee2mqtt/values.yaml +++ b/charts/stable/zigbee2mqtt/values.yaml @@ -3,7 +3,7 @@ image: tag: v1.25.2@sha256:cebe8806e79a9651304e6ad0165650e65b87021599ea7f5b3a106e4aa6b66323 pullPolicy: IfNotPresent -secret: +secretEnv: ZIGBEE2MQTT_CONFIG_MQTT_USER: "" ZIGBEE2MQTT_CONFIG_MQTT_PASSWORD: "" diff --git a/charts/stable/znc/Chart.yaml b/charts/stable/znc/Chart.yaml index 478b0941075..f1a4a9a11b7 100644 --- a/charts/stable/znc/Chart.yaml +++ b/charts/stable/znc/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: znc -version: 1.0.19 +version: 2.0.0 appVersion: "1.8.2" description: Znc is an IRC network bouncer or BNC. It can detach the client from the actual IRC server, and also from selected channels. type: application @@ -15,7 +15,7 @@ sources: dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 # condition: maintainers: - email: info@truecharts.org diff --git a/charts/stable/znc/SCALE/migrations/migrate b/charts/stable/znc/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/znc/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/znc/templates/common.yaml b/charts/stable/znc/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/znc/templates/common.yaml +++ b/charts/stable/znc/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/charts/stable/zwavejs2mqtt/Chart.yaml b/charts/stable/zwavejs2mqtt/Chart.yaml index 33f21c4cd09..ea7f1b630a0 100644 --- a/charts/stable/zwavejs2mqtt/Chart.yaml +++ b/charts/stable/zwavejs2mqtt/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "6.11.0" dependencies: - name: common repository: https://library-charts.truecharts.org - version: 9.3.24 + version: 10.0.8 deprecated: false description: Fully configurable Zwave to MQTT gateway and Control Panel using NodeJS and Vue @@ -24,7 +24,7 @@ sources: - https://github.com/zwave-js/zwavejs2mqtt - https://hub.docker.com/r/zwavejs/zwavejs2mqtt type: application -version: 10.0.31 +version: 11.0.0 annotations: truecharts.org/catagories: | - tools diff --git a/charts/stable/zwavejs2mqtt/SCALE/migrations/migrate b/charts/stable/zwavejs2mqtt/SCALE/migrations/migrate new file mode 100644 index 00000000000..b0c4fcbeef2 --- /dev/null +++ b/charts/stable/zwavejs2mqtt/SCALE/migrations/migrate @@ -0,0 +1,21 @@ +#!/usr/bin/python3 +import json +import os +import sys + + +def migrate(values): + values.update({ + **({'secretEnv': values['secret']} if values.get('secret') else {}), + **({'secret': {}} if values.get('secret')) + }) + return values + + +if __name__ == '__main__': + if len(sys.argv) != 2: + exit(1) + + if os.path.exists(sys.argv[1]): + with open(sys.argv[1], 'r') as f: + print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/stable/zwavejs2mqtt/templates/common.yaml b/charts/stable/zwavejs2mqtt/templates/common.yaml index a6613c2ce21..c1a366e1cf0 100644 --- a/charts/stable/zwavejs2mqtt/templates/common.yaml +++ b/charts/stable/zwavejs2mqtt/templates/common.yaml @@ -1 +1 @@ -{{ include "common.all" . }} +{{ include "tc.common.loader.all" . }} diff --git a/tools/bump.sh b/tools/bump.sh index 961a3df566b..c3d95c34435 100755 --- a/tools/bump.sh +++ b/tools/bump.sh @@ -40,10 +40,10 @@ function incr_semver() { BUMPTYPE=${1} if [ -z ${2+x} ]; then -for train in stable incubator games enterprise develop non-free deprecated dependency core; do +for train in stable SCALE incubator games enterprise develop non-free deprecated dependency core; do for chart in charts/${train}/*; do if [ -d "${chart}" ]; then - echo "Bumping patch version for ${train}/${chart}" + echo "Bumping version for ${train}/${chart}" OLDVER=$(cat ${chart}/Chart.yaml | grep "^version: ") OLDVER=${OLDVER#version: } NEWVER=$(incr_semver ${OLDVER} ${BUMPTYPE}) @@ -54,7 +54,7 @@ done else chart=${2} if [ -d "${chart}" ]; then - echo "Bumping patch version for ${chart}" + echo "Bumping version for ${chart}" OLDVER=$(cat ${chart}/Chart.yaml | grep "^version: ") OLDVER=${OLDVER#version: } NEWVER=$(incr_semver ${OLDVER} ${BUMPTYPE})