Skip to content

Commit d2c44f8

Browse files
authored
Merge branch 'main' into test/change-foreign-upstream-resource-create-order
2 parents 786c39f + 337bf16 commit d2c44f8

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ It is important that the versions of those things above match.
141141
The table below summarizes the options regarding the images, Helm chart, manifests, documentation and examples and gives
142142
your links to the correct versions:
143143

144-
| Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
145-
| ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
144+
| Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
145+
| ------- | ----------- | --------------- | -------------------- | --------------------------------------- | -------------------------- |
146146
| Latest stable release | For production use | Use the 5.2.1 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/install/build/). | Use the 5.2.1 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/install/images/registry-download/) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/install/build). | [Manifests](https://github.com/nginx/kubernetes-ingress/tree/v5.2.1/deployments). [Helm chart](https://github.com/nginx/kubernetes-ingress/tree/v5.2.1/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
147147
| Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/install/build/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/install/build/). | [Manifests](https://github.com/nginx/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginx/kubernetes-ingress/tree/main/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller). [Examples](https://github.com/nginx/kubernetes-ingress/tree/main/examples). |
148148

examples/custom-resources/external-dns/external-dns-route53.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
serviceAccountName: external-dns
5151
containers:
5252
- name: external-dns
53-
image: registry.k8s.io/external-dns/external-dns:v0.19.0
53+
image: registry.k8s.io/external-dns/external-dns:v0.20.0
5454
args:
5555
- --source=service
5656
- --source=ingress

examples/custom-resources/jwks/keycloak.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
spec:
3232
containers:
3333
- name: keycloak
34-
image: quay.io/keycloak/keycloak:26.4.6
34+
image: quay.io/keycloak/keycloak:26.4.7
3535
args: ["start-dev"]
3636
env:
3737
- name: KC_BOOTSTRAP_ADMIN_USERNAME

examples/custom-resources/oidc/keycloak.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
spec:
3535
containers:
3636
- name: keycloak
37-
image: quay.io/keycloak/keycloak:26.4.6
37+
image: quay.io/keycloak/keycloak:26.4.7
3838
args: ["start"]
3939
env:
4040
- name: KC_BOOTSTRAP_ADMIN_USERNAME

tests/README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ The tests will use the NGINX Ingress Controller with the default `nginx/nginx-in
9898

9999
The test suite includes several additional make targets for cluster management and cleanup:
100100

101-
102101
- `make create-mini-cluster` - Create a Minikube K8S cluster
103102
- `make delete-mini-cluster` - Delete a Minikube K8S cluster
104103
- `make run-tests-in-minikube` - Run tests in Minikube
@@ -121,8 +120,8 @@ The table below shows various configuration options for the tests. If you use Py
121120
| `--image-pull-policy` | `PULL_POLICY` | The pull policy of the Ingress Controller image. | `IfNotPresent` |
122121
| `--deployment-type` | `DEPLOYMENT_TYPE` | The type of the IC deployment: deployment, daemon-set or stateful-set. | `deployment` |
123122
| `--ic-type` | `IC_TYPE` | The type of the Ingress Controller: nginx-ingress or nginx-plus-ingress. | `nginx-ingress` |
124-
| `--service` | `SERVICE`, not supported by `run-tests-in-kind` target. | The type of the Ingress Controller service: nodeport or loadbalancer. | `nodeport` |
125-
| `--node-ip` | `NODE_IP`, not supported by `run-tests-in-kind` target. | The public IP of a cluster node. Not required if you use the loadbalancer service (see --service argument). | `""` |
123+
| `--service` | `SERVICE`, not supported by `run-tests-in-kind` target. | The type of the Ingress Controller service: nodeport or loadbalancer. | `nodeport` |
124+
| `--node-ip` | `NODE_IP`, not supported by `run-tests-in-kind` target. | The public IP of a cluster node. Not required if you use the loadbalancer service (see --service argument). | `""` |
126125
| `--kubeconfig` | `N/A` | An absolute path to a kubeconfig file. | `~/.kube/config` or the value of the `KUBECONFIG` env variable |
127126
| `N/A` | `KUBE_CONFIG_FOLDER`, not supported by `run-tests-in-kind` target. | A path to a folder with a kubeconfig file. | `~/.kube/` |
128127
| `--show-ic-logs` | `SHOW_IC_LOGS` | A flag to control accumulating IC logs in stdout. | `no` |

tests/data/virtual-server-external-dns/external-dns.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
serviceAccountName: external-dns
6363
containers:
6464
- name: external-dns
65-
image: registry.k8s.io/external-dns/external-dns:v0.19.0
65+
image: registry.k8s.io/external-dns/external-dns:v0.20.0
6666
args:
6767
- --source=crd
6868
- --crd-source-apiversion=externaldns.nginx.org/v1

0 commit comments

Comments
 (0)