From 0788e8acc647a77ced3905e1d48f13edc9eaa0f2 Mon Sep 17 00:00:00 2001
From: CharlieC3 <2747302+CharlieC3@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:02:41 -0400
Subject: [PATCH] [bitcoin-core] revert 8845dc1

---
 hirosystems/bitcoin-core/Chart.lock                 | 6 +++---
 hirosystems/bitcoin-core/Chart.yaml                 | 2 +-
 hirosystems/bitcoin-core/templates/ingress.yaml     | 4 ++--
 hirosystems/bitcoin-core/templates/service-set.yaml | 2 +-
 hirosystems/bitcoin-core/templates/service.yaml     | 2 +-
 hirosystems/bitcoin-core/templates/statefulset.yaml | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hirosystems/bitcoin-core/Chart.lock b/hirosystems/bitcoin-core/Chart.lock
index c2b6233..f9c210e 100644
--- a/hirosystems/bitcoin-core/Chart.lock
+++ b/hirosystems/bitcoin-core/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 2.19.2
-digest: sha256:36ee26c48abc4337e3fbba948307c1f39201ba45f654b6eeeee5d96c664bf049
-generated: "2024-05-08T14:20:55.000426-04:00"
+  version: 2.20.5
+digest: sha256:d887f4d52c98e9524f9eb8be04f987acc240288a9c1cf2653cc1b7c221230ee7
+generated: "2024-07-19T16:02:01.053627-04:00"
diff --git a/hirosystems/bitcoin-core/Chart.yaml b/hirosystems/bitcoin-core/Chart.yaml
index a806094..2b59e63 100644
--- a/hirosystems/bitcoin-core/Chart.yaml
+++ b/hirosystems/bitcoin-core/Chart.yaml
@@ -25,4 +25,4 @@ sources:
   - https://github.com/bitcoin/bitcoin
   - https://github.com/ruimarinho/docker-bitcoin-core
   - https://bitcoin.org
-version: 2.1.1
+version: 2.1.2
diff --git a/hirosystems/bitcoin-core/templates/ingress.yaml b/hirosystems/bitcoin-core/templates/ingress.yaml
index d5b2835..295ecdc 100644
--- a/hirosystems/bitcoin-core/templates/ingress.yaml
+++ b/hirosystems/bitcoin-core/templates/ingress.yaml
@@ -34,7 +34,7 @@ spec:
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "tcp-rpc" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http-rpc" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
     - host: {{ .name | quote }}
@@ -44,7 +44,7 @@ spec:
             {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "tcp-rpc" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http-rpc" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraRules "context" $) | nindent 4 }}
diff --git a/hirosystems/bitcoin-core/templates/service-set.yaml b/hirosystems/bitcoin-core/templates/service-set.yaml
index e490bf3..0eaf1a4 100644
--- a/hirosystems/bitcoin-core/templates/service-set.yaml
+++ b/hirosystems/bitcoin-core/templates/service-set.yaml
@@ -45,7 +45,7 @@ spec:
   loadBalancerIP: {{ $.Values.service.loadBalancerIP }}
   {{- end }}
   ports:
-    - name: tcp-rpc
+    - name: http-rpc
       port: {{ $.Values.service.ports.rpc }}
       {{- if $.Values.service.ports.rpcTargetPort }}
       targetPort: {{ $.Values.service.ports.rpcTargetPort }}
diff --git a/hirosystems/bitcoin-core/templates/service.yaml b/hirosystems/bitcoin-core/templates/service.yaml
index 58463db..e4a77c3 100644
--- a/hirosystems/bitcoin-core/templates/service.yaml
+++ b/hirosystems/bitcoin-core/templates/service.yaml
@@ -39,7 +39,7 @@ spec:
   loadBalancerIP: {{ .Values.service.loadBalancerIP }}
   {{- end }}
   ports:
-    - name: tcp-rpc
+    - name: http-rpc
       port: {{ .Values.service.ports.rpc }}
       {{- if .Values.service.ports.rpcTargetPort }}
       targetPort: {{ .Values.service.ports.rpcTargetPort }}
diff --git a/hirosystems/bitcoin-core/templates/statefulset.yaml b/hirosystems/bitcoin-core/templates/statefulset.yaml
index d5967e3..ca583ab 100644
--- a/hirosystems/bitcoin-core/templates/statefulset.yaml
+++ b/hirosystems/bitcoin-core/templates/statefulset.yaml
@@ -167,7 +167,7 @@ spec:
           resources: {{- toYaml .Values.resources | nindent 12 }}
           {{- end }}
           ports:
-            - name: tcp-rpc
+            - name: http-rpc
               containerPort: {{ .Values.containerPorts.rpc }}
             - name: tcp-p2p
               containerPort: {{ .Values.containerPorts.p2p }}
@@ -179,7 +179,7 @@ spec:
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }}
             httpGet:
               path: /v2/info
-              port: tcp-rpc
+              port: http-rpc
           {{- else if .Values.customLivenessProbe }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customLivenessProbe "context" $) | nindent 12 }}
           {{- end }}
@@ -187,7 +187,7 @@ spec:
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.readinessProbe "enabled") "context" $) | nindent 12 }}
             httpGet:
               path: /v2/info
-              port: tcp-rpc
+              port: http-rpc
           {{- else if .Values.customReadinessProbe }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customReadinessProbe "context" $) | nindent 12 }}
           {{- end }}
@@ -195,7 +195,7 @@ spec:
           startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.startupProbe "enabled") "context" $) | nindent 12 }}
             httpGet:
               path: /v2/info
-              port: tcp-rpc
+              port: http-rpc
           {{- else if .Values.customStartupProbe }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }}
           {{- end }}