Skip to content

Commit ca702c7

Browse files
codefromthecryptcodefromthecrypt
committed
Reconciles k8s versions at vX.28.7 and removes test skip drift
I noticed some stale warnings about testcontainers, which have drifted. This made me notice many versions of k8s dependencies (go or image versions) weren't coherent. I reconciled everything and changed comments on the remaining broken parts, which aren't broken due to testcontainers. Signed-off-by: Adrian Cole <[email protected]>
1 parent 24c0432 commit ca702c7

File tree

9 files changed

+38
-53
lines changed

9 files changed

+38
-53
lines changed

‎go.mod

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ require (
160160
github.com/prometheus/statsd_exporter v0.22.8
161161
github.com/richardartoul/molecule v1.0.1-0.20221107223329-32cfee06a052
162162
github.com/rs/cors v1.10.1
163-
github.com/shirou/gopsutil/v3 v3.23.9
163+
github.com/shirou/gopsutil/v3 v3.23.11
164164
github.com/sijms/go-ora/v2 v2.7.6
165165
github.com/sirupsen/logrus v1.9.3
166166
github.com/spaolacci/murmur3 v1.1.0
167167
github.com/spf13/cobra v1.7.0
168168
github.com/stretchr/testify v1.8.4
169-
github.com/testcontainers/testcontainers-go v0.25.0
170-
github.com/testcontainers/testcontainers-go/modules/k3s v0.0.0-20230615142642-c175df34bd1d
169+
github.com/testcontainers/testcontainers-go v0.27.0
170+
github.com/testcontainers/testcontainers-go/modules/k3s v0.27.0
171171
github.com/uber/jaeger-client-go v2.30.0+incompatible
172172
github.com/vincent-petithory/dataurl v1.0.0
173173
github.com/webdevops/azure-metrics-exporter v0.0.0-20230717202958-8701afc2b013
@@ -230,10 +230,10 @@ require (
230230
gopkg.in/yaml.v2 v2.4.0
231231
gopkg.in/yaml.v3 v3.0.1
232232
gotest.tools v2.2.0+incompatible
233-
k8s.io/api v0.28.3
234-
k8s.io/apiextensions-apiserver v0.28.0
235-
k8s.io/client-go v0.28.3
236-
k8s.io/component-base v0.28.1
233+
k8s.io/api v0.28.7
234+
k8s.io/apiextensions-apiserver v0.28.7
235+
k8s.io/client-go v0.28.7
236+
k8s.io/component-base v0.28.7
237237
k8s.io/klog/v2 v2.100.1
238238
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
239239
sigs.k8s.io/controller-runtime v0.16.2
@@ -478,7 +478,7 @@ require (
478478
github.com/mitchellh/copystructure v1.2.0 // indirect
479479
github.com/mitchellh/go-homedir v1.1.0 // indirect
480480
github.com/mna/redisc v1.3.2 // indirect
481-
github.com/moby/patternmatcher v0.5.0 // indirect
481+
github.com/moby/patternmatcher v0.6.0 // indirect
482482
github.com/moby/sys/mountinfo v0.6.2 // indirect
483483
github.com/moby/sys/sequential v0.5.0 // indirect
484484
github.com/moby/term v0.5.0 // indirect
@@ -503,7 +503,7 @@ require (
503503
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.87.0 // indirect
504504
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.87.0 // indirect
505505
github.com/opencontainers/go-digest v1.0.0 // indirect
506-
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
506+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
507507
github.com/opencontainers/runc v1.1.12 // indirect
508508
github.com/opencontainers/runtime-spec v1.1.0-rc.1 // indirect
509509
github.com/opencontainers/selinux v1.11.0 // indirect
@@ -587,7 +587,7 @@ require (
587587
golang.org/x/mod v0.14.0 // indirect
588588
golang.org/x/sync v0.5.0 // indirect
589589
golang.org/x/term v0.16.0 // indirect
590-
golang.org/x/tools v0.16.0
590+
golang.org/x/tools v0.16.1
591591
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
592592
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
593593
gonum.org/v1/gonum v0.14.0 // indirect
@@ -622,7 +622,7 @@ require (
622622
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver v0.87.0
623623
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0
624624
golang.org/x/crypto/x509roots/fallback v0.0.0-20240208163226-62c9f1799c91
625-
k8s.io/apimachinery v0.28.3
625+
k8s.io/apimachinery v0.28.7
626626
)
627627

628628
require (

‎go.sum

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,8 +1620,8 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
16201620
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
16211621
github.com/mna/redisc v1.3.2 h1:sc9C+nj6qmrTFnsXb70xkjAHpXKtjjBuE6v2UcQV0ZE=
16221622
github.com/mna/redisc v1.3.2/go.mod h1:CplIoaSTDi5h9icnj4FLbRgHoNKCHDNJDVRztWDGeSQ=
1623-
github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
1624-
github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
1623+
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
1624+
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
16251625
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
16261626
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
16271627
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
@@ -1824,8 +1824,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
18241824
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
18251825
github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
18261826
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
1827-
github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0=
1828-
github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
1827+
github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI=
1828+
github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
18291829
github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
18301830
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
18311831
github.com/opencontainers/runc v1.1.12 h1:BOIssBaW1La0/qbNZHXOOa71dZfZEQOzW7dqQf3phss=
@@ -2077,8 +2077,8 @@ github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
20772077
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
20782078
github.com/shirou/gopsutil v0.0.0-20181107111621-48177ef5f880/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
20792079
github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
2080-
github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E=
2081-
github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA=
2080+
github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ=
2081+
github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM=
20822082
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
20832083
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
20842084
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
@@ -2192,10 +2192,10 @@ github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955u
21922192
github.com/tencentcloud/tencentcloud-sdk-go v1.0.162 h1:8fDzz4GuVg4skjY2B0nMN7h6uN61EDVkuLyI2+qGHhI=
21932193
github.com/tencentcloud/tencentcloud-sdk-go v1.0.162/go.mod h1:asUz5BPXxgoPGaRgZaVm1iGcUAuHyYUo1nXqKa83cvI=
21942194
github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9/go.mod h1:RHkNRtSLfOK7qBTHaeSX1D6BNpI3qw7NTxsmNr4RvN8=
2195-
github.com/testcontainers/testcontainers-go v0.25.0 h1:erH6cQjsaJrH+rJDU9qIf89KFdhK0Bft0aEZHlYC3Vs=
2196-
github.com/testcontainers/testcontainers-go v0.25.0/go.mod h1:4sC9SiJyzD1XFi59q8umTQYWxnkweEc5OjVtTUlJzqQ=
2197-
github.com/testcontainers/testcontainers-go/modules/k3s v0.0.0-20230615142642-c175df34bd1d h1:KyYCHo9iBoQYw5AzcozD/77uNbFlRjTmMTA7QjSxHOQ=
2198-
github.com/testcontainers/testcontainers-go/modules/k3s v0.0.0-20230615142642-c175df34bd1d/go.mod h1:Pa91ahCbzRB6d9FBi6UAjurTEm7WmyBVeuklLkwAKKs=
2195+
github.com/testcontainers/testcontainers-go v0.27.0 h1:IeIrJN4twonTDuMuBNQdKZ+K97yd7VrmNGu+lDpYcDk=
2196+
github.com/testcontainers/testcontainers-go v0.27.0/go.mod h1:+HgYZcd17GshBUZv9b+jKFJ198heWPQq3KQIp2+N+7U=
2197+
github.com/testcontainers/testcontainers-go/modules/k3s v0.27.0 h1:0t0j8stcPmKiocqanccncg7082iHnK81mGSuLGA6L5Q=
2198+
github.com/testcontainers/testcontainers-go/modules/k3s v0.27.0/go.mod h1:vIWhhOmt9E46scDA2RH4n5BICu3dB0ycoqWqs43kmcI=
21992199
github.com/tg123/go-htpasswd v1.2.1 h1:i4wfsX1KvvkyoMiHZzjS0VzbAPWfxzI8INcZAKtutoU=
22002200
github.com/tg123/go-htpasswd v1.2.1/go.mod h1:erHp1B86KXdwQf1X5ZrLb7erXZnWueEQezb2dql4q58=
22012201
github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
@@ -2795,7 +2795,7 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
27952795
golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
27962796
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
27972797
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2798-
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2798+
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
27992799
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
28002800
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
28012801
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -2916,8 +2916,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
29162916
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
29172917
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
29182918
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
2919-
golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM=
2920-
golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
2919+
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
2920+
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
29212921
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
29222922
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
29232923
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -3178,22 +3178,22 @@ howett.net/plist v1.0.0/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
31783178
k8s.io/api v0.0.0-20180806132203-61b11ee65332/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
31793179
k8s.io/api v0.0.0-20190325185214-7544f9db76f6/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
31803180
k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
3181-
k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM=
3182-
k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc=
3183-
k8s.io/apiextensions-apiserver v0.28.0 h1:CszgmBL8CizEnj4sj7/PtLGey6Na3YgWyGCPONv7E9E=
3184-
k8s.io/apiextensions-apiserver v0.28.0/go.mod h1:uRdYiwIuu0SyqJKriKmqEN2jThIJPhVmOWETm8ud1VE=
3181+
k8s.io/api v0.28.7 h1:YKIhBxjXKaxuxWJnwohV0aGjRA5l4IU0Eywf/q19AVI=
3182+
k8s.io/api v0.28.7/go.mod h1:y4RbcjCCMff1930SG/TcP3AUKNfaJUgIeUp58e/2vyY=
3183+
k8s.io/apiextensions-apiserver v0.28.7 h1:NQlzP/vmvIO9Qt7wQTdMe9sGWGkozQZMPk9suehAvR8=
3184+
k8s.io/apiextensions-apiserver v0.28.7/go.mod h1:ST+ZOppyy+Z0mIxezSOK8qwIXctNwdFLNpGkQp8bw4M=
31853185
k8s.io/apimachinery v0.0.0-20180821005732-488889b0007f/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
31863186
k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
31873187
k8s.io/apimachinery v0.17.1/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
31883188
k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
3189-
k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A=
3190-
k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8=
3189+
k8s.io/apimachinery v0.28.7 h1:2Z38/XRAOcpb+PonxmBEmjG7hBfmmr41xnr0XvpTnB4=
3190+
k8s.io/apimachinery v0.28.7/go.mod h1:QFNX/kCl/EMT2WTSz8k4WLCv2XnkOLMaL8GAVRMdpsA=
31913191
k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs=
3192-
k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4=
3193-
k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo=
3192+
k8s.io/client-go v0.28.7 h1:3L6402+tjmOl8twX3fjUQ/wsYAkw6UlVNDVP+rF6YGA=
3193+
k8s.io/client-go v0.28.7/go.mod h1:xIoEaDewZ+EwWOo1/F1t0IOKMPe1rwBZhLu9Es6y0tE=
31943194
k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
3195-
k8s.io/component-base v0.28.1 h1:LA4AujMlK2mr0tZbQDZkjWbdhTV5bRyEyAFe0TJxlWg=
3196-
k8s.io/component-base v0.28.1/go.mod h1:jI11OyhbX21Qtbav7JkhehyBsIRfnO8oEgoAR12ArIU=
3195+
k8s.io/component-base v0.28.7 h1:Cq5aQ52N0CTaOMiary4rXzR4RoTP77Z3ll4qSg4qH7s=
3196+
k8s.io/component-base v0.28.7/go.mod h1:RrtNBKrSuckksSQ3fV9PhwBSHO/ZbwJXM2Z0OPx+UJk=
31973197
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
31983198
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
31993199
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

‎internal/component/remote/vault/vault_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@ func Test_PollSecrets(t *testing.T) {
143143
}
144144

145145
func getTestVaultServer(t *testing.T) *vaultapi.Client {
146-
// TODO: this is broken with go 1.20.6
147-
// waiting on https://github.com/testcontainers/testcontainers-go/issues/1359
148-
t.Skip()
149146
ctx := componenttest.TestContext(t)
150147
l := util.TestLogger(t)
151148

‎internal/static/operator/build_hierarchy_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ import (
2727
// Test_buildHierarchy checks that an entire resource hierarchy can be
2828
// discovered.
2929
func Test_buildHierarchy(t *testing.T) {
30-
// TODO: this is broken with go 1.20.6
31-
// waiting on https://github.com/testcontainers/testcontainers-go/issues/1359
32-
t.Skip()
3330
var wg sync.WaitGroup
3431
defer wg.Wait()
3532

‎internal/static/operator/hierarchy/hierarchy_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ import (
2121
// TestNotifier tests that notifier properly handles events for changed
2222
// objects.
2323
func TestNotifier(t *testing.T) {
24-
// TODO: this is broken with go 1.20.6
25-
// waiting on https://github.com/testcontainers/testcontainers-go/issues/1359
26-
t.Skip()
2724
l := log.NewNopLogger()
2825

2926
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)

‎internal/static/operator/kubelet_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ import (
2222

2323
// TestKubelet tests the Kubelet reconciler.
2424
func TestKubelet(t *testing.T) {
25-
// TODO: this is broken with go 1.20.6
26-
// waiting on https://github.com/testcontainers/testcontainers-go/issues/1359
27-
t.Skip()
2825
l := util.TestLogger(t)
2926

3027
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)

‎internal/static/operator/operator_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ func ReconcileTest(ctx context.Context, t *testing.T, inFile, outFile string) {
140140
// NewTestCluster creates a new testing cluster. The cluster will be removed
141141
// when the test completes.
142142
func NewTestCluster(ctx context.Context, t *testing.T, l log.Logger) *k8s.Cluster {
143-
// TODO: this is broken with go 1.20.6
144-
// waiting on https://github.com/testcontainers/testcontainers-go/issues/1359
145-
t.Skip()
143+
t.Skip("TODO: unable to retrieve the complete list of server APIs: monitoring.grafana.com/v1alpha1")
146144
t.Helper()
147145

148146
cluster, err := k8s.NewCluster(ctx, k8s.Options{})

‎internal/util/k8s/k8s.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package k8s
44
import (
55
"context"
66
"fmt"
7+
"github.com/testcontainers/testcontainers-go"
78
"log"
89

910
gragent "github.com/grafana/agent/internal/static/operator/apis/monitoring/v1alpha1"
@@ -71,7 +72,8 @@ func NewCluster(ctx context.Context, o Options) (cluster *Cluster, err error) {
7172
return nil, fmt.Errorf("failed to apply defaults to options: %w", err)
7273
}
7374

74-
container, err := k3s.RunContainer(ctx)
75+
// Keep the image version coherent with /go.mod
76+
container, err := k3s.RunContainer(ctx, testcontainers.WithImage("docker.io/rancher/k3s:v1.28.7-k3s1"))
7577
defer func() {
7678
// We don't want to leak the cluster here, and we can't really be sure how
7779
// many resources exist, even if ClusterRun fails. If we never set our

‎internal/util/k8s/k8s_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import (
1212
)
1313

1414
func TestCluster(t *testing.T) {
15-
// TODO: this is broken with go 1.20.6
16-
// waiting on https://github.com/testcontainers/testcontainers-go/issues/1359
17-
t.Skip()
1815
ctx := context.Background()
1916

2017
cluster, err := NewCluster(ctx, Options{})

0 commit comments

Comments
 (0)