Run as Deployment

Closes #13
edwardtheharris · Aug 13, 2024 · 5d5f6a6 · 5d5f6a6
1 parent 8d0cc7e
commit 5d5f6a6
Show file tree

Hide file tree

Showing 18 changed files with 728 additions and 174 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+**/*.md
diff --git a/conf.py b/conf.py
@@ -33,11 +33,12 @@ def get_release():
 
 exclude_patterns = [
     '_build',
-    'Thumbs.db',
     '.DS_Store',
-    '.venv/*',
-    '.tmp/*',
+    '.gnupg/*',
     '.pytest_cache/*',
+    '.tmp/*',
+    '.venv/*',
+    'Thumbs.db',
 ]
 
 extensions = [

diff --git a/config/celery.init.sh b/config/celery.init.sh
@@ -2,6 +2,8 @@
 
 set -x
 
+cat /opt/.celery/resolv.conf > /etc/resolv.conf
+
 rm -rfv /opt/celery
 
 mkdir -pv /opt/celery
@@ -12,9 +14,9 @@ apk add --no-cache sudo
 
 sudo -u celery python -m venv /opt/celery
 
-sudo -u celery /opt/celery/bin/pip install -U pip
+sudo -u celery /opt/celery/bin/pip install --no-cache-dir -U pip -v
 
-sudo -u celery /opt/celery/bin/pip install -r /opt/.celery/reqs
+sudo -u celery /opt/celery/bin/pip install --no-cache-dir -r /opt/.celery/reqs
 
 cat /opt/.celery/.bashrc > /opt/celery/.bashrc
 
@@ -24,3 +26,5 @@ NAUTOBOT_ROOT=/opt/celery
 export NAUTOBOT_ROOT
 
 sudo -E -u celery /opt/celery/bin/nautobot-server init
+
+exit 0
diff --git a/config/nautobot.init.sh b/config/nautobot.init.sh
@@ -2,25 +2,28 @@
 
 set -x
 
-rm -rfv /opt/nautobot
+cat /opt/.nautobot/resolv.conf > /etc/resolv.conf
+
+apk add --no-cache sudo
+
+rm -rf /opt/nautobot/*
 
 mkdir -pv /opt/nautobot
 
 chown -v nautobot:nautobot /opt/nautobot
 
-apk add --no-cache sudo
-
 sudo -u nautobot python -m venv /opt/nautobot
 
-sudo -u nautobot /opt/nautobot/bin/pip install -U pip
+sudo -u nautobot /opt/nautobot/bin/pip install --no-cache-dir -U pip
 
-sudo -u nautobot /opt/nautobot/bin/pip install -r /opt/.nautobot/reqs
+sudo -u nautobot /opt/nautobot/bin/pip install --no-cache-dir -r /opt/.nautobot/reqs
 
 cat /opt/.nautobot/.bashrc > /opt/nautobot/.bashrc
 
 chown -v nautobot:nautobot /opt/nautobot/.bashrc
 
 NAUTOBOT_ROOT=/opt/nautobot
+
 export NAUTOBOT_ROOT
 
 sudo -E -u nautobot /opt/nautobot/bin/nautobot-server init
@@ -30,3 +33,5 @@ sudo -E -u nautobot /opt/nautobot/bin/nautobot-server migrate
 sudo -E -u nautobot /opt/nautobot/bin/nautobot-server createsuperuser --email "${NAUTOBOT_SUPERUSER_EMAIL}" --username "${NAUTOBOT_SUPERUSER_USERNAME}" --noinput
 
 sudo -E -u nautobot /opt/nautobot/bin/nautobot-server collectstatic
+
+exit 0
diff --git a/config/reqs b/config/reqs
@@ -1,8 +1,6 @@
 gitpython
-celery[redis]
 loguru
 lxml
 nautobot[sso]
-redis
 wheel
 xmlsec
diff --git a/config/resolv.conf b/config/resolv.conf
@@ -0,0 +1,4 @@
+search nautobot.svc.cluster.local postgresql.svc.cluster.local svc.cluster.local cluster.local socal.rr.com
+nameserver 8.8.8.8
+nameserver 10.96.0.10
+options ndots:5
diff --git a/container/Dockerfile b/container/Dockerfile
@@ -1,11 +1,11 @@
-FROM python:3.11-alpine AS build
+ARG PYTHON_VERSION='3.12'
+FROM python:${PYTHON_VERSION}-alpine AS build
+ARG VERSION
 ARG USER=nautobot
 LABEL io.ghcr.edwardtheharris.helm-nautobot.editor="Xander Harris"
 LABEL io.ghcr.edwardtheharris.helm-nautobot.name="${USER}"
 LABEL org.opencontainers.image.source="https://github.com/edwardtheharris/helm-nautobot"
-LABEL io.ghcr.edwardtheharris.helm-nautobot.version="0.0.1.rc30"
-COPY container/${USER}.entrypoint.sh /bin/entrypoint.sh
-COPY container/reqs /opt/${USER}/reqs
+LABEL io.ghcr.edwardtheharris.helm-nautobot.version="${VERSION}"
 RUN apk add --no-cache \
     alpine-sdk \
     bash \
@@ -21,7 +21,6 @@ RUN apk add --no-cache \
     vim \
     xmlsec-dev \
     zlib-dev \
-    && chmod +x /bin/entrypoint.sh \
     && groupadd ${USER} \
     && useradd -s /bin/bash -m -d /opt/${USER} -g ${USER} ${USER}
-CMD ["/bin/entrypoint.sh", "${USER}"]
+CMD ["tail", "-f", "/dev/null"]
diff --git a/container/celery.entrypoint.sh b/container/celery.entrypoint.sh
diff --git a/container/index.md b/container/index.md
@@ -17,7 +17,11 @@ To build the nautobot container you run the build command below.
 
 VERSION=0.0.1
 
-docker build -t ghcr.io/edwardtheharris/helm-nautobot/nautobot:${VERSION} \
+export VERSION
+
+docker build --build-arg VERSION="${VERSION}" \
+  --build-arg PYTHON_VERSION='3.12' \
+  -t ghcr.io/edwardtheharris/helm-nautobot/nautobot:${VERSION} \
   --progress plain --push -f container/Dockerfile .
 ```
 
@@ -29,7 +33,10 @@ argument as shown below.
 
 VERSION=0.0.1
 
-docker build --build-arg USER=celery \
+export VERSION
+
+docker build --build-arg PYTHON_VERSION='3.12' --build-arg USER=celery \
+    --build-arg="${VERSION}" \
     -t ghcr.io/edwardtheharris/helm-nautobot/celery:${VERSION} \
     --progress plain --push -f container/Dockerfile .
 ```
diff --git a/container/nautobot.entrypoint.sh b/container/nautobot.entrypoint.sh
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -37,7 +37,6 @@ Common labels
 helm.sh/chart: {{ include "nautobot.chart" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
-app.kubernetes.io/component: backend
 app.kubernetes.io/part-of: nautobot
 {{ include "nautobot.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
@@ -50,7 +49,6 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "nautobot.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "nautobot.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -12,6 +12,9 @@ data:
   uwsgi.ini: |-
     {{- $.Files.Get "config/uwsgi.ini" | nindent 4 }}
 
+  resolv.conf: |-
+    {{- $.Files.Get "config/resolv.conf" | nindent 4 }}
+
   reqs: |-
     {{- $.Files.Get "config/reqs" | nindent 4 }}
 
@@ -33,5 +36,8 @@ data:
   reqs: |-
     {{- $.Files.Get "config/reqs" | nindent 4 }}
 
+  resolv.conf: |-
+    {{- $.Files.Get "config/resolv.conf" | nindent 4 }}
+
   init.sh: |-
     {{- $.Files.Get "config/celery.init.sh" | nindent 4 }}