Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Commit 21c82e8

Browse files
author
Wojciech Kocjan
authored
fix: use kuttl for sidecar test; update to Go 1.18 (#100)
1 parent 7817c8c commit 21c82e8

File tree

6 files changed

+382
-44
lines changed

6 files changed

+382
-44
lines changed

.circleci/config.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ workflows:
2424
jobs:
2525
build:
2626
docker:
27-
- image: circleci/golang:1.16 # We shell out to git in tests, and circleci/golang should have it installed.
27+
- image: cimg/go:1.18 # We shell out to git in tests, and circleci/golang should have it installed.
2828

2929
working_directory: ~/telegraf-operator # Doesn't need to be in GOPATH since it's a Go module.
3030

@@ -53,12 +53,6 @@ jobs:
5353
keys:
5454
- telegraf-operator-gomod-{{ checksum "go.sum" }} # Matches based on go.sum checksum.
5555

56-
# Add the backport source for new git, and install it.
57-
- run: echo 'deb http://deb.debian.org/debian stretch-backports main' | sudo tee /etc/apt/sources.list.d/stretch-backports.list
58-
- run: sudo apt-get update
59-
- run: sudo apt-get -t stretch-backports install -y git
60-
- run: git version
61-
6256
# Build the binaries for the integration tests.
6357
- run: go build -race
6458
# The actual test.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.16 as builder
2+
FROM golang:1.18 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

Dockerfile.multi-arch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.16 as builder
2+
FROM --platform=$BUILDPLATFORM golang:1.18 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

go.mod

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,83 @@
11
module github.com/influxdata/telegraf-operator
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/fsnotify/fsnotify v1.4.9
77
github.com/go-logr/logr v0.3.0
8-
github.com/gogo/protobuf v1.3.2 // indirect
98
github.com/influxdata/toml v0.0.0-20180607005434-2a2e3012f7cf
10-
github.com/naoina/go-stringutil v0.1.0 // indirect
11-
gopkg.in/yaml.v3 v3.0.1 // indirect
9+
github.com/kudobuilder/kuttl v0.12.1
1210
k8s.io/api v0.20.2
1311
k8s.io/apimachinery v0.20.2
14-
k8s.io/apiserver v0.20.1
12+
k8s.io/apiserver v0.20.2
1513
k8s.io/client-go v0.20.2
1614
sigs.k8s.io/controller-runtime v0.8.3
1715
)
16+
17+
require (
18+
cloud.google.com/go v0.99.0 // indirect
19+
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
20+
github.com/Azure/go-autorest/autorest v0.11.1 // indirect
21+
github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect
22+
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
23+
github.com/Azure/go-autorest/logger v0.2.0 // indirect
24+
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
25+
github.com/beorn7/perks v1.0.1 // indirect
26+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
27+
github.com/davecgh/go-spew v1.1.1 // indirect
28+
github.com/docker/docker v20.10.14+incompatible // indirect
29+
github.com/docker/go-connections v0.4.0 // indirect
30+
github.com/docker/go-units v0.4.0 // indirect
31+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
32+
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
33+
github.com/go-logr/zapr v0.2.0 // indirect
34+
github.com/gogo/protobuf v1.3.2 // indirect
35+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
36+
github.com/golang/protobuf v1.5.2 // indirect
37+
github.com/google/go-cmp v0.5.6 // indirect
38+
github.com/google/gofuzz v1.1.0 // indirect
39+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
40+
github.com/google/uuid v1.1.2 // indirect
41+
github.com/googleapis/gnostic v0.5.1 // indirect
42+
github.com/hashicorp/golang-lru v0.5.4 // indirect
43+
github.com/imdario/mergo v0.3.10 // indirect
44+
github.com/json-iterator/go v1.1.12 // indirect
45+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
46+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
47+
github.com/modern-go/reflect2 v1.0.2 // indirect
48+
github.com/naoina/go-stringutil v0.1.0 // indirect
49+
github.com/onsi/gomega v1.10.2 // indirect
50+
github.com/opencontainers/go-digest v1.0.0 // indirect
51+
github.com/opencontainers/image-spec v1.0.1 // indirect
52+
github.com/pkg/errors v0.9.1 // indirect
53+
github.com/pmezard/go-difflib v1.0.0 // indirect
54+
github.com/prometheus/client_golang v1.7.1 // indirect
55+
github.com/prometheus/client_model v0.2.0 // indirect
56+
github.com/prometheus/common v0.10.0 // indirect
57+
github.com/prometheus/procfs v0.2.0 // indirect
58+
github.com/spf13/pflag v1.0.5 // indirect
59+
go.uber.org/atomic v1.7.0 // indirect
60+
go.uber.org/multierr v1.6.0 // indirect
61+
go.uber.org/zap v1.17.0 // indirect
62+
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
63+
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect
64+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
65+
golang.org/x/sys v0.0.0-20220403205710-6acee93ad0eb // indirect
66+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
67+
golang.org/x/text v0.3.7 // indirect
68+
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
69+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
70+
gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
71+
google.golang.org/appengine v1.6.7 // indirect
72+
google.golang.org/protobuf v1.27.1 // indirect
73+
gopkg.in/inf.v0 v0.9.1 // indirect
74+
gopkg.in/yaml.v2 v2.4.0 // indirect
75+
gopkg.in/yaml.v3 v3.0.1 // indirect
76+
k8s.io/apiextensions-apiserver v0.20.2 // indirect
77+
k8s.io/component-base v0.20.2 // indirect
78+
k8s.io/klog/v2 v2.4.0 // indirect
79+
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
80+
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
81+
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
82+
sigs.k8s.io/yaml v1.3.0 // indirect
83+
)

0 commit comments

Comments
 (0)