Skip to content

Commit

Permalink
Refactor K8s tools in benji-k8s container image
Browse files Browse the repository at this point in the history
  • Loading branch information
elemental-lf committed Feb 17, 2021
1 parent c7c57be commit d1c031e
Show file tree
Hide file tree
Showing 15 changed files with 326 additions and 302 deletions.
6 changes: 4 additions & 2 deletions images/benji-k8s/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ LABEL org.label-schema.schema-version="1.0" \
RUN curl -o /usr/bin/kubectl -sSL https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
chmod a+x /usr/bin/kubectl

COPY images/benji-k8s/bin/ $VENV_DIR/bin/
RUN chmod a+x $VENV_DIR/bin/*
COPY images/benji-k8s/k8s-tools /k8s-tools-source
RUN . $VENV_DIR/bin/activate && \
pip install /k8s-tools-source && \
rm -rf /k8s-tools-source

ENTRYPOINT ["/bin/bash"]
CMD ["-c", "sleep 3650d"]
32 changes: 0 additions & 32 deletions images/benji-k8s/bin/benji-command

This file was deleted.

120 changes: 0 additions & 120 deletions images/benji-k8s/bin/benji-restore-pvc

This file was deleted.

33 changes: 0 additions & 33 deletions images/benji-k8s/bin/benji-versions-status

This file was deleted.

2 changes: 2 additions & 0 deletions images/benji-k8s/k8s-tools/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
include MANIFEST.in
recursive-include src *.py
24 changes: 24 additions & 0 deletions images/benji-k8s/k8s-tools/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from setuptools import setup, find_packages

setup(name='benji-k8s-tools',
version='0.1',
description='Small tools for using Benji with Kubernetes',
url='https://github.com/elemental-lf/benji',
author='Lars Fenneberg',
author_email='lf@elemental.net',
license='LGPG-3',
python_requires='~=3.6',
packages=find_packages('src'),
package_dir={
'': 'src',
},
install_requires=[
'benji',
],
entry_points="""
[console_scripts]
benji-backup-pvc = benji.k8s_tools.scripts.backup_pvc:main
benji-command = benji.k8s_tools.scripts.command:main
benji-restore-pvc = benji.k8s_tools.scripts.restore_pvc:main
benji-versions-status = benji.k8s_tools.scripts.versions_status:main
""")
Empty file.
Empty file.
Empty file.
Loading

0 comments on commit d1c031e

Please sign in to comment.