From 226ccc84f0e64172727522d86ee8a9fbb1878b01 Mon Sep 17 00:00:00 2001
From: Brandon Clifford <1628223+brandon099@users.noreply.github.com>
Date: Wed, 28 Jul 2021 22:32:30 -0600
Subject: [PATCH] Move Blocky replicas under controller definition (#1102)

---
 charts/stable/blocky/Chart.yaml  | 2 +-
 charts/stable/blocky/README.md   | 4 ++--
 charts/stable/blocky/values.yaml | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/charts/stable/blocky/Chart.yaml b/charts/stable/blocky/Chart.yaml
index ac3156fa..4af7aa46 100644
--- a/charts/stable/blocky/Chart.yaml
+++ b/charts/stable/blocky/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.14
 description: DNS proxy as ad-blocker for local network
 name: blocky
-version: 7.1.0
+version: 7.1.1
 kubeVersion: ">=1.16.0-0"
 keywords:
 - blocky
diff --git a/charts/stable/blocky/README.md b/charts/stable/blocky/README.md
index e1eeeee1..f490ad0a 100644
--- a/charts/stable/blocky/README.md
+++ b/charts/stable/blocky/README.md
@@ -1,6 +1,6 @@
 # blocky
 
-![Version: 7.1.0](https://img.shields.io/badge/Version-7.1.0-informational?style=flat-square) ![AppVersion: v0.14](https://img.shields.io/badge/AppVersion-v0.14-informational?style=flat-square)
+![Version: 7.1.1](https://img.shields.io/badge/Version-7.1.1-informational?style=flat-square) ![AppVersion: v0.14](https://img.shields.io/badge/AppVersion-v0.14-informational?style=flat-square)
 
 DNS proxy as ad-blocker for local network
 
@@ -76,6 +76,7 @@ N/A
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | config | string | see URL to default config | Full list of options https://github.com/0xERR0R/blocky/blob/master/docs/config.yml |
+| controller.replicas | int | `1` | (int) Number of pods to load balance between |
 | controller.strategy | string | `"RollingUpdate"` | Set the controller upgrade strategy |
 | env | object | See below | environment variables. See [image docs](https://0xerr0r.github.io/blocky/installation/#run-with-docker) for more details. |
 | env.TZ | string | `"UTC"` | Set the container timezone |
@@ -84,7 +85,6 @@ N/A
 | image.tag | string | `"v0.14"` | image tag |
 | persistence | object | See values.yaml | Configure persistence settings for the chart under this key. |
 | prometheus.serviceMonitor | object | See values.yaml | Enable and configure a Prometheus serviceMonitor for the chart under this key. See also the notes under `additionalContainers`. |
-| replicas | int | `1` | (int) Number of pods to load balance between |
 | service | object | See values.yaml | Configures service settings for the chart. |
 
 ## Changelog
diff --git a/charts/stable/blocky/values.yaml b/charts/stable/blocky/values.yaml
index c6a2f1f8..369bab66 100644
--- a/charts/stable/blocky/values.yaml
+++ b/charts/stable/blocky/values.yaml
@@ -16,6 +16,8 @@ image:
 controller:
   # -- Set the controller upgrade strategy
   strategy: RollingUpdate
+  # -- (int) Number of pods to load balance between
+  replicas: 1
 
 # -- environment variables. See [image docs](https://0xerr0r.github.io/blocky/installation/#run-with-docker) for more details.
 # @default -- See below
@@ -23,9 +25,6 @@ env:
   # -- Set the container timezone
   TZ: UTC
 
-# -- (int) Number of pods to load balance between
-replicas: 1
-
 # -- Configures service settings for the chart.
 # @default -- See values.yaml
 service: