You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ki...@apache.org on 2023/02/20 17:39:24 UTC
[trafficserver-ingress-controller] branch master updated: Go 1.19.6 and Alpine linux 3.16.4 upgrade (#153)
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 405b83f Go 1.19.6 and Alpine linux 3.16.4 upgrade (#153)
405b83f is described below
commit 405b83f6ba08a38ce91f4db039a2cb513b427bb1
Author: Kit Chan <ki...@apache.org>
AuthorDate: Mon Feb 20 09:39:19 2023 -0800
Go 1.19.6 and Alpine linux 3.16.4 upgrade (#153)
* Go 1.19.6 and Alpine linux 3.16.4 upgrade
* update with go fmt
* update golangci-lint-action
---
.github/workflows/golangci-lint.yml | 4 ++--
Dockerfile | 4 ++--
GO_VERSION | 2 +-
README.md | 2 +-
go.mod | 2 +-
redis/redis_test.go | 19 +++++++++----------
watcher/handlerConfigmap_test.go | 19 +++++++++----------
watcher/handlerEndpoint_test.go | 19 +++++++++----------
watcher/handlerIngress_test.go | 19 +++++++++----------
watcher/watcher_test.go | 19 +++++++++----------
10 files changed, 52 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 8956597..fc6a266 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -52,8 +52,8 @@ jobs:
with:
go-version: ${{ steps.go-version.outputs.value }}
- name: golangci-lint
- uses: golangci/golangci-lint-action@v3.2.0
+ uses: golangci/golangci-lint-action@v3
with:
- version: v1.46.2
+ version: latest
args: --timeout=10m
diff --git a/Dockerfile b/Dockerfile
index 2a56081..a4e39d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
# limitations under the License.
#
-FROM alpine:3.16.3 as builder
+FROM alpine:3.16.4 as builder
RUN apk add --no-cache --virtual .tools \
bzip2 curl git automake libtool autoconf make sed file perl openrc openssl
@@ -121,7 +121,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.16.3
+FROM alpine:3.16.4
# essential library
RUN apk add --no-cache -U \
diff --git a/GO_VERSION b/GO_VERSION
index 0150af1..2a4feaf 100644
--- a/GO_VERSION
+++ b/GO_VERSION
@@ -1 +1 @@
-1.18.10
+1.19.6
diff --git a/README.md b/README.md
index f07c978..d72d82a 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Card](https://goreportcard.com/badge/github.com/apache/trafficserver-ingress-con
- [Development](https://github.com/apache/trafficserver-ingress-controller/blob/master/docs/DEVELOPMENT.md)
## Versions of Software Used
-- Alpine Linux 3.16.3
+- Alpine Linux 3.16.4
- Apache Traffic Server 9.2.0
- LuaJIT 2.0.4
- Go (Version can be found in `GO_VERSION` file found at the base of this repository)
diff --git a/go.mod b/go.mod
index f918717..3ba9ae6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/apache/trafficserver-ingress-controller
-go 1.18
+go 1.19
require (
github.com/alicebob/miniredis/v2 v2.13.0
diff --git a/redis/redis_test.go b/redis/redis_test.go
index 91afa56..86321c7 100644
--- a/redis/redis_test.go
+++ b/redis/redis_test.go
@@ -1,16 +1,15 @@
/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
*/
package redis
diff --git a/watcher/handlerConfigmap_test.go b/watcher/handlerConfigmap_test.go
index cb17a65..87b915a 100644
--- a/watcher/handlerConfigmap_test.go
+++ b/watcher/handlerConfigmap_test.go
@@ -1,16 +1,15 @@
/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
*/
package watcher
diff --git a/watcher/handlerEndpoint_test.go b/watcher/handlerEndpoint_test.go
index 8adca20..7327977 100644
--- a/watcher/handlerEndpoint_test.go
+++ b/watcher/handlerEndpoint_test.go
@@ -1,16 +1,15 @@
/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
*/
package watcher
diff --git a/watcher/handlerIngress_test.go b/watcher/handlerIngress_test.go
index 2247759..6d89fd0 100644
--- a/watcher/handlerIngress_test.go
+++ b/watcher/handlerIngress_test.go
@@ -1,16 +1,15 @@
/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
*/
package watcher
diff --git a/watcher/watcher_test.go b/watcher/watcher_test.go
index 34bcbb8..5d2242a 100644
--- a/watcher/watcher_test.go
+++ b/watcher/watcher_test.go
@@ -1,16 +1,15 @@
/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
*/
package watcher