Skip to content

Commit 91272db

Browse files
authored
fix: list correct registry.k8s.io/sig-storage/csi-snapshotter image (#943)
**What problem does this PR solve?**: The current process returns an incorrect image `registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3` From the CSI helm chart, we need to set this capability `snapshot.storage.k8s.io/v1` to get the correct image. ``` snapshotter: image: registry.k8s.io/sig-storage/csi-snapshotter:v6.3.3 imageBeta: registry.k8s.io/sig-storage/csi-snapshotter:v3.0.3 ``` ``` {{- if .Capabilities.APIVersions.Has "snapshot.storage.k8s.io/v1" }} image: {{ .Values.sidecars.snapshotter.image }} {{- else }} image: {{ .Values.sidecars.snapshotter.imageBeta }} {{- end }} ``` Ran this locally: ``` make list-images | grep "registry.k8s.io/sig-storage/csi-snapshotter" registry.k8s.io/sig-storage/csi-snapshotter:v6.3.3 ``` **Which issue(s) this PR fixes**: Fixes # **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent 325ced3 commit 91272db

File tree

3 files changed

+173
-189
lines changed

3 files changed

+173
-189
lines changed

hack/tools/fetch-images/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ func getImagesForChart(info *ChartInfo) ([]string, error) {
307307
images.ExtraImagesFiles = info.extraImagesFiles
308308
// kubeVersion needs to be set for some addons
309309
images.KubeVersion = "v1.29.0"
310+
// apiVersions needs to be set for some addons
311+
images.APIVersions = []string{"snapshot.storage.k8s.io/v1"}
310312
images.SetRelease("sample")
311313
images.SetLogger("INFO")
312314
images.Kind = k8s.SupportedKinds()

hack/tools/go.mod

Lines changed: 51 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,58 +7,60 @@ go 1.22.5
77

88
require (
99
github.com/blang/semver/v4 v4.0.0
10-
github.com/d2iq-labs/helm-list-images v0.11.0
10+
github.com/d2iq-labs/helm-list-images v0.12.0
1111
gopkg.in/yaml.v2 v2.4.0
12-
k8s.io/api v0.30.3
13-
k8s.io/apimachinery v0.30.3
12+
k8s.io/api v0.31.1
13+
k8s.io/apimachinery v0.31.1
1414
sigs.k8s.io/cluster-api v1.8.1
1515
sigs.k8s.io/controller-runtime v0.18.5
1616
sigs.k8s.io/yaml v1.4.0
1717
)
1818

1919
require (
20+
dario.cat/mergo v1.0.1 // indirect
2021
emperror.dev/errors v0.8.0 // indirect
2122
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2223
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2324
github.com/BurntSushi/toml v1.3.2 // indirect
2425
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2526
github.com/Masterminds/goutils v1.1.1 // indirect
26-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
27-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
27+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
28+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
2829
github.com/Masterminds/squirrel v1.5.4 // indirect
2930
github.com/Microsoft/hcsshim v0.11.4 // indirect
3031
github.com/andybalholm/brotli v1.0.4 // indirect
31-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
32+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3233
github.com/banzaicloud/operator-tools v0.26.0 // indirect
3334
github.com/banzaicloud/thanos-operator/pkg/sdk v0.3.7 // indirect
3435
github.com/beorn7/perks v1.0.1 // indirect
3536
github.com/blang/semver v3.5.1+incompatible // indirect
3637
github.com/bodgit/plumbing v1.2.0 // indirect
3738
github.com/bodgit/sevenzip v1.3.0 // indirect
3839
github.com/bodgit/windows v1.0.0 // indirect
39-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
40+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4041
github.com/chai2010/gettext-go v1.0.2 // indirect
4142
github.com/cheynewallace/tabby v1.1.1 // indirect
4243
github.com/connesc/cipherio v0.2.1 // indirect
4344
github.com/containerd/containerd v1.7.12 // indirect
4445
github.com/containerd/log v0.1.0 // indirect
45-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
46+
github.com/cyphar/filepath-securejoin v0.3.1 // indirect
4647
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4748
github.com/distribution/reference v0.6.0 // indirect
48-
github.com/docker/cli v25.0.1+incompatible // indirect
49+
github.com/docker/cli v27.1.1+incompatible // indirect
4950
github.com/docker/distribution v2.8.3+incompatible // indirect
50-
github.com/docker/docker v25.0.5+incompatible // indirect
51+
github.com/docker/docker v25.0.6+incompatible // indirect
5152
github.com/docker/docker-credential-helpers v0.7.0 // indirect
5253
github.com/docker/go-connections v0.5.0 // indirect
5354
github.com/docker/go-metrics v0.0.1 // indirect
5455
github.com/dsnet/compress v0.0.1 // indirect
5556
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
56-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
57+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
5758
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
5859
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
5960
github.com/fatih/color v1.17.0 // indirect
6061
github.com/felixge/httpsnoop v1.0.4 // indirect
6162
github.com/fsnotify/fsnotify v1.7.0 // indirect
63+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6264
github.com/ghodss/yaml v1.0.0 // indirect
6365
github.com/go-errors/errors v1.4.2 // indirect
6466
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
@@ -75,7 +77,7 @@ require (
7577
github.com/google/btree v1.0.1 // indirect
7678
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
7779
github.com/google/go-cmp v0.6.0 // indirect
78-
github.com/google/go-containerregistry v0.19.2 // indirect
80+
github.com/google/go-containerregistry v0.20.2 // indirect
7981
github.com/google/gofuzz v1.2.0 // indirect
8082
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8183
github.com/google/uuid v1.6.0 // indirect
@@ -86,10 +88,10 @@ require (
8688
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
8789
github.com/hashicorp/errwrap v1.1.0 // indirect
8890
github.com/hashicorp/go-multierror v1.1.1 // indirect
89-
github.com/huandu/xstrings v1.4.0 // indirect
91+
github.com/huandu/xstrings v1.5.0 // indirect
9092
github.com/imdario/mergo v0.3.16 // indirect
9193
github.com/inconshreveable/mousetrap v1.1.0 // indirect
92-
github.com/jmoiron/sqlx v1.3.5 // indirect
94+
github.com/jmoiron/sqlx v1.4.0 // indirect
9395
github.com/josharian/intern v1.0.0 // indirect
9496
github.com/json-iterator/go v1.1.12 // indirect
9597
github.com/klauspost/compress v1.16.5 // indirect
@@ -102,13 +104,12 @@ require (
102104
github.com/mattn/go-colorable v0.1.13 // indirect
103105
github.com/mattn/go-isatty v0.0.20 // indirect
104106
github.com/mattn/go-runewidth v0.0.14 // indirect
105-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
106107
github.com/mholt/archiver/v4 v4.0.0-alpha.8 // indirect
107108
github.com/mitchellh/copystructure v1.2.0 // indirect
108109
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
109110
github.com/mitchellh/reflectwalk v1.0.2 // indirect
110111
github.com/moby/locker v1.0.1 // indirect
111-
github.com/moby/spdystream v0.2.0 // indirect
112+
github.com/moby/spdystream v0.4.0 // indirect
112113
github.com/moby/term v0.5.0 // indirect
113114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
114115
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -117,67 +118,69 @@ require (
117118
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
118119
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
119120
github.com/opencontainers/go-digest v1.0.0 // indirect
120-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
121+
github.com/opencontainers/image-spec v1.1.0 // indirect
121122
github.com/openshift/api v3.9.0+incompatible // indirect
122123
github.com/otiai10/copy v1.14.0 // indirect
123124
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
124125
github.com/pierrec/lz4/v4 v4.1.15 // indirect
125126
github.com/pkg/errors v0.9.1 // indirect
126-
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.75.0 // indirect
127-
github.com/prometheus/client_golang v1.18.0 // indirect
128-
github.com/prometheus/client_model v0.6.0 // indirect
129-
github.com/prometheus/common v0.45.0 // indirect
130-
github.com/prometheus/procfs v0.12.0 // indirect
127+
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.76.2 // indirect
128+
github.com/prometheus/client_golang v1.19.1 // indirect
129+
github.com/prometheus/client_model v0.6.1 // indirect
130+
github.com/prometheus/common v0.55.0 // indirect
131+
github.com/prometheus/procfs v0.15.1 // indirect
131132
github.com/rivo/uniseg v0.4.2 // indirect
132-
github.com/rubenv/sql-migrate v1.5.2 // indirect
133+
github.com/rubenv/sql-migrate v1.7.0 // indirect
133134
github.com/russross/blackfriday/v2 v2.1.0 // indirect
134-
github.com/shopspring/decimal v1.3.1 // indirect
135+
github.com/shopspring/decimal v1.4.0 // indirect
135136
github.com/sirupsen/logrus v1.9.3 // indirect
136-
github.com/spf13/cast v1.6.0 // indirect
137+
github.com/spf13/cast v1.7.0 // indirect
137138
github.com/spf13/cobra v1.8.1 // indirect
138139
github.com/spf13/pflag v1.0.5 // indirect
139140
github.com/therootcompany/xz v1.0.1 // indirect
140141
github.com/thoas/go-funk v0.9.3 // indirect
141142
github.com/ulikunitz/xz v0.5.10 // indirect
143+
github.com/x448/float16 v0.8.4 // indirect
142144
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
143145
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
144146
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
145147
github.com/xlab/treeprint v1.2.0 // indirect
146-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
147-
go.opentelemetry.io/otel v1.24.0 // indirect
148-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
149-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
148+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
149+
go.opentelemetry.io/otel v1.28.0 // indirect
150+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
151+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
150152
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
151153
go.uber.org/multierr v1.11.0 // indirect
152154
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
153-
golang.org/x/crypto v0.25.0 // indirect
155+
golang.org/x/crypto v0.26.0 // indirect
154156
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
155-
golang.org/x/net v0.27.0 // indirect
157+
golang.org/x/net v0.28.0 // indirect
156158
golang.org/x/oauth2 v0.21.0 // indirect
157-
golang.org/x/sync v0.7.0 // indirect
158-
golang.org/x/sys v0.22.0 // indirect
159-
golang.org/x/term v0.22.0 // indirect
160-
golang.org/x/text v0.16.0 // indirect
159+
golang.org/x/sync v0.8.0 // indirect
160+
golang.org/x/sys v0.23.0 // indirect
161+
golang.org/x/term v0.23.0 // indirect
162+
golang.org/x/text v0.17.0 // indirect
161163
golang.org/x/time v0.5.0 // indirect
162164
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
163-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
164-
google.golang.org/grpc v1.62.2 // indirect
165-
google.golang.org/protobuf v1.34.1 // indirect
165+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
166+
google.golang.org/grpc v1.65.0 // indirect
167+
google.golang.org/protobuf v1.34.2 // indirect
168+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
166169
gopkg.in/inf.v0 v0.9.1 // indirect
167170
gopkg.in/yaml.v3 v3.0.1 // indirect
168-
helm.sh/helm/v3 v3.15.2 // indirect
169-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
170-
k8s.io/apiserver v0.30.3 // indirect
171-
k8s.io/cli-runtime v0.30.3 // indirect
172-
k8s.io/client-go v0.30.3 // indirect
173-
k8s.io/component-base v0.30.3 // indirect
171+
helm.sh/helm/v3 v3.16.1 // indirect
172+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
173+
k8s.io/apiserver v0.31.0 // indirect
174+
k8s.io/cli-runtime v0.31.0 // indirect
175+
k8s.io/client-go v0.31.1 // indirect
176+
k8s.io/component-base v0.31.1 // indirect
174177
k8s.io/klog/v2 v2.130.1 // indirect
175178
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
176-
k8s.io/kubectl v0.30.3 // indirect
177-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
179+
k8s.io/kubectl v0.31.0 // indirect
180+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
178181
oras.land/oras-go v1.2.5 // indirect
179182
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
180-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
181-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
183+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
184+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
182185
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
183186
)

0 commit comments

Comments
 (0)