Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EWMS Sidecar Pt-2 #111

Merged
merged 7 commits into from
Dec 19, 2023
Merged

EWMS Sidecar Pt-2 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
17bce59
add to setup.cfg
ric-evans Dec 18, 2023
8f15b37
<bot> update setup.cfg
invalid-email-address Dec 18, 2023
ef6f2b2
<bot> update dependencies*.log files(s)
invalid-email-address Dec 18, 2023
3c79f46
rm -r
ric-evans Dec 19, 2023
d8a66aa
update `config.py`
ric-evans Dec 19, 2023
562dafa
rm condor/stopper.py
ric-evans Dec 19, 2023
47a8a7f
rename to `ewms_sidecar.py`
ric-evans Dec 19, 2023
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
64 changes: 32 additions & 32 deletions dependencies-from-Dockerfile.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
# pip freeze
########################################################################
backoff==2.2.1
boto3==1.34.1
botocore==1.34.1
boto3==1.34.3
botocore==1.34.3
cachetools==5.3.2
certifi==2023.11.17
cffi==1.16.0
Expand All @@ -29,15 +29,15 @@ jmespath==1.0.1
kubernetes==28.1.0
motor==3.3.2
oauthlib==3.2.2
opentelemetry-api==1.21.0
opentelemetry-api==1.22.0
opentelemetry-exporter-jaeger==1.21.0
opentelemetry-exporter-jaeger-proto-grpc==1.21.0
opentelemetry-exporter-jaeger-thrift==1.21.0
opentelemetry-exporter-otlp-proto-common==1.21.0
opentelemetry-exporter-otlp-proto-http==1.21.0
opentelemetry-proto==1.21.0
opentelemetry-sdk==1.21.0
opentelemetry-semantic-conventions==0.42b0
opentelemetry-exporter-otlp-proto-common==1.22.0
opentelemetry-exporter-otlp-proto-http==1.22.0
opentelemetry-proto==1.22.0
opentelemetry-sdk==1.22.0
opentelemetry-semantic-conventions==0.43b0
protobuf==4.25.1
pyasn1==0.5.1
pyasn1-modules==0.3.0
Expand Down Expand Up @@ -74,16 +74,16 @@ cryptography==41.0.7
pip==23.2.1
pipdeptree==2.13.1
setuptools==65.5.1
skydriver-clientmanager
├── boto3 [required: Any, installed: 1.34.1]
│ ├── botocore [required: >=1.34.1,<1.35.0, installed: 1.34.1]
skydriver-clientmanager-ewms-sidecar
├── boto3 [required: Any, installed: 1.34.3]
│ ├── botocore [required: >=1.34.3,<1.35.0, installed: 1.34.3]
│ │ ├── jmespath [required: >=0.7.1,<2.0.0, installed: 1.0.1]
│ │ ├── python-dateutil [required: >=2.1,<3.0.0, installed: 2.8.2]
│ │ │ └── six [required: >=1.5, installed: 1.16.0]
│ │ └── urllib3 [required: >=1.25.4,<2.1, installed: 1.26.18]
│ ├── jmespath [required: >=0.7.1,<2.0.0, installed: 1.0.1]
│ └── s3transfer [required: >=0.9.0,<0.10.0, installed: 0.9.0]
│ └── botocore [required: >=1.33.2,<2.0a.0, installed: 1.34.1]
│ └── botocore [required: >=1.33.2,<2.0a.0, installed: 1.34.3]
│ ├── jmespath [required: >=0.7.1,<2.0.0, installed: 1.0.1]
│ ├── python-dateutil [required: >=2.1,<3.0.0, installed: 2.8.2]
│ │ └── six [required: >=1.5, installed: 1.16.0]
Expand Down Expand Up @@ -169,7 +169,7 @@ wheel==0.42.0
wipac-telemetry==0.3.0
├── coloredlogs [required: Any, installed: 15.0.1]
│ └── humanfriendly [required: >=9.1, installed: 10.0]
├── opentelemetry-api [required: Any, installed: 1.21.0]
├── opentelemetry-api [required: Any, installed: 1.22.0]
│ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
Expand All @@ -179,72 +179,72 @@ wipac-telemetry==0.3.0
│ │ ├── googleapis-common-protos [required: ~=1.52,<1.60.0, installed: 1.59.1]
│ │ │ └── protobuf [required: >=3.19.5,<5.0.0.dev0,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=3.20.1,!=3.20.0, installed: 4.25.1]
│ │ ├── grpcio [required: >=1.0.0,<2.0.0, installed: 1.60.0]
│ │ ├── opentelemetry-api [required: ~=1.3, installed: 1.21.0]
│ │ ├── opentelemetry-api [required: ~=1.3, installed: 1.22.0]
│ │ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ │ └── opentelemetry-sdk [required: ~=1.11, installed: 1.21.0]
│ │ ├── opentelemetry-api [required: ==1.21.0, installed: 1.21.0]
│ │ └── opentelemetry-sdk [required: ~=1.11, installed: 1.22.0]
│ │ ├── opentelemetry-api [required: ==1.22.0, installed: 1.22.0]
│ │ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ │ ├── opentelemetry-semantic-conventions [required: ==0.42b0, installed: 0.42b0]
│ │ ├── opentelemetry-semantic-conventions [required: ==0.43b0, installed: 0.43b0]
│ │ └── typing-extensions [required: >=3.7.4, installed: 4.9.0]
│ └── opentelemetry-exporter-jaeger-thrift [required: ==1.21.0, installed: 1.21.0]
│ ├── opentelemetry-api [required: ~=1.3, installed: 1.21.0]
│ ├── opentelemetry-api [required: ~=1.3, installed: 1.22.0]
│ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ ├── opentelemetry-sdk [required: ~=1.11, installed: 1.21.0]
│ │ ├── opentelemetry-api [required: ==1.21.0, installed: 1.21.0]
│ ├── opentelemetry-sdk [required: ~=1.11, installed: 1.22.0]
│ │ ├── opentelemetry-api [required: ==1.22.0, installed: 1.22.0]
│ │ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ │ ├── opentelemetry-semantic-conventions [required: ==0.42b0, installed: 0.42b0]
│ │ ├── opentelemetry-semantic-conventions [required: ==0.43b0, installed: 0.43b0]
│ │ └── typing-extensions [required: >=3.7.4, installed: 4.9.0]
│ └── thrift [required: >=0.10.0, installed: 0.16.0]
│ └── six [required: >=1.7.2, installed: 1.16.0]
├── opentelemetry-exporter-otlp-proto-http [required: Any, installed: 1.21.0]
├── opentelemetry-exporter-otlp-proto-http [required: Any, installed: 1.22.0]
│ ├── backoff [required: >=1.10.0,<3.0.0, installed: 2.2.1]
│ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ ├── googleapis-common-protos [required: ~=1.52, installed: 1.59.1]
│ │ └── protobuf [required: >=3.19.5,<5.0.0.dev0,!=4.21.5,!=4.21.4,!=4.21.3,!=4.21.2,!=4.21.1,!=3.20.1,!=3.20.0, installed: 4.25.1]
│ ├── opentelemetry-api [required: ~=1.15, installed: 1.21.0]
│ ├── opentelemetry-api [required: ~=1.15, installed: 1.22.0]
│ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ ├── opentelemetry-exporter-otlp-proto-common [required: ==1.21.0, installed: 1.21.0]
│ ├── opentelemetry-exporter-otlp-proto-common [required: ==1.22.0, installed: 1.22.0]
│ │ ├── backoff [required: >=1.10.0,<3.0.0, installed: 2.2.1]
│ │ └── opentelemetry-proto [required: ==1.21.0, installed: 1.21.0]
│ │ └── opentelemetry-proto [required: ==1.22.0, installed: 1.22.0]
│ │ └── protobuf [required: >=3.19,<5.0, installed: 4.25.1]
│ ├── opentelemetry-proto [required: ==1.21.0, installed: 1.21.0]
│ ├── opentelemetry-proto [required: ==1.22.0, installed: 1.22.0]
│ │ └── protobuf [required: >=3.19,<5.0, installed: 4.25.1]
│ ├── opentelemetry-sdk [required: ~=1.21.0, installed: 1.21.0]
│ │ ├── opentelemetry-api [required: ==1.21.0, installed: 1.21.0]
│ ├── opentelemetry-sdk [required: ~=1.22.0, installed: 1.22.0]
│ │ ├── opentelemetry-api [required: ==1.22.0, installed: 1.22.0]
│ │ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ │ ├── opentelemetry-semantic-conventions [required: ==0.42b0, installed: 0.42b0]
│ │ ├── opentelemetry-semantic-conventions [required: ==0.43b0, installed: 0.43b0]
│ │ └── typing-extensions [required: >=3.7.4, installed: 4.9.0]
│ └── requests [required: ~=2.7, installed: 2.31.0]
│ ├── certifi [required: >=2017.4.17, installed: 2023.11.17]
│ ├── charset-normalizer [required: >=2,<4, installed: 3.3.2]
│ ├── idna [required: >=2.5,<4, installed: 3.6]
│ └── urllib3 [required: >=1.21.1,<3, installed: 1.26.18]
├── opentelemetry-sdk [required: Any, installed: 1.21.0]
│ ├── opentelemetry-api [required: ==1.21.0, installed: 1.21.0]
├── opentelemetry-sdk [required: Any, installed: 1.22.0]
│ ├── opentelemetry-api [required: ==1.22.0, installed: 1.22.0]
│ │ ├── Deprecated [required: >=1.2.6, installed: 1.2.14]
│ │ │ └── wrapt [required: >=1.10,<2, installed: 1.16.0]
│ │ └── importlib-metadata [required: >=6.0,<7.0, installed: 6.11.0]
│ │ └── zipp [required: >=0.5, installed: 3.17.0]
│ ├── opentelemetry-semantic-conventions [required: ==0.42b0, installed: 0.42b0]
│ ├── opentelemetry-semantic-conventions [required: ==0.43b0, installed: 0.43b0]
│ └── typing-extensions [required: >=3.7.4, installed: 4.9.0]
├── protobuf [required: Any, installed: 4.25.1]
├── typing-extensions [required: Any, installed: 4.9.0]
Expand Down
30 changes: 0 additions & 30 deletions ewms_sidecar/condor/stopper.py
View file
Open in desktop

