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.

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

Fix missing vote files + misc cleanup #595

Merged
merged 4 commits into from
Jul 24, 2023
Merged

Fix missing vote files + misc cleanup #595

merged 4 commits into from
Jul 24, 2023

Conversation

harryttd
Copy link
Collaborator

  • Fixes bash script that checks for vote files for bakers. Script had bug if the files it expected didn't exist.
  • Fixes missing vote files for accounts that will be created automatically via should_generate_unsafe_deterministic_data.
  • closes dev-net-tun hostPath volume is only required when running zerotier #284
  • Does a little cleanup in values.yaml so published docs on tezos-k8s.xyz has more markdown formatting.

@harryttd harryttd self-assigned this Jul 21, 2023
@harryttd
Copy link
Collaborator Author

harryttd commented Jul 21, 2023

rpc-auth image build in CI is erroring. i'm able to build locally on my mac.

#31 80.93 Collecting PyYAML==5.4
#31 80.96   Downloading PyYAML-5.4.tar.gz (174 kB)
#31 83.59   Installing build dependencies: started
#31 129.9   Installing build dependencies: finished with status 'done'
#31 129.9   Getting requirements to build wheel: started
#31 132.9   Getting requirements to build wheel: finished with status 'error'
#31 132.9   ERROR: Command errored out with exit status 1:
#31 132.9    command: /usr/local/bin/python /usr/local/lib/python3.9/site-packages/pip/_vendor/pep517/in_process/_in_process.py get_requires_for_build_wheel /tmp/tmp4ckq3gj6
#31 132.9        cwd: /tmp/pip-wheel-a9o6anhk/pyyaml_1845551417b24e2bbe4101620bbbc52f
#31 132.9   Complete output (62 lines):
#31 132.9   /tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/config/setupcfg.py:293: _DeprecatedConfig: Deprecated config in `setup.cfg`
#31 132.9   !!
#31 132.9   
#31 132.9           ********************************************************************************
#31 132.9           The license_file parameter is deprecated, use license_files instead.
#31 132.9   
#31 132.9           By 2023-Oct-30, you need to update your project and remove deprecated calls
#31 132.9           or your builds will no longer be supported.
#31 132.9   
#31 132.9           See https://setuptools.pypa.io/en/latest/userguide/declarative_config.html for details.
#31 132.9           ********************************************************************************
#31 132.9   
#31 132.9   !!
#31 132.9     parsed = self.parsers.get(option_name, lambda x: x)(value)
#31 132.9   running egg_info
#31 132.9   writing lib3/PyYAML.egg-info/PKG-INFO
#31 132.9   writing dependency_links to lib3/PyYAML.egg-info/dependency_links.txt
#31 132.9   writing top-level names to lib3/PyYAML.egg-info/top_level.txt
#31 132.9   Traceback (most recent call last):
#31 132.9     File "/usr/local/lib/python3.9/site-packages/pip/_vendor/pep517/in_process/_in_process.py", line 349, in <module>
#31 132.9       main()
#31 132.9     File "/usr/local/lib/python3.9/site-packages/pip/_vendor/pep517/in_process/_in_process.py", line 331, in main
#31 132.9       json_out['return_val'] = hook(**hook_input['kwargs'])
#31 132.9     File "/usr/local/lib/python3.9/site-packages/pip/_vendor/pep517/in_process/_in_process.py", line 117, in get_requires_for_build_wheel
#31 132.9       return hook(config_settings)
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/build_meta.py", line 341, in get_requires_for_build_wheel
#31 132.9       return self._get_build_requires(config_settings, requirements=['wheel'])
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/build_meta.py", line 323, in _get_build_requires
#31 132.9       self.run_setup()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/build_meta.py", line 338, in run_setup
#31 132.9       exec(code, locals())
#31 132.9     File "<string>", line 271, in <module>
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/__init__.py", line 107, in setup
#31 132.9       return distutils.core.setup(**attrs)
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/core.py", line 185, in setup
#31 132.9       return run_commands(dist)
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/core.py", line 201, in run_commands
#31 132.9       dist.run_commands()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/dist.py", line 969, in run_commands
#31 132.9       self.run_command(cmd)
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/dist.py", line 1234, in run_command
#31 132.9       super().run_command(command)
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/dist.py", line 988, in run_command
#31 132.9       cmd_obj.run()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/command/egg_info.py", line 314, in run
#31 132.9       self.find_sources()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/command/egg_info.py", line 322, in find_sources
#31 132.9       mm.run()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/command/egg_info.py", line 551, in run
#31 132.9       self.add_defaults()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/command/egg_info.py", line 589, in add_defaults
#31 132.9       sdist.add_defaults(self)
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/command/sdist.py", line 104, in add_defaults
#31 132.9       super().add_defaults()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/command/sdist.py", line 251, in add_defaults
#31 132.9       self._add_defaults_ext()
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/command/sdist.py", line 336, in _add_defaults_ext
#31 132.9       self.filelist.extend(build_ext.get_source_files())
#31 132.9     File "<string>", line 201, in get_source_files
#31 132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/cmd.py", line 107, in __getattr__
#31 132.9       raise AttributeError(attr)
#31 132.9   AttributeError: cython_sources
#31 132.9   ----------------------------------------
#31 132.9 WARNING: Discarding https://files.pythonhosted.org/packages/b5/fd/15638de2da0a5aa91c095718444624aa565f766fc178249ca6faa372f71a/PyYAML-5.4.tar.gz#sha256=3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a (from https://pypi.org/simple/pyyaml/) (requires-python:>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*). Command errored out with exit status 1: /usr/local/bin/python /usr/local/lib/python3.9/site-packages/pip/_vendor/pep517/in_process/_in_process.py get_requires_for_build_wheel /tmp/tmp4ckq3gj6 Check the logs for full command output.
#31 132.9 ERROR: Could not find a version that satisfies the requirement PyYAML==5.4 (from versions: 3.10, 3.11, 3.12, 3.13b1, 3.13rc1, 3.13, 4.2b1, 4.2b2, 4.2b4, 5.1b1, 5.1b3, 5.1b5, 5.1, 5.1.1, 5.1.2, 5.2b1, 5.2, 5.3b1, 5.3, 5.3.1, 5.4b1, 5.4b2, 5.4, 5.4.1, 6.0b1, 6.0, 6.0.1)
#31 132.9 ERROR: No matching distribution found for PyYAML==5.4
#31 134.2 WARNING: You are using pip version 21.2.4; however, version 23.2 is available.
#31 134.2 You should consider upgrading via the '/usr/local/bin/python -m pip install --upgrade pip' command.
#31 ERROR: process "/bin/sh -c mkdir wheels   && pip wheel -r requirements.txt   --wheel-dir ./wheels --no-cache-dir" did not complete successfully: exit code: 1
------
 > [linux/arm64 builder 6/6] RUN mkdir wheels   && pip wheel -r requirements.txt   --wheel-dir ./wheels --no-cache-dir:
