[trafficserver-ingress-controller] branch master updated: fix for health check + other minor fixes (#65)

[ki...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kichan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 3074b05  fix for health check + other minor fixes (#65)
3074b05 is described below

commit 3074b054d7aa7cede13dceac12ceb84622488da6
Author: Kit Chan <ki...@apache.org>
AuthorDate: Thu Dec 3 12:08:57 2020 -0800

    fix for health check + other minor fixes (#65)
---
 Dockerfile                             | 4 ++++
 bin/entry.sh                           | 3 ++-
 k8s/traffic-server/ats-deployment.yaml | 7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b7267d6..8bc13c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,8 @@ RUN apk add --no-cache --virtual .ats-build-deps \
   libexecinfo-dev linux-headers libunwind-dev \
   brotli-dev jansson-dev luajit-dev readline-dev geoip-dev 
 
+RUN apk add --no-cache --virtual .ats-extra-build-deps --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing hwloc-dev
+
 RUN curl -L https://www-us.apache.org/dist/trafficserver/trafficserver-8.1.1.tar.bz2 | bzip2 -dc | tar xf - \
   && cd trafficserver-8.1.1/ \
   && autoreconf -if \
@@ -131,6 +133,8 @@ RUN apk add -U \
     cpulimit \
     logrotate
 
+RUN apk add -U --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing hwloc
+
 # redis
 RUN mkdir -p /var/run/redis/ \
   && touch /var/run/redis/redis.sock \
diff --git a/bin/entry.sh b/bin/entry.sh
index 55f143c..c3dccd9 100755
--- a/bin/entry.sh
+++ b/bin/entry.sh
@@ -34,7 +34,8 @@ crond
 # start redis
 redis-server /usr/local/etc/redis.conf 
 
-# start ats
+# create health check file and start ats
+touch /var/run/ts-alive
 chown -R nobody:nobody /usr/local/etc/trafficserver
 DISTRIB_ID=gentoo /usr/local/bin/trafficserver start
 
diff --git a/k8s/traffic-server/ats-deployment.yaml b/k8s/traffic-server/ats-deployment.yaml
index c61fc64..3e2b632 100644
--- a/k8s/traffic-server/ats-deployment.yaml
+++ b/k8s/traffic-server/ats-deployment.yaml
@@ -35,9 +35,8 @@ spec:
     matchLabels:
       app: trafficserver-test
 
-  # DO NOT EXCEED ONE COPY
   replicas: 1
-  # DO NOT EXCEED ONE COPY
+
   template:
     metadata:
       labels:
@@ -46,6 +45,9 @@ spec:
       containers:
         - name: trafficserver-test
           image: ats-ingress:latest # Needs to be updated
+# Optional privileged securityContext that can be handy when you need to do debugging 
+#          securityContext:
+#            privileged: true
           volumeMounts:
             - mountPath: "/etc/ats/ssl"
               name: ats-ssl
@@ -64,6 +66,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+# Optional environment variables
 #            - name: INGRESS_CLASS
 #              value: "ats"
 #            - name: LOG_CONFIG_FNAME