Fix Controller & Sidecar image release

Collector/Sidecar/Dockerfile

@@ -0,0 +1,103 @@
+FROM debian:buster-slim
+
+LABEL maintainer="NGINX Docker Maintainers <[email protected]>"
+
+ENV NGINX_VERSION   1.17.10
+ENV NJS_VERSION     0.3.9
+ENV PKG_RELEASE     1~buster
+
+RUN set -x \
+# create nginx user/group first, to be consistent throughout docker variants
+    && addgroup --system --gid 101 nginx \
+    && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
+    && apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests -y gnupg1 ca-certificates curl \
+    && \
+    NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
+    found=''; \
+    for server in \
+        ha.pool.sks-keyservers.net \
+        hkp://keyserver.ubuntu.com:80 \
+        hkp://p80.pool.sks-keyservers.net:80 \
+        pgp.mit.edu \
+    ; do \
+        echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
+        apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
+    done; \
+    test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
+    apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
+    && dpkgArch="$(dpkg --print-architecture)" \
+    && nginxPackages=" \
+        nginx=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-xslt=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-geoip=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-image-filter=${NGINX_VERSION}-${PKG_RELEASE} \
+        nginx-module-njs=${NGINX_VERSION}.${NJS_VERSION}-${PKG_RELEASE} \
+    " \
+    && case "$dpkgArch" in \
+        amd64|i386) \
+# arches officialy built by upstream
+            echo "deb https://nginx.org/packages/mainline/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \
+            && apt-get update \
+            ;; \
+        *) \
+# we're on an architecture upstream doesn't officially build for
+# let's build binaries from the published source packages
+            echo "deb-src https://nginx.org/packages/mainline/debian/ buster nginx" >> /etc/apt/sources.list.d/nginx.list \
+            \
+# new directory for storing sources and .deb files
+            && tempDir="$(mktemp -d)" \
+            && chmod 777 "$tempDir" \
+# (777 to ensure APT's "_apt" user can access it too)
+            \
+# save list of currently-installed packages so build dependencies can be cleanly removed later
+            && savedAptMark="$(apt-mark showmanual)" \
+            \
+# build .deb files from upstream's source packages (which are verified by apt-get)
+            && apt-get update \
+            && apt-get build-dep -y $nginxPackages \
+            && ( \
+                cd "$tempDir" \
+                && DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
+                    apt-get source --compile $nginxPackages \
+            ) \
+# we don't remove APT lists here because they get re-downloaded and removed later
+            \
+# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
+# (which is done after we install the built packages so we don't have to redownload any overlapping dependencies)
+            && apt-mark showmanual | xargs apt-mark auto > /dev/null \
+            && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
+            \
+# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
+            && ls -lAFh "$tempDir" \
+            && ( cd "$tempDir" && dpkg-scanpackages . > Packages ) \
+            && grep '^Package: ' "$tempDir/Packages" \
+            && echo "deb [ trusted=yes ] file://$tempDir ./" > /etc/apt/sources.list.d/temp.list \
+# work around the following APT issue by using "Acquire::GzipIndexes=false" (overriding "/etc/apt/apt.conf.d/docker-gzip-indexes")
+#   Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
+#   ...
+#   E: Failed to fetch store:/var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages  Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
+            && apt-get -o Acquire::GzipIndexes=false update \
+            ;; \
+    esac \
+    \
+    && apt-get install --no-install-recommends --no-install-suggests -y \
+                        $nginxPackages \
+                        gettext-base \
+    && apt-get remove --purge --auto-remove -y ca-certificates && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list \
+    \
+# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
+    && if [ -n "$tempDir" ]; then \
+        apt-get purge -y --auto-remove \
+        && rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
+    fi
+
+# forward request and error logs to docker log collector
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
+EXPOSE 80
+
+STOPSIGNAL SIGTERM
+
+CMD ["nginx", "-g", "daemon off;"]

Controller/Dockerfile.amd64

@@ -0,0 +1,11 @@
+FROM python:3
+
+RUN mkdir /var/static
+
+COPY annotations.py /var/static
+COPY controller.py /var/static
+
+RUN sed -i "s|\+release,|\+release\+\"-amd64\",|g" /var/static/controller.py
+RUN pip install kubernetes
+
+CMD python /var/static/controller.py

Controller/controller-sms-inline.yaml

@@ -21,6 +21,7 @@ data:
     import sys
     import json
     import base64
+    immport os
     
     import annotations
     
@@ -125,10 +126,12 @@ data:
         
         if configMapStatus ==  False:
             log.error("Unable to make Proxy Config Map")
-    
+            
+        release = os.environ.get("RELEASE") if os.environ.get("RELEASE") else "latest"
+
         container = client.V1Container(
             name="sidecar",
-            image="medinvention/nginx:1.17.10",
+            image="medinvention/k8s-sms-sidecar:"+release,
             ports=[client.V1ContainerPort(container_port=proxyPort)],
             env=[
                 client.V1EnvVar(name="POD_NAME", value_from=client.V1EnvVarSource(field_ref=client.V1ObjectFieldSelector(field_path="metadata.name"))),

Controller/controller.py

@@ -5,6 +5,7 @@
 import sys
 import json
 import base64
+import os
 
 import annotations
 
@@ -18,7 +19,7 @@
 log.setLevel(logging.INFO)
 
 config.load_incluster_config()
-# config.load_kube_config()
+#config.load_kube_config()
 
 api_instance = client.AppsV1Api(client.ApiClient())
 w = watch.Watch()
@@ -111,9 +112,11 @@ def injectSidecar(deployment, group, port, service, serviceNamespace, revision =
   if configMapStatus ==  False:
     log.error("Unable to make Proxy Config Map")
 
+  release = os.environ.get("RELEASE") if os.environ.get("RELEASE") else "latest"
+
   container = client.V1Container(
         name="sidecar",
-        image="medinvention/nginx:1.17.10",
+        image="medinvention/k8s-sms-sidecar:"+release,
         ports=[client.V1ContainerPort(container_port=proxyPort)],
         env=[
           client.V1EnvVar(name="POD_NAME", value_from=client.V1EnvVarSource(field_ref=client.V1ObjectFieldSelector(field_path="metadata.name"))),

README.md

@@ -6,7 +6,7 @@ This is a very simplified mesh service injector and monitoring for Rest deployme
 
 ----
 
-<img src="UI/public/images/network-cover-blue.jpg" width="900">
+<img src="https://raw.githubusercontent.com/mmohamed/k8s-sms/master/UI/public/images/network-cover-blue.jpg" width="900">
 
 ----