Compare commits
21 Commits
Author | SHA1 | Date | |
---|---|---|---|
c9358ae005 | |||
63a1cc7e13 | |||
30a9828b31 | |||
da15850849 | |||
061475fced | |||
25146e7586 | |||
838112adc4 | |||
e98c6b3844 | |||
04b0d692f3 | |||
7e0fece6fc | |||
5140f1b406 | |||
2eda50db8d | |||
3ee6d0d7fe | |||
f489208605 | |||
edebaa8806 | |||
837dcd9d1b | |||
adfba59801 | |||
dfe4372a5b | |||
7ed472f83f | |||
79af522333 | |||
4ece156654 |
2
.cz.yaml
2
.cz.yaml
@ -4,4 +4,4 @@ commitizen:
|
|||||||
name: cz_conventional_commits
|
name: cz_conventional_commits
|
||||||
tag_format: $major.$minor.$patch$prerelease
|
tag_format: $major.$minor.$patch$prerelease
|
||||||
update_changelog_on_bump: true
|
update_changelog_on_bump: true
|
||||||
version: 0.15.0
|
version: 0.16.0
|
||||||
|
22
CHANGELOG.md
22
CHANGELOG.md
@ -1,3 +1,25 @@
|
|||||||
|
## 0.16.0 (2024-04-24)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- **kubernetes**: [63a1cc7e](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/63a1cc7e137018bfd829a7e817d567c80206f747) - update nofusscomputing.kubernetes 1.5.0 -> 1.7.1 [ [!247](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/247) ]
|
||||||
|
- **kubernetes**: [30a9828b](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/30a9828b312a53d0da6c09d64867171b24ec99e6) - add missing python module jsonpatch [ [!251](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/251) [!247](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/247) ]
|
||||||
|
- **build_cache_image**: [061475fc](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/061475fced3bf6f5e5007021a2a8bb6b7de4d533) - correct missing flag [ [!251](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/251) ]
|
||||||
|
- [25146e75](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/25146e758639d6556757854daf58be320c0605c3) - typo [ [!251](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/251) ]
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
- [838112ad](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/838112adc452f39c46e882533c011ce23f29de85) - Install kubectl [ [!251](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/251) ]
|
||||||
|
- **app**: [e98c6b38](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/e98c6b384445b05844b16666492bc1f0cae6330c) - install helm and helm diff [ [!251](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/251) ]
|
||||||
|
- **collection**: [7e0fece6](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/7e0fece6fc188240dd8155cfc891f5ff29ac11e6) - add netbox collection [ [!250](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/250) ]
|
||||||
|
- **ansible_playbooks**: [2eda50db](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/2eda50db8dfdbcd3c93032ef38906a6daa10478c) - updated submodule ansible_playbooks [ [!249](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/249) ]
|
||||||
|
- **collection**: [3ee6d0d7](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/3ee6d0d7fe0cb49538d7d9e7f9a4922b7d75f942) - add community.crypto for openssl ops [ [!247](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/247) ]
|
||||||
|
- **ansible-roles**: [edebaa88](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/edebaa8806d6ccceb53123591f4278bc9bcdc308) - updated submodule ansible-roles [ [!248](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/248) ]
|
||||||
|
- **collection**: [837dcd9d](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/837dcd9d1b51d2e69aa1e537e003952f96d5ebac) - nofusscomputing.kubernetes 1.4.0 -> 1.5.0 [ [!247](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/247) ]
|
||||||
|
- **collection**: [adfba598](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/adfba5980131d1e21ba21b14c0627e86e91ab77d) - nofusscomputing.kubernetes 1.2.0 -> 1.4.0 [ [!247](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/247) [!50](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/50) [!51](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/51) ]
|
||||||
|
- **ansible_playbooks**: [7ed472f8](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/7ed472f83f63ec365001ba8d3ff344e4bead489b) - updated submodule ansible_playbooks [ [!246](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/246) ]
|
||||||
|
- **ansible_playbooks**: [4ece1566](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/commit/4ece1566548ab826312451192c0a817687af63d7) - updated submodule ansible_playbooks [ [!245](https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/merge_requests/245) ]
|
||||||
|
|
||||||
## 0.15.0 (2024-03-17)
|
## 0.15.0 (2024-03-17)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
62
dockerfile
62
dockerfile
@ -1,8 +1,38 @@
|
|||||||
|
ARG release_name=bookworm
|
||||||
|
|
||||||
|
ARG kubernetes_version=1.29
|
||||||
|
|
||||||
|
|
||||||
FROM --platform=$TARGETPLATFORM quay.io/ansible/receptor:v1.4.4 as receptor
|
FROM --platform=$TARGETPLATFORM quay.io/ansible/receptor:v1.4.4 as receptor
|
||||||
|
|
||||||
|
|
||||||
FROM --platform=$TARGETPLATFORM python:3.11-slim-bookworm
|
FROM --platform=$TARGETPLATFORM python:3.11-slim-${release_name} as prep
|
||||||
|
|
||||||
|
|
||||||
|
ARG kubernetes_version
|
||||||
|
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
|
||||||
|
|
||||||
|
RUN apt update; \
|
||||||
|
apt install -y \
|
||||||
|
curl \
|
||||||
|
gpg
|
||||||
|
|
||||||
|
|
||||||
|
RUN curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | tee /usr/share/keyrings/helm.gpg > /dev/null; \
|
||||||
|
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" > /etc/apt/sources.list.d/helm.list; \
|
||||||
|
cat /etc/apt/sources.list.d/helm.list;
|
||||||
|
|
||||||
|
|
||||||
|
RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v${kubernetes_version}/deb/Release.key | gpg --dearmor | tee /usr/share/keyrings/kubernetes.gpg > /dev/null; \
|
||||||
|
echo "deb [signed-by=/usr/share/keyrings/kubernetes.gpg] https://pkgs.k8s.io/core:/stable:/v${kubernetes_version}/deb/ /" > /etc/apt/sources.list.d/kubernetes.list; \
|
||||||
|
cat /etc/apt/sources.list.d/kubernetes.list;
|
||||||
|
|
||||||
|
|
||||||
|
FROM --platform=$TARGETPLATFORM python:3.11-slim-${release_name}
|
||||||
|
|
||||||
|
|
||||||
# Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283
|
# Ansible chucks a wobbler without. see: https://github.com/ansible/ansible/issues/78283
|
||||||
ENV LC_ALL en_US.UTF-8
|
ENV LC_ALL en_US.UTF-8
|
||||||
@ -40,19 +70,34 @@ RUN apt update \
|
|||||||
&& cp /tmp/deb/sbin/ldconfig /sbin/ \
|
&& cp /tmp/deb/sbin/ldconfig /sbin/ \
|
||||||
&& rm -Rf /tmp/deb \
|
&& rm -Rf /tmp/deb \
|
||||||
&& rm $(ls | grep libc-bin_ | grep -a '.deb') \
|
&& rm $(ls | grep libc-bin_ | grep -a '.deb') \
|
||||||
&& apt-get install --reinstall \
|
&& apt-get install -y --reinstall \
|
||||||
libc-bin \
|
libc-bin \
|
||||||
# EoF fixing dpkg ldconfig not found error
|
# EoF fixing dpkg ldconfig not found error
|
||||||
# Set Locale to en_US as ansible requires a locale for it to function without chucking a tantrum!!
|
# Set Locale to en_US as ansible requires a locale for it to function without chucking a tantrum!!
|
||||||
&& apt install -y \
|
&& apt install -y \
|
||||||
locales \
|
locales \
|
||||||
|
apt-transport-https \
|
||||||
&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
|
&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
|
||||||
&& locale-gen \
|
&& locale-gen;
|
||||||
&& apt list --upgradable \
|
|
||||||
|
|
||||||
|
COPY --from=prep --chmod=644 /etc/apt/sources.list.d/helm.list /etc/apt/sources.list.d/helm.list
|
||||||
|
|
||||||
|
COPY --from=prep --chmod=644 /usr/share/keyrings/helm.gpg /usr/share/keyrings/helm.gpg
|
||||||
|
|
||||||
|
COPY --from=prep --chmod=644 /etc/apt/sources.list.d/kubernetes.list /etc/apt/sources.list.d/kubernetes.list
|
||||||
|
|
||||||
|
COPY --from=prep --chmod=644 /usr/share/keyrings/kubernetes.gpg /usr/share/keyrings/kubernetes.gpg
|
||||||
|
|
||||||
|
|
||||||
|
RUN apt update; \
|
||||||
|
apt list --upgradable \
|
||||||
&& apt upgrade --no-install-recommends -y \
|
&& apt upgrade --no-install-recommends -y \
|
||||||
&& apt-get install --no-install-recommends -y \
|
&& apt-get install --no-install-recommends -y \
|
||||||
openssh-client \
|
openssh-client \
|
||||||
git \
|
git \
|
||||||
|
helm \
|
||||||
|
kubectl \
|
||||||
sshpass \
|
sshpass \
|
||||||
postgresql-common \
|
postgresql-common \
|
||||||
postgresql-client \
|
postgresql-client \
|
||||||
@ -65,8 +110,9 @@ RUN apt update \
|
|||||||
# see issue https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/9 for following two lines
|
# see issue https://gitlab.com/nofusscomputing/projects/ansible/execution_environment/-/issues/9 for following two lines
|
||||||
&& apt remove -y \
|
&& apt remove -y \
|
||||||
python3* \
|
python3* \
|
||||||
libpython3* \
|
libpython3*; \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
helm plugin install https://github.com/databus23/helm-diff; \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
||||||
WORKDIR /workdir
|
WORKDIR /workdir
|
||||||
@ -90,6 +136,7 @@ RUN ansible-galaxy collection install \
|
|||||||
# ansible.posix.authorized_key for SSH
|
# ansible.posix.authorized_key for SSH
|
||||||
ansible.posix==1.5.4 \
|
ansible.posix==1.5.4 \
|
||||||
ansible.utils==3.1.0 \
|
ansible.utils==3.1.0 \
|
||||||
|
community.crypto==2.18.0 \
|
||||||
community.dns==2.8.1 \
|
community.dns==2.8.1 \
|
||||||
# docker managment
|
# docker managment
|
||||||
community.docker==3.8.0 \
|
community.docker==3.8.0 \
|
||||||
@ -97,6 +144,7 @@ RUN ansible-galaxy collection install \
|
|||||||
community.general==8.4.0 \
|
community.general==8.4.0 \
|
||||||
community.mysql==3.9.0 \
|
community.mysql==3.9.0 \
|
||||||
community.postgresql==3.4.0 \
|
community.postgresql==3.4.0 \
|
||||||
|
netbox.netbox==3.17.0 \
|
||||||
theforeman.foreman==4.0.0; \
|
theforeman.foreman==4.0.0; \
|
||||||
ansible-galaxy collection install --pre \
|
ansible-galaxy collection install --pre \
|
||||||
nofusscomputing.kubernetes==1.2.0
|
nofusscomputing.kubernetes==1.7.1
|
@ -46,7 +46,7 @@ RUN which ldconfig
|
|||||||
# && rm libc-bin_*.deb
|
# && rm libc-bin_*.deb
|
||||||
|
|
||||||
# Should re-install without issue
|
# Should re-install without issue
|
||||||
RUN apt-get install --reinstall \
|
RUN apt-get install -y --reinstall \
|
||||||
libc-bin
|
libc-bin
|
||||||
# EoF fixing dpkg ldconfig not found error
|
# EoF fixing dpkg ldconfig not found error
|
||||||
# Set Locale to en_US as ansible requires a locale for it to function without chucking a tantrum!!
|
# Set Locale to en_US as ansible requires a locale for it to function without chucking a tantrum!!
|
||||||
|
Submodule includes/etc/ansible/playbooks updated: 19ca514804...d33a223f02
Submodule includes/etc/ansible/roles updated: 538e9ebe2d...33197d244e
@ -8,6 +8,12 @@ python_gitlab==4.3.0
|
|||||||
psycopg2==2.9.9
|
psycopg2==2.9.9
|
||||||
# community.mysql
|
# community.mysql
|
||||||
PyMySQL==1.1.0
|
PyMySQL==1.1.0
|
||||||
|
# NetBox
|
||||||
|
pytz==2024.1
|
||||||
|
|
||||||
|
PyYAML>=3.11
|
||||||
|
# kubernetes.core.k8s
|
||||||
|
jsonpatch
|
||||||
|
|
||||||
dnspython==2.4.2
|
dnspython==2.4.2
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user