Workaround/Fix for kubernetes/ingress-gce#1462 (#7384)

bitnami · Sep 20, 2021 · 4155070 · 4155070
1 parent 4013978
commit 4155070
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/bitnami/solr/Chart.yaml b/bitnami/solr/Chart.yaml
@@ -27,4 +27,4 @@ name: solr
 sources:
   - https://github.com/bitnami/bitnami-docker-solr
   - https://lucene.apache.org/solr/
-version: 2.0.4
+version: 2.0.5
diff --git a/bitnami/solr/templates/exporter-deployment.yaml b/bitnami/solr/templates/exporter-deployment.yaml
@@ -102,7 +102,7 @@ spec:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.exporter.extraEnvVarsSecret "context" $) }}
             {{- end }}
           ports:
-            - name: exporter-port
+            - name: http
               containerPort: {{ .Values.exporter.port }}
           {{- if .Values.exporter.resources }}
           resources: {{- toYaml .Values.exporter.resources | nindent 12 }}

diff --git a/bitnami/solr/templates/exporter-svc.yaml b/bitnami/solr/templates/exporter-svc.yaml
@@ -33,7 +33,7 @@ spec:
     - name: tcp-client
       port: {{ .Values.exporter.service.port }}
       protocol: TCP
-      targetPort: exporter-port
+      targetPort: http
       {{- if and (or (eq .Values.exporter.service.type "NodePort") (eq .Values.exporter.service.type "LoadBalancer")) (not (empty .Values.exporter.service.nodePorts.http)) }}
       nodePort: {{ .Values.exporter.service.nodePorts.http }}
       {{- else if eq .Values.exporter.service.type "ClusterIP" }}

diff --git a/bitnami/solr/templates/statefulset.yaml b/bitnami/solr/templates/statefulset.yaml
@@ -253,7 +253,7 @@ spec:
                 name: {{ include "common.tplvalues.render" (dict "value" .Values.extraEnvVarsSecret "context" $) }}
             {{- end }}
           ports:
-            - name: solr-client
+            - name: http
               containerPort: {{ .Values.containerPort }}
           {{- if .Values.resources }}
           resources: {{- include "common.tplvalues.render" (dict "value" .Values.resources "context" $) | nindent 12 }}

diff --git a/bitnami/solr/templates/svc-headless.yaml b/bitnami/solr/templates/svc-headless.yaml
@@ -19,6 +19,6 @@ spec:
     - name: tcp-client
       port: {{ .Values.service.port }}
       protocol: TCP
-      targetPort: solr-client
+      targetPort: http
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: solr
diff --git a/bitnami/solr/templates/svc.yaml b/bitnami/solr/templates/svc.yaml
@@ -29,7 +29,7 @@ spec:
     - name: tcp-client
       port: {{ .Values.service.port }}
       protocol: TCP
-      targetPort: solr-client
+      targetPort: http
       {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http)) }}
       nodePort: {{ .Values.service.nodePorts.http }}
       {{- else if eq .Values.service.type "ClusterIP" }}