Skip to content

Commit a0dccba

Browse files
author
Leonid Podolinskiy
authored
move to go 19.4 (#5)
* move to go 19.4 * update dependencies
1 parent f220312 commit a0dccba

File tree

6 files changed

+157
-818
lines changed

6 files changed

+157
-818
lines changed

.github/workflows/e2e.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v3
2424

25+
- name: Setup Go environment
26+
uses: actions/[email protected]
27+
with:
28+
go-version: '1.19.4'
29+
30+
- name: Run tests
31+
shell: bash
32+
run: |
33+
make test
34+
2535
- name: Spin up k3s cluster
2636
shell: bash
2737
run: |

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Setup Go environment
4646
uses: actions/[email protected]
4747
with:
48-
go-version: '1.18.0'
48+
go-version: '1.19.4'
4949

5050
- name: Run tests and prepare reports
5151
shell: bash

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.18 as builder
2+
FROM golang:1.19.4 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

examples/app/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ WORKDIR /app
33
COPY PrimeMain.java /app
44
RUN javac -g PrimeMain.java
55
RUN jar --create --file /app/PrimeMain.jar --main-class PrimeMain PrimeMain.class
6-
RUN useradd -u 1234 appuser
7-
USER appuser
6+
USER 1234
87
ENTRYPOINT ["java", "-jar", "/app/PrimeMain.jar"]

go.mod

+42-53
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,70 @@
11
module github.com/lightrun-platform/lightrun-k8s-operator
22

3-
go 1.18
3+
go 1.19
44

55
require (
6-
github.com/go-logr/logr v1.2.0
7-
github.com/onsi/ginkgo/v2 v2.1.6
8-
github.com/onsi/gomega v1.20.1
9-
go.uber.org/zap v1.19.1
10-
k8s.io/api v0.24.4
11-
k8s.io/apimachinery v0.24.4
12-
k8s.io/client-go v0.24.4
13-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
14-
sigs.k8s.io/controller-runtime v0.12.1
6+
github.com/go-logr/logr v1.2.3
7+
github.com/onsi/ginkgo/v2 v2.6.0
8+
github.com/onsi/gomega v1.24.1
9+
go.uber.org/zap v1.24.0
10+
k8s.io/api v0.26.0
11+
k8s.io/apimachinery v0.26.0
12+
k8s.io/client-go v0.26.0
13+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
14+
sigs.k8s.io/controller-runtime v0.14.1
1515
)
1616

1717
require (
18-
cloud.google.com/go v0.81.0 // indirect
19-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
20-
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
21-
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
22-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
23-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
24-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
25-
github.com/PuerkitoBio/purell v1.1.1 // indirect
26-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
2718
github.com/beorn7/perks v1.0.1 // indirect
28-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
19+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2920
github.com/davecgh/go-spew v1.1.1 // indirect
30-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
31-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
32-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
33-
github.com/fsnotify/fsnotify v1.5.1 // indirect
34-
github.com/go-logr/zapr v1.2.0 // indirect
35-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
36-
github.com/go-openapi/jsonreference v0.19.5 // indirect
37-
github.com/go-openapi/swag v0.19.14 // indirect
21+
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
22+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
23+
github.com/fsnotify/fsnotify v1.6.0 // indirect
24+
github.com/go-logr/zapr v1.2.3 // indirect
25+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
26+
github.com/go-openapi/jsonreference v0.20.1 // indirect
27+
github.com/go-openapi/swag v0.22.3 // indirect
3828
github.com/gogo/protobuf v1.3.2 // indirect
3929
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4030
github.com/golang/protobuf v1.5.2 // indirect
41-
github.com/google/gnostic v0.5.7-v3refs // indirect
42-
github.com/google/go-cmp v0.5.8 // indirect
43-
github.com/google/gofuzz v1.1.0 // indirect
44-
github.com/google/uuid v1.2.0 // indirect
45-
github.com/imdario/mergo v0.3.12 // indirect
31+
github.com/google/gnostic v0.6.9 // indirect
32+
github.com/google/go-cmp v0.5.9 // indirect
33+
github.com/google/gofuzz v1.2.0 // indirect
34+
github.com/google/uuid v1.3.0 // indirect
35+
github.com/imdario/mergo v0.3.13 // indirect
4636
github.com/josharian/intern v1.0.0 // indirect
4737
github.com/json-iterator/go v1.1.12 // indirect
48-
github.com/mailru/easyjson v0.7.6 // indirect
49-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
38+
github.com/mailru/easyjson v0.7.7 // indirect
39+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5040
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5141
github.com/modern-go/reflect2 v1.0.2 // indirect
5242
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5343
github.com/pkg/errors v0.9.1 // indirect
54-
github.com/prometheus/client_golang v1.12.1 // indirect
55-
github.com/prometheus/client_model v0.2.0 // indirect
56-
github.com/prometheus/common v0.32.1 // indirect
57-
github.com/prometheus/procfs v0.7.3 // indirect
44+
github.com/prometheus/client_golang v1.14.0 // indirect
45+
github.com/prometheus/client_model v0.3.0 // indirect
46+
github.com/prometheus/common v0.39.0 // indirect
47+
github.com/prometheus/procfs v0.9.0 // indirect
5848
github.com/spf13/pflag v1.0.5 // indirect
5949
go.uber.org/atomic v1.7.0 // indirect
6050
go.uber.org/multierr v1.6.0 // indirect
61-
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
62-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
63-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
64-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
65-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
66-
golang.org/x/text v0.3.7 // indirect
67-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
51+
golang.org/x/net v0.5.0 // indirect
52+
golang.org/x/oauth2 v0.4.0 // indirect
53+
golang.org/x/sys v0.4.0 // indirect
54+
golang.org/x/term v0.4.0 // indirect
55+
golang.org/x/text v0.6.0 // indirect
56+
golang.org/x/time v0.3.0 // indirect
6857
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
6958
google.golang.org/appengine v1.6.7 // indirect
70-
google.golang.org/protobuf v1.28.0 // indirect
59+
google.golang.org/protobuf v1.28.1 // indirect
7160
gopkg.in/inf.v0 v0.9.1 // indirect
7261
gopkg.in/yaml.v2 v2.4.0 // indirect
7362
gopkg.in/yaml.v3 v3.0.1 // indirect
74-
k8s.io/apiextensions-apiserver v0.24.0 // indirect
75-
k8s.io/component-base v0.24.0 // indirect
76-
k8s.io/klog/v2 v2.60.1 // indirect
77-
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
78-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
79-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
63+
k8s.io/apiextensions-apiserver v0.26.0 // indirect
64+
k8s.io/component-base v0.26.0 // indirect
65+
k8s.io/klog/v2 v2.80.1 // indirect
66+
k8s.io/kube-openapi v0.0.0-20230109175130-d603cf344c92 // indirect
67+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
68+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8069
sigs.k8s.io/yaml v1.3.0 // indirect
8170
)

0 commit comments

Comments
 (0)