Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ metadata:
"image": {
"pullPolicy": "IfNotPresent",
"repository": "nginx/nginx-ingress",
"tag": "3.2.0-ubi"
"tag": "3.2.1-ubi"
},
"includeYear": false,
"ingressClass": "nginx",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ metadata:
"customPorts": [],
"image": {
"repository": "nginx/nginx-ingress",
"tag": "3.2.0-ubi",
"tag": "3.2.1-ubi",
"pullPolicy": "IfNotPresent"
},
"lifecycle": {},
Expand Down
2 changes: 1 addition & 1 deletion config/samples/charts_v1alpha1_nginxingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
customPorts: []
image:
repository: nginx/nginx-ingress
tag: "3.2.0-ubi"
tag: "3.2.1-ubi"
# digest: "sha256:CHANGEME"
pullPolicy: IfNotPresent
lifecycle: {}
Expand Down
4 changes: 2 additions & 2 deletions docs/nginx-ingress-controller.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
customPorts: []
image:
repository: nginx/nginx-ingress
tag: "3.2.0-ubi"
tag: "3.2.1-ubi"
# digest: "sha256:CHANGEME"
pullPolicy: IfNotPresent
lifecycle: {}
Expand Down Expand Up @@ -220,7 +220,7 @@ Parameter | Description | Default
`controller.logLevel` | The log level of the Ingress Controller. | 1
`controller.image.digest ` | The image digest of the Ingress Controller. | None
`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress
`controller.image.tag` | The tag of the Ingress Controller image. | 3.2.0
`controller.image.tag` | The tag of the Ingress Controller image. | 3.2.1
`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent
`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {}
`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: nginx/nginx-ingress
tag: 3.2.0-ubi
tag: 3.2.1-ubi
ingressClass: nginx
kind: deployment
nginxplus: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ spec:
image:
pullPolicy: IfNotPresent
repository: nginx/nginx-ingress
tag: 3.2.0-ubi
tag: 3.2.1-ubi
ingressClass: nginx
kind: deployment
nginxplus: true
Expand Down
8 changes: 4 additions & 4 deletions helm-charts/nginx-ingress/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 3.2.0
appVersion: 3.2.1
description: NGINX Ingress Controller
home: https://github.com/nginxinc/kubernetes-ingress
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.2.0/deployments/helm-chart/chart-icon.png
icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v3.2.1/deployments/helm-chart/chart-icon.png
keywords:
- ingress
- nginx
Expand All @@ -12,6 +12,6 @@ maintainers:
name: nginxinc
name: nginx-ingress
sources:
- https://github.com/nginxinc/kubernetes-ingress/tree/v3.2.0/deployments/helm-chart
- https://github.com/nginxinc/kubernetes-ingress/tree/v3.2.1/deployments/helm-chart
type: application
version: 0.18.0
version: 0.18.1
10 changes: 5 additions & 5 deletions helm-charts/nginx-ingress/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ To install the chart with the release name my-release (my-release is the name th
For NGINX:

```console
helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.0
helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.1
```

For NGINX Plus: (assuming you have pushed the Ingress Controller image `nginx-plus-ingress` to your private registry `myregistry.example.com`)

```console
helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.0 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
helm install my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.1 --set controller.image.repository=myregistry.example.com/nginx-plus-ingress --set controller.nginxplus=true
```

This will install the latest `edge` version of the Ingress Controller from GitHub Container Registry. If you prefer to use Docker Hub, you can replace `ghcr.io/nginxinc/charts/nginx-ingress` with `registry-1.docker.io/nginxcharts/nginx-ingress`.
Expand All @@ -74,7 +74,7 @@ Helm does not upgrade the CRDs during a release upgrade. Before you upgrade a re
To upgrade the release `my-release`:

```console
helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.0
helm upgrade my-release oci://ghcr.io/nginxinc/charts/nginx-ingress --version 0.18.1
```

### Uninstalling the Chart
Expand Down Expand Up @@ -111,7 +111,7 @@ This step is required if you're installing the chart using its sources. Addition
1. Pull the chart sources:

```console
helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 0.18.0
helm pull oci://ghcr.io/nginxinc/charts/nginx-ingress --untar --version 0.18.1
```

2. Change your working directory to nginx-ingress:
Expand Down Expand Up @@ -183,7 +183,7 @@ The following tables lists the configurable parameters of the NGINX Ingress Cont
|`controller.logLevel` | The log level of the Ingress Controller. | 1 |
|`controller.image.digest` | The image digest of the Ingress Controller. | None |
|`controller.image.repository` | The image repository of the Ingress Controller. | nginx/nginx-ingress |
|`controller.image.tag` | The tag of the Ingress Controller image. | 3.2.0 |
|`controller.image.tag` | The tag of the Ingress Controller image. | 3.2.1 |
|`controller.image.pullPolicy` | The pull policy for the Ingress Controller image. | IfNotPresent |
|`controller.lifecycle` | The lifecycle of the Ingress Controller pods. | {} |
|`controller.customConfigMap` | The name of the custom ConfigMap used by the Ingress Controller. If set, then the default config is ignored. | "" |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: dosprotectedresources.appprotectdos.f5.com
spec:
group: appprotectdos.f5.com
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: dnsendpoints.externaldns.nginx.org
spec:
group: externaldns.nginx.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: globalconfigurations.k8s.nginx.org
spec:
group: k8s.nginx.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: policies.k8s.nginx.org
spec:
group: k8s.nginx.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: transportservers.k8s.nginx.org
spec:
group: k8s.nginx.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: virtualserverroutes.k8s.nginx.org
spec:
group: k8s.nginx.org
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
controller-gen.kubebuilder.io/version: v0.12.1
name: virtualservers.k8s.nginx.org
spec:
group: k8s.nginx.org
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/nginx-ingress/values-icp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ controller:
nginxplus: true
image:
repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
tag: "3.2.0"
tag: "3.2.1"
nodeSelector:
beta.kubernetes.io/arch: "amd64"
proxy: true
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/nginx-ingress/values-plus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ controller:
nginxplus: true
image:
repository: nginx-plus-ingress
tag: "3.2.0"
tag: "3.2.1"
2 changes: 1 addition & 1 deletion helm-charts/nginx-ingress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ controller:
repository: nginx/nginx-ingress

## The tag of the Ingress Controller image. If not specified the appVersion from Chart.yaml is used as a tag.
# tag: "3.2.0"
# tag: "3.2.1"

## The digest of the Ingress Controller image.
## If digest is specified it has precedence over tag and will be used instead
Expand Down