Skip to content

Commit

Permalink
feat: updated get images script without branch checkout for track/0.10 (
Browse files Browse the repository at this point in the history
#140)

* feat: updated get images script

Used by CVE scanning workflows and can be used to collect images URL for airgapped setup. Script is specific for track/0.10 branch to capture all images for that branch. Branch is handled in kubeflow-ci and bundle automation using bundle file.

Summary of changes:
- Re-designed get images script to retrieve all images for current branch. Branch management is done outside of this script.

NOTE: kserve-web-app is not available in 1.7 release (in track0.10). Publish job will fail: #83
  • Loading branch information
i-chvets authored Jul 21, 2023
1 parent 6b8e83b commit cf64df3
Show file tree
Hide file tree
Showing 13 changed files with 237 additions and 217 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ jobs:
with:
provider: microk8s
channel: 1.24/stable
# Pinned until this bug is resolved: https://bugs.launchpad.net/juju/+bug/1992833
bootstrap-options: "--agent-version=2.9.34"
microk8s-addons: "dns storage rbac metallb:10.64.140.43-10.64.140.49"
charmcraft-channel: latest/candidate
- run: tox -e ${{ matrix.charm }}-integration
Expand Down
14 changes: 7 additions & 7 deletions charms/kserve-controller/requirements-fmt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements-fmt.in
# pip-compile --resolver=legacy ./charms/kserve-controller/requirements-fmt.in
#
black==23.3.0
# via -r requirements-fmt.in
click==8.1.3
black==23.7.0
# via -r ./charms/kserve-controller/requirements-fmt.in
click==8.1.6
# via black
isort==5.12.0
# via -r requirements-fmt.in
# via -r ./charms/kserve-controller/requirements-fmt.in
mypy-extensions==1.0.0
# via black
packaging==23.1
# via black
pathspec==0.11.1
# via black
platformdirs==3.5.1
platformdirs==3.9.1
# via black
tomli==2.0.1
# via black
typing-extensions==4.6.3
typing-extensions==4.7.1
# via black
105 changes: 52 additions & 53 deletions charms/kserve-controller/requirements-integration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements-integration.in
# pip-compile --resolver=legacy ./charms/kserve-controller/requirements-integration.in
#
aiohttp==3.8.4
# via -r requirements-integration.in
aiohttp==3.8.5
# via -r ./charms/kserve-controller/requirements-integration.in
aiosignal==1.3.1
# via aiohttp
anyio==3.7.0
anyio==3.7.1
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# httpcore
asttokens==2.2.1
# via stack-data
Expand All @@ -26,7 +26,7 @@ cachetools==5.3.1
# via google-auth
certifi==2023.5.7
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# httpcore
# httpx
# kubernetes
Expand All @@ -36,49 +36,49 @@ cffi==1.15.1
# cryptography
# pynacl
charmed-kubeflow-chisme==0.0.11
# via -r requirements.txt
charset-normalizer==3.1.0
# via -r ./charms/kserve-controller/requirements.txt
charset-normalizer==3.2.0
# via
# aiohttp
# requests
cryptography==41.0.1
cryptography==41.0.2
# via paramiko
decorator==5.1.1
# via
# ipdb
# ipython
deepdiff==6.2.1
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# charmed-kubeflow-chisme
exceptiongroup==1.1.1
exceptiongroup==1.1.2
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# anyio
# pytest
executing==1.2.0
# via stack-data
frozenlist==1.3.3
frozenlist==1.4.0
# via
# aiohttp
# aiosignal
google-auth==2.19.1
google-auth==2.22.0
# via kubernetes
h11==0.14.0
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# httpcore
httpcore==0.17.2
httpcore==0.17.3
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# httpx
httpx==0.24.1
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# lightkube
idna==3.4
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# anyio
# httpx
# requests
Expand All @@ -93,33 +93,33 @@ jedi==0.18.2
# via ipython
jinja2==3.1.2
# via
# -r requirements-integration.in
# -r requirements.txt
# -r ./charms/kserve-controller/requirements-integration.in
# -r ./charms/kserve-controller/requirements.txt
# charmed-kubeflow-chisme
# pytest-operator
juju==2.9.42.4
juju==2.9.44.0
# via
# -r requirements-integration.in
# -r ./charms/kserve-controller/requirements-integration.in
# pytest-operator
jujubundlelib==0.5.7
# via theblues
kubernetes==26.1.0
kubernetes==27.2.0
# via juju
lightkube==0.13.0
lightkube==0.14.0
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# charmed-kubeflow-chisme
lightkube-models==1.27.1.4
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# lightkube
macaroonbakery==1.3.1
# via
# juju
# theblues
markupsafe==2.1.3
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# jinja2
matplotlib-inline==0.1.6
# via ipython
Expand All @@ -130,14 +130,16 @@ multidict==6.0.4
mypy-extensions==1.0.0
# via typing-inspect
oauthlib==3.2.2
# via requests-oauthlib
ops==2.3.0
# via
# -r requirements.txt
# kubernetes
# requests-oauthlib
ops==2.4.1
# via
# -r ./charms/kserve-controller/requirements.txt
# charmed-kubeflow-chisme
ordered-set==4.1.0
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# deepdiff
packaging==23.1
# via pytest
Expand All @@ -149,9 +151,9 @@ pexpect==4.8.0
# via ipython
pickleshare==0.7.5
# via ipython
pluggy==1.0.0
pluggy==1.2.0
# via pytest
prompt-toolkit==3.0.38
prompt-toolkit==3.0.39
# via ipython
protobuf==3.20.3
# via macaroonbakery
Expand Down Expand Up @@ -181,21 +183,21 @@ pyrfc3339==1.1
# via
# juju
# macaroonbakery
pytest==7.3.1
pytest==7.4.0
# via
# pytest-asyncio
# pytest-operator
pytest-asyncio==0.21.0
pytest-asyncio==0.21.1
# via pytest-operator
pytest-operator==0.27.0
# via -r requirements-integration.in
pytest-operator==0.28.0
# via -r ./charms/kserve-controller/requirements-integration.in
python-dateutil==2.8.2
# via kubernetes
pytz==2023.3
# via pyrfc3339
pyyaml==6.0
pyyaml==6.0.1
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# juju
# jujubundlelib
# kubernetes
Expand All @@ -204,7 +206,7 @@ pyyaml==6.0
# pytest-operator
requests==2.31.0
# via
# -r requirements-integration.in
# -r ./charms/kserve-controller/requirements-integration.in
# kubernetes
# macaroonbakery
# requests-oauthlib
Expand All @@ -213,13 +215,13 @@ requests-oauthlib==1.3.1
# via kubernetes
rsa==4.9
# via google-auth
ruamel-yaml==0.17.31
ruamel-yaml==0.17.32
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# charmed-kubeflow-chisme
ruamel-yaml-clib==0.2.7
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# ruamel-yaml
six==1.16.0
# via
Expand All @@ -231,16 +233,16 @@ six==1.16.0
# python-dateutil
sniffio==1.3.0
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# anyio
# httpcore
# httpx
stack-data==0.6.2
# via ipython
tenacity==8.2.2
# via
# -r requirements-integration.in
# -r requirements.txt
# -r ./charms/kserve-controller/requirements-integration.in
# -r ./charms/kserve-controller/requirements.txt
# charmed-kubeflow-chisme
theblues==0.5.2
# via juju
Expand All @@ -254,7 +256,7 @@ traitlets==5.9.0
# via
# ipython
# matplotlib-inline
typing-extensions==4.6.3
typing-extensions==4.7.1
# via
# ipython
# typing-inspect
Expand All @@ -267,15 +269,12 @@ urllib3==1.26.16
# requests
wcwidth==0.2.6
# via prompt-toolkit
websocket-client==1.5.2
websocket-client==1.6.1
# via
# -r requirements.txt
# -r ./charms/kserve-controller/requirements.txt
# kubernetes
# ops
websockets==7.0
# via juju
yarl==1.9.2
# via aiohttp

# The following packages are considered to be unsafe in a requirements file:
# setuptools
42 changes: 21 additions & 21 deletions charms/kserve-controller/requirements-lint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,62 @@
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile requirements-lint.in
# pip-compile --resolver=legacy ./charms/kserve-controller/requirements-lint.in
#
black==23.3.0
# via -r requirements-fmt.txt
click==8.1.3
black==23.7.0
# via -r ./charms/kserve-controller/requirements-fmt.txt
click==8.1.6
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black
codespell==2.2.4
# via -r requirements-lint.in
codespell==2.2.5
# via -r ./charms/kserve-controller/requirements-lint.in
flake8==6.0.0
# via
# -r requirements-lint.in
# -r ./charms/kserve-controller/requirements-lint.in
# flake8-builtins
# pep8-naming
# pyproject-flake8
flake8-builtins==2.1.0
# via -r requirements-lint.in
# via -r ./charms/kserve-controller/requirements-lint.in
flake8-copyright==0.2.4
# via -r requirements-lint.in
# via -r ./charms/kserve-controller/requirements-lint.in
isort==5.12.0
# via -r requirements-fmt.txt
# via -r ./charms/kserve-controller/requirements-fmt.txt
mccabe==0.7.0
# via flake8
mypy-extensions==1.0.0
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black
packaging==23.1
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black
pathspec==0.11.1
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black
pep8-naming==0.13.3
# via -r requirements-lint.in
platformdirs==3.5.1
# via -r ./charms/kserve-controller/requirements-lint.in
platformdirs==3.9.1
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black
pycodestyle==2.10.0
# via flake8
pyflakes==3.0.1
# via flake8
pyproject-flake8==6.0.0.post1
# via -r requirements-lint.in
# via -r ./charms/kserve-controller/requirements-lint.in
tomli==2.0.1
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black
# pyproject-flake8
typing-extensions==4.6.3
typing-extensions==4.7.1
# via
# -r requirements-fmt.txt
# -r ./charms/kserve-controller/requirements-fmt.txt
# black

# The following packages are considered to be unsafe in a requirements file:
Expand Down
Loading

0 comments on commit cf64df3

Please sign in to comment.