This file was deleted.

9 changes: 1 addition & 8 deletions ewms_sidecar/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from wipac_dev_tools import from_environment_as_dataclass

LOGGER = logging.getLogger("clientmanager")
LOGGER = logging.getLogger("ewms-sidecar")

LOCAL_K8S_HOST = "local"

Expand All @@ -34,13 +34,6 @@ class EnvConfig:
CLIENT_STARTER_WAIT_FOR_STARTUP_JSON: int = 60
CONDOR_TOKEN: str = ""
#
WORKER_K8S_TOKEN: str = ""
WORKER_K8S_CACERT: str = ""
WORKER_K8S_CONFIG_FILE_BASE64: str = ""
# local k8s
WORKER_K8S_LOCAL_APPLICATION_NAME: str = ""
WORKER_K8S_LOCAL_WORKERS_MAX: int = 3 # don't want too many *local* workers
#
EWMS_PILOT_QUARANTINE_TIME: int = 0
#
EWMS_TMS_S3_ACCESS_KEY_ID: str = ""
Expand Down
0 ewms_sidecar/clientmanager.py → ewms_sidecar/ewms_sidecar.py
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions ewms_sidecar/k8s/__init__.py
View file
Open in desktop

This file was deleted.

137 changes: 0 additions & 137 deletions ewms_sidecar/k8s/act.py
View file
Open in desktop

This file was deleted.

Loading
Loading