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

Jump to bottom

Fix small cluster profile resource requests #42

Merged
merged 6 commits into from
Mar 23, 2020
Merged

Fix small cluster profile resource requests #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cccc22f
Compare cluster profile as string
Mar 18, 2020
0359624
Compare cluster profile as int
Mar 19, 2020
d02f57a
Use toString to ensure cluster profile is string
Mar 20, 2020
151d192
Fix small profile resource requests
Mar 22, 2020
c0d188e
Add changelog entry
Mar 22, 2020
846dd8c
Classify cluster as small in integration tests
Mar 22, 2020
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project's packages adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]

### Changed

- Fix small cluster profile resource requests. ([#42](https://github.com/giantswarm/nginx-ingress-controller-app/pull/42))

## [v1.6.4] 2020-03-17

### Changed
Expand Down Expand Up @@ -115,6 +121,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

Previous versions changelog can be found [here](https://github.com/giantswarm/kubernetes-nginx-ingress-controller/blob/master/CHANGELOG.md)

[Unreleased]: https://github.com/giantswarm/nginx-ingress-controller-app/compare/v1.6.4...master
[v1.6.4]: https://github.com/giantswarm/nginx-ingress-controller-app/releases/tag/v1.6.4
[v1.6.3]: https://github.com/giantswarm/nginx-ingress-controller-app/releases/tag/v1.6.3
[v1.6.2]: https://github.com/giantswarm/nginx-ingress-controller-app/releases/tag/v1.6.2
Expand Down
2 changes: 1 addition & 1 deletion helm/nginx-ingress-controller-app/templates/controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
{{- if .Values.cluster.profile }}
{{- if gt (.Values.cluster.profile | int) 2 }}
resources:
{{- if eq (.Values.cluster.profile | quote) "3" }}
{{- if eq (.Values.cluster.profile | toString) "3" }}
{{ toYaml .Values.controller.profile.small.resources | indent 10 }}
{{- else }}
{{ toYaml .Values.controller.resources | indent 10 }}
Expand Down
5 changes: 3 additions & 2 deletions helm/nginx-ingress-controller-app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ controller:
# small (3) cluster profile - > 3 worker nodes, max CPU still < 4
small:
resources:
cpu: 500m
memory: 600Mi
requests:
cpu: 500m
memory: 600Mi

# optional hpa settings
autoscaling:
Expand Down
8 changes: 3 additions & 5 deletions integration/templates/ingress_controller_values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
package templates

// IngressControllerValues defines value overrides to use in e2e test.
const IngressControllerValues = `controller:
resources:
requests:
cpu: 500m
memory: 600Mi
const IngressControllerValues = `cluster:
profile: 3
controller:
service:
enabled: true
`