132.9     File "<string>", line 201, in get_source_files
132.9     File "/tmp/pip-build-env-sue3y8c0/overlay/lib/python3.9/site-packages/setuptools/_distutils/cmd.py", line 107, in __getattr__
132.9       raise AttributeError(attr)
132.9   AttributeError: cython_sources
132.9   ----------------------------------------
132.9 WARNING: Discarding https://files.pythonhosted.org/packages/b5/fd/15638de2da0a5aa91c095718444624aa565f766fc178249ca6faa372f71a/PyYAML-5.4.tar.gz#sha256=3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a (from https://pypi.org/simple/pyyaml/) (requires-python:>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*). Command errored out with exit status 1: /usr/local/bin/python /usr/local/lib/python3.9/site-packages/pip/_vendor/pep517/in_process/_in_process.py get_requires_for_build_wheel /tmp/tmp4ckq3gj6 Check the logs for full command output.
132.9 ERROR: Could not find a version that satisfies the requirement PyYAML==5.4 (from versions: 3.10, 3.11, 3.12, 3.13b1, 3.13rc1, 3.13, 4.2b1, 4.2b2, 4.2b4, 5.1b1, 5.1b3, 5.1b5, 5.1, 5.1.1, 5.1.2, 5.2b1, 5.2, 5.3b1, 5.3, 5.3.1, 5.4b1, 5.4b2, 5.4, 5.4.1, 6.0b1, 6.0, 6.0.1)
132.9 ERROR: No matching distribution found for PyYAML==5.4
134.2 WARNING: You are using pip version 21.2.4; however, version 23.2 is available.
134.2 You should consider upgrading via the '/usr/local/bin/python -m pip install --upgrade pip' command.
------
WARNING: local cache import at /tmp/.buildx-cache not found due to err: could not read /tmp/.buildx-cache/index.json: open /tmp/.buildx-cache/index.json: no such file or directory
Dockerfile:21
--------------------
  20 |     COPY ./requirements.txt .
  21 | >>> RUN mkdir wheels \
  22 | >>>   && pip wheel -r requirements.txt \
  23 | >>>   --wheel-dir ./wheels --no-cache-dir
  24 |     
--------------------
ERROR: failed to solve: process "/bin/sh -c mkdir wheels   && pip wheel -r requirements.txt   --wheel-dir ./wheels --no-cache-dir" did not complete successfully: exit code: 1
Error: buildx failed with: ERROR: failed to solve: process "/bin/sh -c mkdir wheels   && pip wheel -r requirements.txt   --wheel-dir ./wheels --no-cache-dir" did not complete successfully: exit code: 1

Copy link
Collaborator

@nicolasochem nicolasochem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tezos-k8s has a mode of operation where the addresses get autogenerated instead of specified in yaml file. This is useful when making big simluations. I hadn't tried this mode of operation in a while, and indeed I broke it when adding per-baker vote files support.

I didn't try it was fixed, but I deployed this branch against my baker setup and I can confirm it didn't break anything.

Other changes look reasonable. Thank you

@harryttd
Copy link
Collaborator Author

Thanks for the review. I believe the failing rpc-auth build is due to yaml/pyyaml#731. Hopefully will be fixed soon.

@harryttd harryttd merged commit a34953f into master Jul 24, 2023
@harryttd harryttd deleted the vote-fixes branch July 24, 2023 22:51
@harryttd harryttd mentioned this pull request Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dev-net-tun hostPath volume is only required when running zerotier
2 participants