Skip to content

Commit 8f2df29

Browse files
authored
NETOBSERV-1451: Bump ubi 9.3 / go 1.21 (#451)
1 parent bd8a90b commit 8f2df29

File tree

8 files changed

+9
-17
lines changed

8 files changed

+9
-17
lines changed

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
go: ['1.19','1.20']
13+
go: ['1.20','1.21']
1414

1515
steps:
1616
- name: install make

.github/workflows/push_image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
18-
go: ['1.20']
18+
go: ['1.21']
1919
steps:
2020
- name: install make
2121
run: sudo apt-get install make
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-latest
4747
strategy:
4848
matrix:
49-
go: ['1.20']
49+
go: ['1.21']
5050
steps:
5151
- name: install make
5252
run: sudo apt-get install make

.github/workflows/push_image_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
go: ['1.20']
19+
go: ['1.21']
2020
steps:
2121
- name: install make
2222
run: sudo apt-get install make

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
go: ['1.20']
17+
go: ['1.21']
1818
steps:
1919
- name: checkout
2020
uses: actions/checkout@v3

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ linters:
1818
- unused
1919
linters-settings:
2020
stylecheck:
21-
go: "1.20"
21+
go: "1.21"
2222
gocritic:
2323
enabled-checks:
2424
- hugeParam

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ WORKDIR /opt/app-root/web
2424
RUN npm run format-all
2525
RUN npm run build$BUILDSCRIPT
2626

27-
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.20 as go-builder
27+
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.21 as go-builder
2828

2929
ARG TARGETPLATFORM
3030
ARG TARGETARCH=amd64
@@ -40,7 +40,7 @@ COPY pkg/ pkg/
4040

4141
RUN CGO_ENABLED=0 GOARCH=$TARGETARCH go build -ldflags "$LDFLAGS" -mod vendor -o plugin-backend cmd/plugin-backend.go
4242

43-
FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/ubi-minimal:9.2
43+
FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/ubi-minimal:9.3
4444

4545
COPY --from=web-builder /opt/app-root/web/dist ./web/dist
4646
COPY --from=go-builder /opt/app-root/plugin-backend ./

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/netobserv/network-observability-console-plugin
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/gorilla/mux v1.8.1

pkg/server/server_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"fmt"
1313
"io"
1414
"math/big"
15-
rnd "math/rand"
1615
"net"
1716
"net/http"
1817
"net/http/httptest"
@@ -48,9 +47,6 @@ func TestServerRunning(t *testing.T) {
4847
}
4948

5049
testServerHostPort := fmt.Sprintf("%v:%v", testHostname, testPort)
51-
52-
rnd.Seed(time.Now().UnixNano())
53-
5450
serverURL := fmt.Sprintf("http://%s", testServerHostPort)
5551

5652
// Prepare directory to serve web files
@@ -103,9 +99,6 @@ func TestServerUnauthorized(t *testing.T) {
10399
}
104100

105101
testServerHostPort := fmt.Sprintf("%v:%v", testHostname, testPort)
106-
107-
rnd.Seed(time.Now().UnixNano())
108-
109102
serverURL := fmt.Sprintf("http://%s", testServerHostPort)
110103

111104
// Prepare directory to serve web files
@@ -184,7 +177,6 @@ func TestSecureComm(t *testing.T) {
184177
defer os.Remove(testClientCertFile)
185178
defer os.Remove(testClientKeyFile)
186179

187-
rnd.Seed(time.Now().UnixNano())
188180
conf := &Config{
189181
CertPath: testServerCertFile,
190182
KeyPath: testServerKeyFile,

0 commit comments

Comments
 (0)