Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(charts/nd-common): Adding support for istio sidecar resource override #256

Merged
merged 6 commits into from
Jan 10, 2024
Merged

feat(charts/nd-common): Adding support for istio sidecar resource override #256

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cbdc592
feat(charts/nd-common): Adding support for istio sidecar resource ove…
scohen-nd Jan 10, 2024
22e4aff
Adding the change to the rest of the relevant charts
scohen-nd Jan 10, 2024
6a57f42
Update docs
scohen-nd Jan 10, 2024
054faeb
Remove duplicate
scohen-nd Jan 10, 2024
77affb1
Update based on comments from Matt
scohen-nd Jan 10, 2024
b9bd4a9
Fix new lines
scohen-nd Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/daemonset-app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apiVersion: v2
name: daemonset-app
description: Default DaemonSet Helm Chart
type: application
version: 0.15.0
version: 0.15.1
appVersion: latest
maintainers:
- name: diranged
email: [email protected]
dependencies:
- name: nd-common
version: 0.2.0
version: 0.2.1
repository: file://../nd-common
2 changes: 1 addition & 1 deletion charts/daemonset-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Default DaemonSet Helm Chart

![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
![Version: 0.15.1](https://img.shields.io/badge/Version-0.15.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)

[statefulsets]: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
[hpa]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
Expand Down
2 changes: 1 addition & 1 deletion charts/nd-common/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: nd-common
description: A helper chart used by most of our other charts
type: library
version: 0.2.0
version: 0.2.1
scohen-nd marked this conversation as resolved.
Show resolved Hide resolved
appVersion: latest
2 changes: 1 addition & 1 deletion charts/nd-common/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A helper chart used by most of our other charts

![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.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.2.1](https://img.shields.io/badge/Version-0.2.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`
Expand Down
19 changes: 19 additions & 0 deletions charts/nd-common/templates/_istio.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,25 @@ proxy.istio.io/overrides: >-
}
{{- end }}

{{/*
scohen-nd marked this conversation as resolved.
Show resolved Hide resolved

Prepare the set of resource annotations for the istio-sidecar.
Fallbacking to the current implemented default resources:
Limits:
cpu: 2
memory: 1Gi
Requests:
cpu: 100m
memory: 128Mi

*/}}
{{- if or (or .Values.istio.proxyCPU .Values.istio.proxyMemory) (or .Values.istio.proxyCPULimit .Values.istio.proxyMemoryLimit) }}
scohen-nd marked this conversation as resolved.
Show resolved Hide resolved
sidecar.istio.io/proxyCPU: {{ .Values.istio.proxyCPU | default "100m" | quote }}
sidecar.istio.io/proxyCPULimit: {{ .Values.istio.proxyCPULimit | default "2" | quote }}
sidecar.istio.io/proxyMemory: {{ .Values.istio.proxyMemory | default "128Mi" | quote }}
sidecar.istio.io/proxyMemoryLimit: {{ .Values.istio.proxyMemoryLimit | default "1Gi" | quote }}
{{- end }}

{{- end }}
{{- end }}

Expand Down
4 changes: 2 additions & 2 deletions charts/rollout-app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: rollout-app
description: Argo Rollout-based Application Helm Chart
type: application
version: 0.7.0
version: 0.7.1
appVersion: latest
maintainers:
- name: diranged
Expand All @@ -13,5 +13,5 @@ dependencies:
repository: https://k8s-charts.nextdoor.com
condition: istio-alerts.enabled
- name: nd-common
version: 0.2.0
version: 0.2.1
repository: file://../nd-common
4 changes: 2 additions & 2 deletions charts/rollout-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Argo Rollout-based Application Helm Chart

![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
![Version: 0.7.1](https://img.shields.io/badge/Version-0.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)

[analysistemplate]: https://argoproj.github.io/argo-rollouts/features/analysis/?query=AnalysisTemplate#background-analysis
[argo_rollouts]: https://argoproj.github.io/argo-rollouts/
Expand Down Expand Up @@ -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.2.0 |
| file://../nd-common | nd-common | 0.2.1 |
| https://k8s-charts.nextdoor.com | istio-alerts | 0.2.0 |

## Values
Expand Down
4 changes: 2 additions & 2 deletions charts/simple-app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: simple-app
description: Default Microservice Helm Chart
type: application
version: 1.6.0
version: 1.6.1
appVersion: latest
maintainers:
- name: diranged
Expand All @@ -13,5 +13,5 @@ dependencies:
repository: https://k8s-charts.nextdoor.com
condition: istio-alerts.enabled
- name: nd-common
version: 0.2.0
version: 0.2.1
repository: file://../nd-common
4 changes: 2 additions & 2 deletions charts/simple-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Default Microservice Helm Chart

![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)

[deployments]: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/
[hpa]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
Expand Down Expand Up @@ -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.2.0 |
| file://../nd-common | nd-common | 0.2.1 |
| https://k8s-charts.nextdoor.com | istio-alerts | 0.2.0 |

## Values
Expand Down
4 changes: 2 additions & 2 deletions charts/stateful-app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: stateful-app
description: Default StatefulSet Helm Chart
type: application
version: 0.16.0
version: 0.16.1
appVersion: latest
maintainers:
- name: diranged
Expand All @@ -13,5 +13,5 @@ dependencies:
repository: https://k8s-charts.nextdoor.com
condition: istio-alerts.enabled
- name: nd-common
version: 0.2.0
version: 0.2.1
repository: file://../nd-common
4 changes: 2 additions & 2 deletions charts/stateful-app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Default StatefulSet Helm Chart

![Version: 0.16.0](https://img.shields.io/badge/Version-0.16.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
![Version: 0.16.1](https://img.shields.io/badge/Version-0.16.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)

[statefulsets]: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/
[hpa]: https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/
Expand Down Expand Up @@ -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.2.0 |
| file://../nd-common | nd-common | 0.2.1 |
| https://k8s-charts.nextdoor.com | istio-alerts | 0.2.0 |

## Values
Expand Down
Loading