Skip to content

Commit

Permalink
Chart: Sync to upstream. (#589)
Browse files Browse the repository at this point in the history
Co-authored-by: Marco Ebert <[email protected]>
  • Loading branch information
taylorbot and Gacko authored Jan 27, 2024
1 parent 0c89896 commit 6a88d79
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s

## [Unreleased]

### Changed

- Image: Update to [`v1.9.6`](https://github.com/kubernetes/ingress-nginx/blob/main/changelog/controller-1.9.6.md). ([#584](https://github.com/giantswarm/ingress-nginx-app/pull/584))

## [3.5.0] - 2024-01-15

### Added
Expand Down
2 changes: 1 addition & 1 deletion helm/ingress-nginx/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ annotations:
application.giantswarm.io/team: team-cabbage
ui.giantswarm.io/logo: https://s.giantswarm.io/app-icons/ingress-nginx/2/logo_dark.svg
apiVersion: v2
appVersion: 1.9.5
appVersion: 1.9.6
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
home: https://github.com/giantswarm/ingress-nginx-app
icon: https://s.giantswarm.io/app-icons/ingress-nginx/2/icon_dark.svg
Expand Down
6 changes: 3 additions & 3 deletions helm/ingress-nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ingress-nginx](https://github.com/giantswarm/ingress-nginx-app) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer

![Version: 3.5.0](https://img.shields.io/badge/Version-3.5.0-informational?style=flat-square) ![AppVersion: 1.9.5](https://img.shields.io/badge/AppVersion-1.9.5-informational?style=flat-square)
![Version: 3.5.0](https://img.shields.io/badge/Version-3.5.0-informational?style=flat-square) ![AppVersion: 1.9.6](https://img.shields.io/badge/AppVersion-1.9.6-informational?style=flat-square)

To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.

Expand Down Expand Up @@ -126,7 +126,7 @@ Please ensure that cert-manager is correctly installed and configured.
| controller.admissionWebhooks.patch.image.digest | string | `""` | |
| controller.admissionWebhooks.patch.image.image | string | `"giantswarm/ingress-nginx-kube-webhook-certgen"` | |
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
| controller.admissionWebhooks.patch.image.tag | string | `"v20231011-8b53cabe0"` | |
| controller.admissionWebhooks.patch.image.tag | string | `"v20231226-1a7112e06"` | |
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `true` | Enable 'networkPolicy' or not |
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
Expand Down Expand Up @@ -196,7 +196,7 @@ Please ensure that cert-manager is correctly installed and configured.
| controller.image.runAsNonRoot | bool | `true` | |
| controller.image.runAsUser | int | `101` | |
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
| controller.image.tag | string | `"v1.9.5"` | |
| controller.image.tag | string | `"v1.9.6"` | |
| controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
| controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |
Expand Down
4 changes: 2 additions & 2 deletions helm/ingress-nginx/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ controller:
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
tag: "v1.9.5"
tag: "v1.9.6"
digest: ""
digestChroot: ""
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -798,7 +798,7 @@ controller:
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
tag: v20231011-8b53cabe0
tag: v20231226-1a7112e06
digest: ""
pullPolicy: IfNotPresent
# -- Provide a priority class name to the webhook patching job
Expand Down
5 changes: 3 additions & 2 deletions vendir.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- git:
commitTitle: 'Merge pull request #10795 from strongjz/release-1.9.5...'
sha: be46124ccc9e8158165f06e3f7d2ebd0cbbb284f
commitTitle: 'docs: update annotations docs with missing session-cookie section
(#10917)'
sha: c295cd1c4bdb385f0a97371a4f4fad6470b39751
path: ingress-nginx
path: helm
kind: LockConfig

0 comments on commit 6a88d79

Please sign in to comment.