From 774df645b2d37d9f3af76e62082e2909b7a60387 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 4 Oct 2022 14:59:47 +0300 Subject: [PATCH 1/6] fix(solr): add missing plainhost key in secret --- charts/common/Chart.yaml | 2 +- charts/common/templates/lib/dependencies/_solrInjector.tpl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index a6116daa..ea511799 100644 --- a/charts/common/Chart.yaml +++ b/charts/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 10.6.5 +version: 10.6.9 diff --git a/charts/common/templates/lib/dependencies/_solrInjector.tpl b/charts/common/templates/lib/dependencies/_solrInjector.tpl index ef98fc69..ea86d43a 100644 --- a/charts/common/templates/lib/dependencies/_solrInjector.tpl +++ b/charts/common/templates/lib/dependencies/_solrInjector.tpl @@ -22,7 +22,8 @@ data: {{- $solrPass = randAlphaNum 50 }} solr-password: {{ $solrPass | b64enc | quote }} {{- end }} - url: {{ ( printf "http://%v:%v@%v-solr:8983/%v" .Values.solr.solrUsername $solrPass .Release.Name .Values.solr.solrCores ) | b64enc | quote }} + url: {{ ( printf "http://%v:%v@%v-solr:8983/%v" .Values.solr.solrUsername $solrPass .Release.Name .Values.solr.solrCores ) | b64enc | quote }} + plainhost: {{ ( ( printf "%v-%v" .Release.Name "solr" ) ) | b64enc | quote }} type: Opaque {{- $_ := set .Values.solr "solrPassword" ( $solrPass | quote ) }} {{- $_ := set .Values.solr.url "plain" ( ( printf "%v-%v" .Release.Name "solr" ) | quote ) }} From 8542e1f02d518a30cf2ff0fa4a7af24ab1a76dff Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 4 Oct 2022 15:04:33 +0300 Subject: [PATCH 2/6] add an extra if --- charts/common/templates/lib/controller/_prepare.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/common/templates/lib/controller/_prepare.tpl b/charts/common/templates/lib/controller/_prepare.tpl index 9b0f4b20..3fb6c843 100644 --- a/charts/common/templates/lib/controller/_prepare.tpl +++ b/charts/common/templates/lib/controller/_prepare.tpl @@ -63,7 +63,7 @@ before chart installation. key: ping {{- end }} {{- if .Values.solr.enabled }} - - name: "SOLR_HOST" + - name: SOLR_HOST valueFrom: secretKeyRef: name: solrcreds @@ -72,6 +72,7 @@ before chart installation. value: "{{ .Values.solr.solrCores }}" - name: SOLR_ENABLE_AUTHENTICATION value: "{{ .Values.solr.solrEnableAuthentication }}" + {{- if eq .Values.solr.solrEnableAuthentication "yes" }} - name: SOLR_ADMIN_USERNAME value: "{{ .Values.solr.solrUsername }}" - name: SOLR_ADMIN_PASSWORD @@ -80,6 +81,7 @@ before chart installation. name: solrcreds key: solr-password {{- end }} + {{- end }} command: - "/bin/sh" - "-c" From ca09143a2505ddd5a03fdcfd883edeb5d07c26cd Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 4 Oct 2022 15:09:24 +0300 Subject: [PATCH 3/6] quote find pattern --- .github/workflows/charts-lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml index ff82b26d..5eaea520 100644 --- a/.github/workflows/charts-lint-test.yaml +++ b/.github/workflows/charts-lint-test.yaml @@ -96,4 +96,4 @@ jobs: - name: Run chart-testing (install) if: needs.lint.outputs.changed == 'true' - run: find ./ -type f -name *.yaml -exec sed -i 's/tccr.io/ghcr.io/gI' {} \; && ct install --config .github/ct-install.yaml + run: find ./ -type f -name "*.yaml" -exec sed -i 's/tccr.io/ghcr.io/gI' {} \; && ct install --config .github/ct-install.yaml From 4f346f7ec9183030f23593c50168242f44d7f1b6 Mon Sep 17 00:00:00 2001 From: TrueCharts-Admin Date: Tue, 4 Oct 2022 18:32:54 +0000 Subject: [PATCH 4/6] chore(deps): update actions/checkout digest to 93ea575 --- .github/workflows/charts-lint-test.yaml | 6 +++--- .github/workflows/common.release.yaml | 2 +- .github/workflows/metadata-label-commenter.yaml | 2 +- .github/workflows/pre-commit-check.yaml | 2 +- .github/workflows/renovate-bump.yaml | 4 ++-- .github/workflows/schedule-sync-labels.yaml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml index ff82b26d..6b59b000 100644 --- a/.github/workflows/charts-lint-test.yaml +++ b/.github/workflows/charts-lint-test.yaml @@ -15,7 +15,7 @@ jobs: changed: ${{ steps.list-changed.outputs.changed }} steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: fetch-depth: 0 @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: fetch-depth: 0 @@ -72,7 +72,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: fetch-depth: 0 diff --git a/.github/workflows/common.release.yaml b/.github/workflows/common.release.yaml index be14fcf6..799cd254 100644 --- a/.github/workflows/common.release.yaml +++ b/.github/workflows/common.release.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: token: ${{ secrets.BOT_TOKEN }} ref: main diff --git a/.github/workflows/metadata-label-commenter.yaml b/.github/workflows/metadata-label-commenter.yaml index e6300cef..1e150a4c 100644 --- a/.github/workflows/metadata-label-commenter.yaml +++ b/.github/workflows/metadata-label-commenter.yaml @@ -22,7 +22,7 @@ jobs: name: Label commenter runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: token: ${{ secrets.BOT_TOKEN }} ref: main diff --git a/.github/workflows/pre-commit-check.yaml b/.github/workflows/pre-commit-check.yaml index 90db185b..cc217101 100644 --- a/.github/workflows/pre-commit-check.yaml +++ b/.github/workflows/pre-commit-check.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: fetch-depth: 0 diff --git a/.github/workflows/renovate-bump.yaml b/.github/workflows/renovate-bump.yaml index 3dcafb0f..33edaa41 100644 --- a/.github/workflows/renovate-bump.yaml +++ b/.github/workflows/renovate-bump.yaml @@ -12,12 +12,12 @@ jobs: name: Get changed Apps runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 name: Checkout with: fetch-depth: 0 token: ${{ secrets.BOT_TOKEN }} - - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 name: Checkout with: fetch-depth: 0 diff --git a/.github/workflows/schedule-sync-labels.yaml b/.github/workflows/schedule-sync-labels.yaml index 5f43446a..2e63aeb3 100644 --- a/.github/workflows/schedule-sync-labels.yaml +++ b/.github/workflows/schedule-sync-labels.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 with: token: ${{ secrets.BOT_TOKEN }} From e4509951aed2c339dddbad868c1f7570d1b07223 Mon Sep 17 00:00:00 2001 From: TrueCharts-Admin Date: Wed, 5 Oct 2022 12:44:14 +0000 Subject: [PATCH 5/6] chore(deps): update actions/checkout digest to 2541b12 --- .github/workflows/charts-lint-test.yaml | 6 +++--- .github/workflows/common.release.yaml | 2 +- .github/workflows/metadata-label-commenter.yaml | 2 +- .github/workflows/pre-commit-check.yaml | 2 +- .github/workflows/renovate-bump.yaml | 4 ++-- .github/workflows/schedule-sync-labels.yaml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/charts-lint-test.yaml b/.github/workflows/charts-lint-test.yaml index 6b59b000..ff82b26d 100644 --- a/.github/workflows/charts-lint-test.yaml +++ b/.github/workflows/charts-lint-test.yaml @@ -15,7 +15,7 @@ jobs: changed: ${{ steps.list-changed.outputs.changed }} steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: fetch-depth: 0 @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: fetch-depth: 0 @@ -72,7 +72,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: fetch-depth: 0 diff --git a/.github/workflows/common.release.yaml b/.github/workflows/common.release.yaml index 799cd254..be14fcf6 100644 --- a/.github/workflows/common.release.yaml +++ b/.github/workflows/common.release.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: token: ${{ secrets.BOT_TOKEN }} ref: main diff --git a/.github/workflows/metadata-label-commenter.yaml b/.github/workflows/metadata-label-commenter.yaml index 1e150a4c..e6300cef 100644 --- a/.github/workflows/metadata-label-commenter.yaml +++ b/.github/workflows/metadata-label-commenter.yaml @@ -22,7 +22,7 @@ jobs: name: Label commenter runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: token: ${{ secrets.BOT_TOKEN }} ref: main diff --git a/.github/workflows/pre-commit-check.yaml b/.github/workflows/pre-commit-check.yaml index cc217101..90db185b 100644 --- a/.github/workflows/pre-commit-check.yaml +++ b/.github/workflows/pre-commit-check.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: fetch-depth: 0 diff --git a/.github/workflows/renovate-bump.yaml b/.github/workflows/renovate-bump.yaml index 33edaa41..3dcafb0f 100644 --- a/.github/workflows/renovate-bump.yaml +++ b/.github/workflows/renovate-bump.yaml @@ -12,12 +12,12 @@ jobs: name: Get changed Apps runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 name: Checkout with: fetch-depth: 0 token: ${{ secrets.BOT_TOKEN }} - - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 name: Checkout with: fetch-depth: 0 diff --git a/.github/workflows/schedule-sync-labels.yaml b/.github/workflows/schedule-sync-labels.yaml index 2e63aeb3..5f43446a 100644 --- a/.github/workflows/schedule-sync-labels.yaml +++ b/.github/workflows/schedule-sync-labels.yaml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3 + uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3 with: token: ${{ secrets.BOT_TOKEN }} From b7cfebdd46ada4da2c4e1986bbe2324ee11ab4f5 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Thu, 6 Oct 2022 23:20:56 +0300 Subject: [PATCH 6/6] fix(pvc): revert size change --- charts/common/Chart.yaml | 2 +- charts/common/templates/class/_pvc.tpl | 2 +- charts/common/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index ea511799..5c62bc0d 100644 --- a/charts/common/Chart.yaml +++ b/charts/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 10.6.9 +version: 10.6.10 diff --git a/charts/common/templates/class/_pvc.tpl b/charts/common/templates/class/_pvc.tpl index 28b04626..1fe87269 100644 --- a/charts/common/templates/class/_pvc.tpl +++ b/charts/common/templates/class/_pvc.tpl @@ -42,7 +42,7 @@ spec: - {{ ( $values.accessMode | default "ReadWriteOnce" ) | quote }} resources: requests: - storage: {{ $values.size | default "256Gi" | quote }} + storage: {{ $values.size | default "999Gi" | quote }} {{- with $values.spec }} {{ tpl ( toYaml . ) $ | indent 2 }} {{- end }} diff --git a/charts/common/values.yaml b/charts/common/values.yaml index 0508a764..9e62b85b 100644 --- a/charts/common/values.yaml +++ b/charts/common/values.yaml @@ -740,7 +740,7 @@ persistence: accessMode: ReadWriteOnce # -- The amount of storage that is requested for the persistent volume. - size: 256Gi + size: 999Gi # -- Set to true to retain the PVC upon `helm uninstall` retain: false