Skip to content

Commit

Permalink
Fix istio CI (#476) (#482)
Browse files Browse the repository at this point in the history
* jinja update
* Remove tls libs from charmcraft in istio-pilot and move them to requirements
  • Loading branch information
misohu authored Jul 25, 2024
1 parent 0498ecd commit 47175e1
Show file tree
Hide file tree
Showing 7 changed files with 322 additions and 125 deletions.
55 changes: 28 additions & 27 deletions charms/istio-gateway/requirements-unit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,95 +4,96 @@
#
# pip-compile requirements-unit.in
#
anyio==4.0.0
# via httpcore
attrs==23.1.0
anyio==4.4.0
# via httpx
attrs==23.2.0
# via jsonschema
certifi==2023.7.22
certifi==2024.7.4
# via
# httpcore
# httpx
# requests
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
coverage==7.3.0
coverage==7.6.0
# via -r requirements-unit.in
exceptiongroup==1.1.3
exceptiongroup==1.2.2
# via
# anyio
# pytest
h11==0.14.0
# via httpcore
httpcore==0.17.3
httpcore==1.0.5
# via httpx
httpx==0.24.1
httpx==0.27.0
# via lightkube
idna==3.4
idna==3.7
# via
# anyio
# httpx
# requests
importlib-resources==6.0.1
importlib-resources==6.4.0
# via jsonschema
iniconfig==2.0.0
# via pytest
jinja2==3.1.2
jinja2==3.1.4
# via -r requirements.in
jsonschema==4.17.3
# via serialized-data-interface
lightkube==0.14.0
lightkube==0.15.3
# via
# -r requirements-unit.in
# -r requirements.in
lightkube-models==1.27.1.4
lightkube-models==1.27.1.8
# via
# -r requirements.in
# lightkube
markupsafe==2.1.3
markupsafe==2.1.5
# via jinja2
oci-image==1.0.0
# via -r requirements.in
ops==2.6.0
ops==2.15.0
# via
# -r requirements-unit.in
# -r requirements.in
# serialized-data-interface
packaging==23.1
packaging==24.1
# via pytest
pkgutil-resolve-name==1.3.10
# via jsonschema
pluggy==1.3.0
pluggy==1.5.0
# via pytest
pyrsistent==0.19.3
pyrsistent==0.20.0
# via jsonschema
pytest==7.4.1
pytest==8.3.1
# via
# -r requirements-unit.in
# pytest-mock
pytest-mock==3.11.1
pytest-mock==3.14.0
# via -r requirements-unit.in
pyyaml==6.0.1
# via
# -r requirements-unit.in
# lightkube
# ops
# serialized-data-interface
requests==2.31.0
requests==2.32.3
# via
# -r requirements.in
# serialized-data-interface
serialized-data-interface==0.7.0
# via -r requirements.in
sniffio==1.3.0
sniffio==1.3.1
# via
# anyio
# httpcore
# httpx
tomli==2.0.1
# via pytest
urllib3==2.0.4
typing-extensions==4.12.2
# via anyio
urllib3==2.2.2
# via requests
websocket-client==1.6.2
websocket-client==1.8.0
# via ops
zipp==3.16.2
zipp==3.19.2
# via importlib-resources
45 changes: 23 additions & 22 deletions charms/istio-gateway/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,73 +4,74 @@
#
# pip-compile requirements.in
#
anyio==4.0.0
# via httpcore
attrs==23.1.0
anyio==4.4.0
# via httpx
attrs==23.2.0
# via jsonschema
certifi==2023.7.22
certifi==2024.7.4
# via
# httpcore
# httpx
# requests
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
exceptiongroup==1.1.3
exceptiongroup==1.2.2
# via anyio
h11==0.14.0
# via httpcore
httpcore==0.17.3
httpcore==1.0.5
# via httpx
httpx==0.24.1
httpx==0.27.0
# via lightkube
idna==3.4
idna==3.7
# via
# anyio
# httpx
# requests
importlib-resources==6.0.1
importlib-resources==6.4.0
# via jsonschema
jinja2==3.1.2
jinja2==3.1.4
# via -r requirements.in
jsonschema==4.17.3
# via serialized-data-interface
lightkube==0.14.0
lightkube==0.15.3
# via -r requirements.in
lightkube-models==1.27.1.4
lightkube-models==1.27.1.8
# via
# -r requirements.in
# lightkube
markupsafe==2.1.3
markupsafe==2.1.5
# via jinja2
oci-image==1.0.0
# via -r requirements.in
ops==2.6.0
ops==2.15.0
# via
# -r requirements.in
# serialized-data-interface
pkgutil-resolve-name==1.3.10
# via jsonschema
pyrsistent==0.19.3
pyrsistent==0.20.0
# via jsonschema
pyyaml==6.0.1
# via
# lightkube
# ops
# serialized-data-interface
requests==2.31.0
requests==2.32.3
# via
# -r requirements.in
# serialized-data-interface
serialized-data-interface==0.7.0
# via -r requirements.in
sniffio==1.3.0
sniffio==1.3.1
# via
# anyio
# httpcore
# httpx
urllib3==2.0.4
typing-extensions==4.12.2
# via anyio
urllib3==2.2.2
# via requests
websocket-client==1.6.2
websocket-client==1.8.0
# via ops
zipp==3.16.2
zipp==3.19.2
# via importlib-resources
2 changes: 1 addition & 1 deletion charms/istio-pilot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ These values vary on each Kubernetes installation and depends on the CNI's confi

Please note that if any of these configurations are missing, or not provided at all, the Istio CNI plugin will not be enabled on initial installations/upgrades, or it will be disabled on existing installations with the plugin.

> NOTE: This capability is only available in `istio-pilot` > 1.17/x; if you haven't already, please ugrade to the latest version of this charm before proceeding with the following instructions.
> NOTE: This capability is only available in `istio-pilot` > 1.17/x; if you haven't already, please upgrade to the latest version of this charm before proceeding with the following instructions.
#### More information
* [Network Plugins](https://kubernetes.io/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/)
Expand Down
2 changes: 1 addition & 1 deletion charms/istio-pilot/charmcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ bases:
channel: "20.04"
parts:
charm:
charm-python-packages: [setuptools, pip, jsonschema, cryptography, cffi]
charm-python-packages: [setuptools, pip]
build-packages: [git, rustc, cargo, libffi-dev, libssl-dev, pkg-config]
istioctl:
plugin: dump
Expand Down
Loading

0 comments on commit 47175e1

Please sign in to comment.