[tor] Fix tor selectors (#122)

bboerst · Oct 6, 2024 · 8c94053 · 8c94053
1 parent e794187
commit 8c94053
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/charts/tor/Chart.yaml b/charts/tor/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 description: Tor helm chart. The container can be started as middle(guard)- , bridge- , exit-relay or as proxy exposing only the Socks5 Port per default when running.
 name: tor
 type: application
-version: 0.1.2
+version: 0.1.3
 # renovate: image=lncm/tor
 appVersion: "0.4.7.13"
diff --git a/charts/tor/README.md b/charts/tor/README.md
@@ -1,6 +1,6 @@
 # tor
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.7.13](https://img.shields.io/badge/AppVersion-0.4.7.13-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.7.13](https://img.shields.io/badge/AppVersion-0.4.7.13-informational?style=flat-square)
 
 Tor helm chart. The container can be started as middle(guard)- , bridge- , exit-relay or as proxy exposing only the Socks5 Port per default when running.
 
@@ -65,4 +65,4 @@ Tor helm chart. The container can be started as middle(guard)- , bridge- , exit-
 | torrc | string | `"# Ports\nSocksPort   0.0.0.0:9050\nControlPort 0.0.0.0:9051\n\n# HashedControlPassword <Refer to https://github.com/lncm/docker-tor#generating-tor-passwords>\n\n# SSH v3\n# HiddenServiceDir /var/lib/tor/ssh\n# HiddenServiceVersion 3\n# HiddenServicePort 22 127.0.0.1:22\n\n# Bitcoin P2P v3\n# HiddenServiceDir /var/lib/tor/bitcoin-p2p\n# HiddenServiceVersion 3\n# HiddenServicePort 8333 bitcoin-core.bitcoin.svc.cluster.local:8333\n\n# Electrs v3\n# HiddenServiceDir /var/lib/tor/electrs\n# HiddenServiceVersion 3\n# HiddenServicePort 50001 electrs.bitcoin.svc.cluster.local:50001\n"` |  |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1)
diff --git a/charts/tor/templates/deployment.yaml b/charts/tor/templates/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: {{ template "tor.name" . }}
+    app: {{ template "tor.fullname" . }}
     chart: {{ template "tor.chart" . }}
     heritage: {{ .Release.Service }}
     {{ .Values.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: controller
@@ -15,7 +15,7 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "tor.name" . }}
+      app: {{ template "tor.fullname" . }}
     {{- if .Values.useComponentLabel }}
       {{ .Values.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: tor
     {{- end }}
@@ -31,8 +31,8 @@ spec:
       {{- end }}
       {{- end }}
       labels:
-        app: {{ template "tor.name" . }}
-        component: "{{ .Values.name }}"
+        app: {{ template "tor.fullname" . }}
+        component: "{{ template "tor.name" . }}"
         {{ .Values.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: tor
         {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}

diff --git a/charts/tor/templates/service.yaml b/charts/tor/templates/service.yaml
@@ -13,9 +13,9 @@ metadata:
 {{- if .Values.service.labels }}
 {{ toYaml .Values.service.labels | indent 4 }}
 {{- end }}
-    app: {{ template "tor.name" . }}
+    app: {{ template "tor.fullname" . }}
     chart: {{ template "tor.chart" . }}
-    component: "{{ .Values.name }}"
+    component: "{{ template "tor.name" . }}"
     heritage: {{ .Release.Service }}
   name: {{ template "tor.fullname" . }}
 spec:
@@ -87,7 +87,7 @@ spec:
      {{- end }}
   {{- end }}
   selector:
-    app: {{ template "tor.name" . }}
+    app: {{ template "tor.fullname" . }}
     {{ .Values.componentLabelKeyOverride | default "app.kubernetes.io/component" }}: tor
   type: "{{ .Values.service.type }}"
 {{- end }}