Skip to content

Commit ea2f92a

Browse files
authored
NGINX Ingress Controller Image Bump (microsoft#249)
* update ingress controller * Fix up cibuild
1 parent b87c59b commit ea2f92a

File tree

7 files changed

+18
-11
lines changed

7 files changed

+18
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ account key, a string that can be [found here](https://github.com/Azure/Azurite?
6767
For example, you can set the environment variable in your terminal with:
6868

6969
```console
70-
export AZURITE_ACCOUNT_KEY=<azurite_account_key>
70+
export AZURITE_ACCOUNT_KEY=$(curl -s https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite | grep "Account key:" | cut -b 24-111)
7171
```
7272

7373
To set up a local environment, use:

deployment/bin/deploy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
210210
--set controller.service.annotations."service\.beta\.kubernetes\.io/azure-dns-label-name"="${DNS_LABEL}" \
211211
--set controller.image.registry="mcr.microsoft.com" \
212212
--set controller.image.image="oss/kubernetes/ingress/nginx-ingress-controller" \
213-
--set controller.image.tag="v1.9.6-patched" \
214-
--set controller.image.digest="sha256:2383717ea3edd1652b97e5b82adf15a3e7f091d0d5d0eceb8dce4410e3a6a292" \
213+
--set controller.image.tag="v1.11.5" \
214+
--set controller.image.digest="sha256:58dc07ebe8524c598137291d319a7fc0ec7f450ea43e5c22c2516c56bb7282fb" \
215215
--version "4.8.3"\
216216
--wait \
217217
--timeout 2m0s \

pcstac/requirements-server.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.9
33
# by the following command:
44
#
5-
# pip-compile --extra=server --output-file=pcstac/requirements-server.txt ./pcstac/setup.py
5+
# pip-compile --extra=dev --extra=server --output-file=pcstac/requirements-server.txt ./pcstac/setup.py
66
#
77
annotated-types==0.7.0
88
# via pydantic
@@ -141,6 +141,8 @@ tenacity==8.1.0
141141
# via pypgstac
142142
termcolor==2.4.0
143143
# via fire
144+
types-requests==2.32.0.20250328
145+
# via pcstac (pcstac/setup.py)
144146
typing-extensions==4.12.2
145147
# via
146148
# anyio
@@ -156,7 +158,9 @@ typing-extensions==4.12.2
156158
tzlocal==5.2
157159
# via dateparser
158160
urllib3==2.2.2
159-
# via pcstac (pcstac/setup.py)
161+
# via
162+
# pcstac (pcstac/setup.py)
163+
# types-requests
160164
uvicorn[standard]==0.30.1
161165
# via pcstac (pcstac/setup.py)
162166
uvloop==0.19.0

pcstac/setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
"server": [
2222
"uvicorn[standard]==0.30.1",
2323
],
24+
"dev": [
25+
"types-requests"
26+
]
2427
}
2528

2629
setup(

pctiler/pctiler/endpoints/vector_tiles.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ async def get_tilejson(
5656
}
5757

5858
if tileset.bounds:
59-
tilejson["bounds"] = tileset.bounds
59+
tilejson["bounds"] = tileset.bounds # type: ignore
6060
if tileset.center:
61-
tilejson["center"] = tileset.center
61+
tilejson["center"] = tileset.center # type: ignore
6262

63-
return TileJSON(**tilejson)
63+
return TileJSON(**tilejson) # type: ignore
6464

6565

6666
@vector_tile_router.get(

pctiler/pctiler/reader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def assets_for_tile( # type: ignore
153153
"zxy": f"{z}/{x}/{y}",
154154
"count": len(assets),
155155
},
156-
self.request,
156+
self.request, # type: ignore
157157
),
158158
)
159159
return assets
@@ -219,7 +219,7 @@ def _reader(
219219
"zxy": f"{tile_z}/{tile_x}/{tile_y}",
220220
"count": len(mosaic_assets),
221221
},
222-
self.request,
222+
self.request, # type: ignore
223223
),
224224
)
225225

scripts/generate-requirements

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ docker compose \
1010
-f docker-compose.dev.yml \
1111
run --rm \
1212
stac-dev \
13-
pip-compile ./pcstac/setup.py --extra server -o pcstac/requirements-server.txt $pip_compile_options
13+
pip-compile ./pcstac/setup.py --extra server --extra dev -o pcstac/requirements-server.txt $pip_compile_options
1414

1515
docker compose \
1616
-f docker-compose.yml \

0 commit comments

Comments
 (0)