[trafficserver-ingress-controller] branch master updated: Relocate controller program (#163)

[kichan]

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 fa99174  Relocate controller program (#163)
fa99174 is described below

commit fa99174642d548d66351ae4014fc62e578c109ca
Author: Kit Chan <kic...@apache.org>
AuthorDate: Mon Mar 27 11:25:01 2023 -0700

    Relocate controller program (#163)
---
 Dockerfile   | 3 ++-
 bin/entry.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5b2a46d..a4e01ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,8 +97,9 @@ COPY ["./go.sum", 
"$GOPATH/src/github.com/apache/trafficserver-ingress-controlle
 # Building Project Main
 WORKDIR /opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller
 ENV GO111MODULE=on
-RUN /opt/ats/go/bin/go build -o ingress_ats main/main.go 
+RUN /opt/ats/go/bin/go build -o /opt/ats/bin/ingress_ats main/main.go 
 RUN /opt/ats/go/bin/go clean -modcache
+RUN rm -rf /opt/ats/go
 
 # redis conf 
 COPY ["./config/redis.conf", "/opt/ats/etc/redis.conf"]
diff --git a/bin/entry.sh b/bin/entry.sh
index 1c69bee..16fd10c 100755
--- a/bin/entry.sh
+++ b/bin/entry.sh
@@ -49,7 +49,7 @@ if [ -z "${RESYNC_PERIOD}" ]; then
 fi
 
 if [ -z "${INGRESS_DEBUG}" ]; then
-  
/opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller/ingress_ats
 -atsIngressClass="$INGRESS_CLASS" -atsNamespace="$POD_NAMESPACE" 
-namespaces="$INGRESS_NS" -ignoreNamespaces="$INGRESS_IGNORE_NS" 
-useInClusterConfig=T -resyncPeriod="$RESYNC_PERIOD"
+  /opt/ats/bin/ingress_ats -atsIngressClass="$INGRESS_CLASS" 
-atsNamespace="$POD_NAMESPACE" -namespaces="$INGRESS_NS" 
-ignoreNamespaces="$INGRESS_IGNORE_NS" -useInClusterConfig=T 
-resyncPeriod="$RESYNC_PERIOD"
 else
-  
/opt/ats/go/bin/src/github.com/apache/trafficserver-ingress-controller/ingress_ats
 -atsIngressClass="$INGRESS_CLASS" -atsNamespace="$POD_NAMESPACE" 
-namespaces="$INGRESS_NS" -ignoreNamespaces="$INGRESS_IGNORE_NS" 
-useInClusterConfig=T -resyncPeriod="$RESYNC_PERIOD" 
2>>/opt/ats/var/log/ingress/ingress_ats.err
+  /opt/ats/bin/ingress_ats -atsIngressClass="$INGRESS_CLASS" 
-atsNamespace="$POD_NAMESPACE" -namespaces="$INGRESS_NS" 
-ignoreNamespaces="$INGRESS_IGNORE_NS" -useInClusterConfig=T 
-resyncPeriod="$RESYNC_PERIOD" 2>>/opt/ats/var/log/ingress/ingress_ats.err
 fi