From 636e336dd328362a57c6b82133d53c1646fccf53 Mon Sep 17 00:00:00 2001 From: Svetomir Smiljkovic Date: Thu, 2 Jul 2020 11:12:14 +0200 Subject: [PATCH] Fix debug_api (#31) --- charts/bee/Chart.yaml | 2 +- charts/bee/templates/ingress-debug.yaml | 2 +- charts/bee/templates/service-debug.yaml | 2 +- charts/bee/templates/service-headless.yaml | 2 +- charts/bee/templates/servicemonitor.yaml | 2 +- charts/bee/templates/statefulset.yaml | 2 +- charts/bee/values.yaml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/bee/Chart.yaml b/charts/bee/Chart.yaml index 2231496..da7e7e9 100644 --- a/charts/bee/Chart.yaml +++ b/charts/bee/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 appVersion: latest name: bee -version: 0.5.0 +version: 0.5.1 description: Ethereum Swarm Bee Helm chart for Kubernetes home: https://swarm.ethereum.org icon: https://swarm-guide.readthedocs.io/en/latest/_images/swarm.png diff --git a/charts/bee/templates/ingress-debug.yaml b/charts/bee/templates/ingress-debug.yaml index fd04e59..609b0c4 100644 --- a/charts/bee/templates/ingress-debug.yaml +++ b/charts/bee/templates/ingress-debug.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.beeConfig.enable_debug_api .Values.ingressDebug.enabled -}} +{{- if and .Values.beeConfig.debug_api_enable .Values.ingressDebug.enabled -}} {{- $root := . -}} {{- $fullName := include "bee.fullname" $root -}} diff --git a/charts/bee/templates/service-debug.yaml b/charts/bee/templates/service-debug.yaml index a6214b1..8341371 100644 --- a/charts/bee/templates/service-debug.yaml +++ b/charts/bee/templates/service-debug.yaml @@ -1,4 +1,4 @@ -{{- if .Values.beeConfig.enable_debug_api -}} +{{- if .Values.beeConfig.debug_api_enable -}} {{- $root := . -}} diff --git a/charts/bee/templates/service-headless.yaml b/charts/bee/templates/service-headless.yaml index bc0d37c..0a5da6f 100644 --- a/charts/bee/templates/service-headless.yaml +++ b/charts/bee/templates/service-headless.yaml @@ -16,7 +16,7 @@ spec: port: {{ int (split ":" .Values.beeConfig.p2p_addr )._1 }} protocol: TCP targetPort: p2p - {{- if .Values.beeConfig.enable_debug_api }} + {{- if .Values.beeConfig.debug_api_enable }} - name: debug port: {{ int (split ":" .Values.beeConfig.debug_api_addr )._1 }} protocol: TCP diff --git a/charts/bee/templates/servicemonitor.yaml b/charts/bee/templates/servicemonitor.yaml index 83afba5..344f4e1 100644 --- a/charts/bee/templates/servicemonitor.yaml +++ b/charts/bee/templates/servicemonitor.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.serviceMonitor.enabled .Values.beeConfig.enable_debug_api -}} +{{- if and .Values.serviceMonitor.enabled .Values.beeConfig.debug_api_enable -}} --- apiVersion: monitoring.coreos.com/v1 diff --git a/charts/bee/templates/statefulset.yaml b/charts/bee/templates/statefulset.yaml index 18b7737..17102a4 100644 --- a/charts/bee/templates/statefulset.yaml +++ b/charts/bee/templates/statefulset.yaml @@ -98,7 +98,7 @@ spec: - containerPort: {{ int (split ":" .Values.beeConfig.p2p_addr )._1 }} name: p2p protocol: TCP - {{- if .Values.beeConfig.enable_debug_api }} + {{- if .Values.beeConfig.debug_api_enable }} - containerPort: {{ int (split ":" .Values.beeConfig.debug_api_addr )._1 }} name: debug protocol: TCP diff --git a/charts/bee/values.yaml b/charts/bee/values.yaml index 0cc357e..ec6a8a3 100644 --- a/charts/bee/values.yaml +++ b/charts/bee/values.yaml @@ -60,7 +60,7 @@ ingress: tlsSecret: "" tls: false -## If enabled and beeConfig.enable_debug_api is enabled, creates ingress for debug api +## If enabled and beeConfig.debug_api_enable is enabled, creates ingress for debug api ## Creates one ingress per pod ## Total number of created ingress objects is: replicaCount ## Hostname for 'per pod ingresses' is: -debug-, or -debug-. if domain is specified @@ -111,7 +111,7 @@ persistence: # storageClass: "-" ## Enable this if you're using https://github.com/coreos/prometheus-operator -## and beeConfig.enable_debug_api is enabled +## and beeConfig.debug_api_enable is enabled serviceMonitor: enabled: false additionalLabels: {} @@ -135,7 +135,7 @@ serviceMonitor: podAnnotations: {} ## Add this annotations if you're using https://github.com/prometheus/prometheus -## and beeConfig.enable_debug_api is enabled +## and beeConfig.debug_api_enable is enabled # prometheus.io/scrape: "true" # prometheus.io/port: "6060"