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
4 changes: 2 additions & 2 deletions charts/ingress-nginx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,10 @@ metadata:
| controller.admissionWebhooks.namespaceSelector | object | `{}` | |
| controller.admissionWebhooks.objectSelector | object | `{}` | |
| controller.admissionWebhooks.patch.enabled | bool | `true` | |
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:bcfc926ed57831edf102d62c5c0e259572591df4796ef1420b87f9cf6092497f"` | |
| controller.admissionWebhooks.patch.image.digest | string | `"sha256:03a00eb0e255e8a25fa49926c24cde0f7e12e8d072c445cdf5136ec78b546285"` | |
| controller.admissionWebhooks.patch.image.image | string | `"ingress-nginx/kube-webhook-certgen"` | |
| controller.admissionWebhooks.patch.image.pullPolicy | string | `"IfNotPresent"` | |
| controller.admissionWebhooks.patch.image.tag | string | `"v1.6.4"` | |
| controller.admissionWebhooks.patch.image.tag | string | `"v1.6.5"` | |
| controller.admissionWebhooks.patch.labels | object | `{}` | Labels to be added to patch job resources |
| controller.admissionWebhooks.patch.networkPolicy.enabled | bool | `false` | Enable 'networkPolicy' or not |
| controller.admissionWebhooks.patch.nodeSelector."kubernetes.io/os" | string | `"linux"` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/ingress-nginx/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -820,8 +820,8 @@ 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.6.4
digest: sha256:bcfc926ed57831edf102d62c5c0e259572591df4796ef1420b87f9cf6092497f
tag: v1.6.5
digest: sha256:03a00eb0e255e8a25fa49926c24cde0f7e12e8d072c445cdf5136ec78b546285
pullPolicy: IfNotPresent
# -- Provide a priority class name to the webhook patching job
##
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/canary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
spec:
containers:
- name: production
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.4@sha256:93631b65adad68950d03499d2a3697d54800fcdeaef5400c3da4b96902247123
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.5@sha256:d7b3143152261e918e2197ef86840986ba7fbbd5ca72e0e79d6ec4ea99d2abc3
ports:
- containerPort: 80
env:
Expand Down Expand Up @@ -97,7 +97,7 @@ spec:
spec:
containers:
- name: canary
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.4@sha256:93631b65adad68950d03499d2a3697d54800fcdeaef5400c3da4b96902247123
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.5@sha256:d7b3143152261e918e2197ef86840986ba7fbbd5ca72e0e79d6ec4ea99d2abc3
ports:
- containerPort: 80
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaultBackend:
image:
registry: registry.k8s.io
image: ingress-nginx/custom-error-pages
tag: v1.2.4@sha256:7d3a249020b277298e0695736b8e22c31185699b4531caeaa89fff31db5ad152
tag: v1.2.5@sha256:ff23f1de9659e4960d4dd844c6fadbeb418a6bb9629f0283fc70bd8f10e432a7
extraVolumes:
- name: custom-error-pages
configMap:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
spec:
containers:
- name: nginx-error-server
image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.2.4@sha256:7d3a249020b277298e0695736b8e22c31185699b4531caeaa89fff31db5ad152
image: registry.k8s.io/ingress-nginx/custom-error-pages:v1.2.5@sha256:ff23f1de9659e4960d4dd844c6fadbeb418a6bb9629f0283fc70bd8f10e432a7
ports:
- containerPort: 8080
# Setting the environment variable DEBUG we can see the headers sent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
terminationGracePeriodSeconds: 60
containers:
- name: echo-service
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.4@sha256:93631b65adad68950d03499d2a3697d54800fcdeaef5400c3da4b96902247123
image: registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.5@sha256:d7b3143152261e918e2197ef86840986ba7fbbd5ca72e0e79d6ec4ea99d2abc3
ports:
- containerPort: 8080
resources:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/HTTPBUN_IMAGE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
registry.k8s.io/ingress-nginx/httpbun:v1.2.4@sha256:db1830fe658c8a1bab1399eb271279e00d318138e784a4749ae1018e7dda268f
registry.k8s.io/ingress-nginx/httpbun:v1.2.5@sha256:92d4970bd97f92ace7d82834de20eeb1568d82f95ee074b2426e905051d6ee01
2 changes: 1 addition & 1 deletion test/e2e/framework/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const NIPService = "external-nip"
var HTTPBunImage = os.Getenv("HTTPBUN_IMAGE")

// EchoImage is the default image to be used by the echo service
const EchoImage = "registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.4@sha256:93631b65adad68950d03499d2a3697d54800fcdeaef5400c3da4b96902247123" //#nosec G101
const EchoImage = "registry.k8s.io/ingress-nginx/e2e-test-echo:v1.2.5@sha256:d7b3143152261e918e2197ef86840986ba7fbbd5ca72e0e79d6ec4ea99d2abc3" //#nosec G101

// TODO: change all Deployment functions to use these options
// in order to reduce complexity and have a unified API across the
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/fastcgi_helloserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (f *Framework) NewNewFastCGIHelloServerDeploymentWithReplicas(replicas int3
Containers: []corev1.Container{
{
Name: "fastcgi-helloserver",
Image: "registry.k8s.io/ingress-nginx/fastcgi-helloserver:v1.2.4@sha256:513acab8f40c5c7f6233edb6debca35a52271401d1ec64159875d27153b2df8a",
Image: "registry.k8s.io/ingress-nginx/fastcgi-helloserver:v1.2.5@sha256:c6c1c37e6496488636e4e6196261b33da7909c57204a4796271bc037a1aee74f",
Env: []corev1.EnvVar{},
Ports: []corev1.ContainerPort{
{
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/settings/ocsp/ocsp.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ func ocspserveDeployment(namespace string) (*appsv1.Deployment, *corev1.Service)
Containers: []corev1.Container{
{
Name: name,
Image: "registry.k8s.io/ingress-nginx/cfssl:v1.2.4@sha256:07c23545688b926a92c78856fc49a186d4b49efb7edf23f50a10aab1da0565f8",
Image: "registry.k8s.io/ingress-nginx/cfssl:v1.2.5@sha256:a3bae88598b399e9c5b941ae949d6a4e4082e30fa594cea3d4ccf3a2c9ed1604",
Command: []string{
"/bin/bash",
"-c",
Expand Down
Loading