Merge pull request #243 from stavros-k/solr

fix(solr): add missing plainhost key in secret

.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

charts/common/Chart.yaml

@@ -15,4 +15,4 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 10.6.8
+version: 10.6.9

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"

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 ) }}