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

Pull request update/241031 #450

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Pull request update/241031 #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39dc006
OS-7942. Updated mysql-connector-python version
nk-hystax Oct 30, 2024
96cceee
OS-4303. Removed optscale_metric_enabled etcd key
nk-hystax Oct 30, 2024
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
2 changes: 1 addition & 1 deletion auth/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SQLAlchemy==1.3.24
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
tornado==6.4.1
alembic==1.13.1
pymacaroons==0.9.2
Expand Down
2 changes: 1 addition & 1 deletion docker_images/cleanmongodb/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
SQLAlchemy==1.3.24
pymongo==4.6.3
# OptScale packages
Expand Down
10 changes: 6 additions & 4 deletions docker_images/configurator/configurator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

LOG = logging.getLogger(__name__)

ETCD_KEYS_TO_DELETE = ['/logstash_host', '/optscale_meter_enabled']
RETRY_ARGS = dict(stop_max_attempt_number=300, wait_fixed=500)
RABBIT_PRECONDIFITON_FAILED_CODE = 406

Expand Down Expand Up @@ -93,10 +94,11 @@ def pre_configure(self):
self.commit_config()
return
LOG.info("Writing default etcd keys")
try:
self.etcd_cl.delete('/logstash_host')
except etcd.EtcdKeyNotFound:
pass
for key in ETCD_KEYS_TO_DELETE:
try:
self.etcd_cl.delete(key)
except etcd.EtcdKeyNotFound:
pass
self.etcd_cl.write_branch('/', config, overwrite_lists=True)
LOG.info("Configuring database server")
self.configure_databases()
Expand Down
2 changes: 1 addition & 1 deletion docker_images/configurator/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
pyyaml==6.0.1
SQLAlchemy==1.3.24
pymongo==4.6.3
Expand Down
2 changes: 1 addition & 1 deletion docker_images/failed_imports_dataset_generator/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
boto3==1.34.7
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
SQLAlchemy==1.3.24

# OptScale packages
Expand Down
2 changes: 1 addition & 1 deletion docker_images/users_dataset_generator/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
boto3==1.34.7
clickhouse-driver==0.2.6
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
pymongo==4.6.3
SQLAlchemy==1.3.24

Expand Down
2 changes: 1 addition & 1 deletion herald/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ requests==2.32.3
netaddr==0.8.0
alembic==1.13.1
pika==1.1.0
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
pystache==0.6.0
boto3==1.34.7

Expand Down
2 changes: 1 addition & 1 deletion katara/katara_service/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SQLAlchemy==1.3.24
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
tornado==6.4.1
alembic==1.13.1
croniter==0.3.15
Expand Down
1 change: 0 additions & 1 deletion optscale-deploy/optscale/templates/tpl/_config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ etcd:
aws_secret_access_key: {{ .Values.users_dataset_generator.aws_secret_access_key }}
service_credentials:
{{ toYaml .Values.service_credentials | indent 4 }}
optscale_meter_enabled: {{ .Values.optscale_meter_enabled }}
{{ if .Values.fake_cad_config }}
fake_cad:
config:
Expand Down
2 changes: 0 additions & 2 deletions optscale-deploy/optscale/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,8 +1057,6 @@ bumi_worker:
task_timeout: 3600
run_period: 10800

optscale_meter_enabled: 0

fake_cad_enabled: 0

#filled from smtp overlay - smtp settings for testing
Expand Down
2 changes: 1 addition & 1 deletion rest_api/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SQLAlchemy==1.3.24
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
tornado==6.4.1
alembic==1.13.1
cryptography==43.0.1
Expand Down
2 changes: 1 addition & 1 deletion slacker/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ slack_bolt==1.18.1
slack_sdk==3.27.1
sqlalchemy==1.4.52
alembic==1.13.1
mysql-connector-python==8.1.0
mysql-connector-python==9.1.0
apispec==6.3.1
pyyaml==6.0.1
currency-symbols==2.0.3
Expand Down
Loading