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 c4db3ff Upgrade ATS & alpine linux (#238)
c4db3ff is described below
commit c4db3ff00cf7209f78b336fa4dce258e0be5101f
Author: Kit Chan <[email protected]>
AuthorDate: Fri Aug 30 11:55:08 2024 -0700
Upgrade ATS & alpine linux (#238)
* Update Dockerfile
* Update README.md
* Fix lint error
---
Dockerfile | 8 ++++----
README.md | 4 ++--
watcher/watcher.go | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 470fbeb..10ec21d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM alpine:3.20.1 as builder
+FROM alpine:3.20.2 as builder
RUN apk add --no-cache --virtual .tools \
bzip2 curl nghttp2-libs git automake libtool autoconf make sed file perl
openrc openssl
@@ -38,8 +38,8 @@ RUN adduser -S -D -H -u 1000 -h /tmp -s /sbin/nologin -G ats
-g ats ats
# download and build ATS
# patch 2 files due to pthread in musl vs glibc - see
https://github.com/apache/trafficserver/pull/7611/files
-RUN curl -L
https://downloads.apache.org/trafficserver/trafficserver-9.2.4.tar.bz2 | bzip2
-dc | tar xf - \
- && cd trafficserver-9.2.4/ \
+RUN curl -L
https://downloads.apache.org/trafficserver/trafficserver-9.2.5.tar.bz2 | bzip2
-dc | tar xf - \
+ && cd trafficserver-9.2.5/ \
&& sed -i
"s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/"
include/tscore/ink_rwlock.h \
&& sed -i
"s/PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP/PTHREAD_RWLOCK_INITIALIZER/"
include/tscpp/util/TsSharedMutex.h \
&& autoreconf -if \
@@ -127,7 +127,7 @@ RUN mkdir -p /opt/ats/var/run/redis/ \
# set up ingress log location
RUN mkdir -p /opt/ats/var/log/ingress/
-FROM alpine:3.20.1
+FROM alpine:3.20.2
# essential library
RUN apk add --no-cache -U \
diff --git a/README.md b/README.md
index d060ba7..71adfe3 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,8 @@
Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con
-
[Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md)
## Dependencies
-- Alpine Linux 3.20.1
-- Apache Traffic Server 9.2.4
+- Alpine Linux 3.20.2
+- Apache Traffic Server 9.2.5
- OpenResty LuaJIT2 v2.1-20230410
- Go (Version can be found in `GO_VERSION` file found at the base of this
repository)
- Other Packages
diff --git a/watcher/watcher.go b/watcher/watcher.go
index 972eb11..dd9733b 100644
--- a/watcher/watcher.go
+++ b/watcher/watcher.go
@@ -112,7 +112,7 @@ func (w *Watcher) allNamespacesWatchFor(h EventHandler, c
cache.Getter,
if !cache.WaitForCacheSync(w.StopChan, sharedInformer.HasSynced) {
s := fmt.Sprintf("Timed out waiting for %s caches to sync",
h.GetResourceName())
- utilruntime.HandleError(fmt.Errorf(s))
+ utilruntime.HandleError(errors.New(s))
return errors.New(s)
}
return nil
@@ -155,7 +155,7 @@ func (w *Watcher) inNamespacesWatchFor(h EventHandler, c
cache.Getter,
}
if !cache.WaitForCacheSync(w.StopChan, syncFuncs...) {
s := fmt.Sprintf("Timed out waiting for %s caches to sync",
h.GetResourceName())
- utilruntime.HandleError(fmt.Errorf(s))
+ utilruntime.HandleError(errors.New(s))
return errors.New(s)
}
return nil
