fix(charts/nd-common): Fix missing layout structure for sidecar resou…

…rces
Nextdoor · Jan 11, 2024 · 2f67f68 · 2f67f68
1 parent ed04d7a
commit 2f67f68
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/charts/daemonset-app/Chart.yaml b/charts/daemonset-app/Chart.yaml
@@ -9,5 +9,5 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: nd-common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../nd-common
diff --git a/charts/nd-common/Chart.yaml b/charts/nd-common/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: nd-common
 description: A helper chart used by most of our other charts
 type: library
-version: 0.3.0
+version: 0.3.1
 appVersion: latest
diff --git a/charts/nd-common/README.md b/charts/nd-common/README.md
@@ -2,7 +2,7 @@
 
 A helper chart used by most of our other charts
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 **This chart is a [Library Chart](https://helm.sh/docs/topics/library_charts/)** -
 this means that the chart itself deploys no resources, and has no `.yaml`

diff --git a/charts/nd-common/templates/_istio.tpl b/charts/nd-common/templates/_istio.tpl
@@ -102,10 +102,10 @@ Usage: To setup the values follow the regular k8s resources structure under the
        memory: 60Mi
 */ -}}
 {{- with .Values.istio.resources }}
-sidecar.istio.io/proxyCPU: {{ .requests.cpu | default "100m" | quote }}
-sidecar.istio.io/proxyCPULimit: {{ .limits.cpu | default "2" | quote }}
-sidecar.istio.io/proxyMemory: {{ .requests.memory | default "128Mi" | quote }}
-sidecar.istio.io/proxyMemoryLimit: {{ .limits.memory | default "1Gi" | quote }}
+sidecar.istio.io/proxyCPU: {{ .requests.cpu | quote }}
+sidecar.istio.io/proxyCPULimit: {{ .limits.cpu | quote }}
+sidecar.istio.io/proxyMemory: {{ .requests.memory | quote }}
+sidecar.istio.io/proxyMemoryLimit: {{ .limits.memory | quote }}
 {{- end }}
 
 {{- end }}

diff --git a/charts/nd-common/values.yaml b/charts/nd-common/values.yaml
@@ -1 +1,8 @@
-# empty on purpose
+istio:
+  resources:
+    requests:
+      cpu: 100m
+      memory: 128Mi
+    limits:
+      cpu: 2
+      memory: 1Gi
diff --git a/charts/rollout-app/Chart.yaml b/charts/rollout-app/Chart.yaml
@@ -13,5 +13,5 @@ dependencies:
     repository: https://k8s-charts.nextdoor.com
     condition: istio-alerts.enabled
   - name: nd-common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../nd-common
diff --git a/charts/rollout-app/README.md b/charts/rollout-app/README.md
@@ -167,7 +167,7 @@ kmsSecretsRegion: us-west-2 (AWS region where the KMS key is located)
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../nd-common | nd-common | 0.3.0 |
+| file://../nd-common | nd-common | 0.3.1 |
 | https://k8s-charts.nextdoor.com | istio-alerts | 0.2.0 |
 
 ## Values

diff --git a/charts/simple-app/Chart.yaml b/charts/simple-app/Chart.yaml
@@ -13,5 +13,5 @@ dependencies:
     repository: https://k8s-charts.nextdoor.com
     condition: istio-alerts.enabled
   - name: nd-common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../nd-common
diff --git a/charts/simple-app/README.md b/charts/simple-app/README.md
@@ -312,7 +312,7 @@ kmsSecretsRegion: us-west-2 (AWS region where the KMS key is located)
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../nd-common | nd-common | 0.3.0 |
+| file://../nd-common | nd-common | 0.3.1 |
 | https://k8s-charts.nextdoor.com | istio-alerts | 0.2.0 |
 
 ## Values

diff --git a/charts/stateful-app/Chart.yaml b/charts/stateful-app/Chart.yaml
@@ -13,5 +13,5 @@ dependencies:
     repository: https://k8s-charts.nextdoor.com
     condition: istio-alerts.enabled
   - name: nd-common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../nd-common
diff --git a/charts/stateful-app/README.md b/charts/stateful-app/README.md
@@ -259,7 +259,7 @@ kmsSecretsRegion: us-west-2 (AWS region where the KMS key is located)
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../nd-common | nd-common | 0.3.0 |
+| file://../nd-common | nd-common | 0.3.1 |
 | https://k8s-charts.nextdoor.com | istio-alerts | 0.2.0 |
 
 ## Values