Skip to content

Commit 4c36b75

Browse files
rifelpetrifelpet
committed
remove unnecessary error from function signature
1 parent 8ecc975 commit 4c36b75

File tree

7 files changed

+18
-68
lines changed

7 files changed

+18
-68
lines changed

‎pkg/assets/builder.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (a *AssetBuilder) RemapManifest(data []byte) ([]byte, error) {
144144
}
145145

146146
// RemapImage normalizes a containers location if a user sets the AssetsLocation ContainerRegistry location.
147-
func (a *AssetBuilder) RemapImage(image string) (string, error) {
147+
func (a *AssetBuilder) RemapImage(image string) string {
148148
asset := &ImageAsset{
149149
DownloadLocation: image,
150150
CanonicalLocation: image,
@@ -225,20 +225,20 @@ func (a *AssetBuilder) RemapImage(image string) (string, error) {
225225
a.ImageAssets = append(a.ImageAssets, asset)
226226

227227
if !featureflag.ImageDigest.Enabled() || os.Getenv("KOPS_BASE_URL") != "" {
228-
return image, nil
228+
return image
229229
}
230230

231231
if strings.Contains(image, "@") {
232-
return image, nil
232+
return image
233233
}
234234

235235
digest, err := crane.Digest(image, crane.WithAuthFromKeychain(authn.DefaultKeychain))
236236
if err != nil {
237237
klog.Warningf("failed to digest image %q: %s", image, err)
238-
return image, nil
238+
return image
239239
}
240240

241-
return image + "@" + digest, nil
241+
return image + "@" + digest
242242
}
243243

244244
// RemapFile returns a remapped URL for the file, if AssetsLocation is defined.

‎pkg/assets/builder_test.go‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToDockerHub(t *testing.T) {
4242

4343
builder.AssetsLocation.ContainerProxy = &proxyURL
4444

45-
remapped, err := builder.RemapImage(image)
46-
if err != nil {
47-
t.Error("Error remapping image", err)
48-
}
49-
45+
remapped := builder.RemapImage(image)
5046
if remapped != expected {
5147
t.Errorf("Error remapping image (Expecting: %s, got %s)", expected, remapped)
5248
}
@@ -61,11 +57,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToSimplifiedDockerHub(t *test
6157

6258
builder.AssetsLocation.ContainerProxy = &proxyURL
6359

64-
remapped, err := builder.RemapImage(image)
65-
if err != nil {
66-
t.Error("Error remapping image", err)
67-
}
68-
60+
remapped := builder.RemapImage(image)
6961
if remapped != expected {
7062
t.Errorf("Error remapping image (Expecting: %s, got %s)", expected, remapped)
7163
}
@@ -80,11 +72,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToSimplifiedKubernetesURL(t *
8072

8173
builder.AssetsLocation.ContainerProxy = &proxyURL
8274

83-
remapped, err := builder.RemapImage(image)
84-
if err != nil {
85-
t.Error("Error remapping image", err)
86-
}
87-
75+
remapped := builder.RemapImage(image)
8876
if remapped != expected {
8977
t.Errorf("Error remapping image (Expecting: %s, got %s)", expected, remapped)
9078
}
@@ -99,11 +87,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToLegacyKubernetesURL(t *test
9987

10088
builder.AssetsLocation.ContainerProxy = &proxyURL
10189

102-
remapped, err := builder.RemapImage(image)
103-
if err != nil {
104-
t.Error("Error remapping image", err)
105-
}
106-
90+
remapped := builder.RemapImage(image)
10791
if remapped != expected {
10892
t.Errorf("Error remapping image (Expecting: %s, got %s)", expected, remapped)
10993
}
@@ -118,11 +102,7 @@ func TestValidate_RemapImage_ContainerProxy_AppliesToImagesWithTags(t *testing.T
118102

119103
builder.AssetsLocation.ContainerProxy = &proxyURL
120104

121-
remapped, err := builder.RemapImage(image)
122-
if err != nil {
123-
t.Error("Error remapping image", err)
124-
}
125-
105+
remapped := builder.RemapImage(image)
126106
if remapped != expected {
127107
t.Errorf("Error remapping image (Expecting: %s, got %s)", expected, remapped)
128108
}
@@ -140,11 +120,7 @@ func TestValidate_RemapImage_ContainerRegistry_MappingMultipleTimesConverges(t *
140120
remapped := image
141121
iterations := make([]map[int]int, 2)
142122
for i := range iterations {
143-
remapped, err := builder.RemapImage(remapped)
144-
if err != nil {
145-
t.Errorf("Error remapping image (iteration %d): %s", i, err)
146-
}
147-
123+
remapped := builder.RemapImage(remapped)
148124
if remapped != expected {
149125
t.Errorf("Error remapping image (Expecting: %s, got %s, iteration: %d)", expected, remapped, i)
150126
}

‎pkg/kubemanifest/images.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@ limitations under the License.
1717
package kubemanifest
1818

1919
import (
20-
"fmt"
2120
"strings"
2221

2322
"k8s.io/klog/v2"
2423
)
2524

26-
type ImageRemapFunction func(image string) (string, error)
25+
type ImageRemapFunction func(image string) string
2726

2827
func (m *Object) RemapImages(mapper ImageRemapFunction) error {
2928
visitor := &imageRemapVisitor{
@@ -57,10 +56,7 @@ func (m *imageRemapVisitor) VisitString(path []string, v string, mutator func(st
5756

5857
image := v
5958
klog.V(4).Infof("Consider image for re-mapping: %q", image)
60-
remapped, err := m.mapper(v)
61-
if err != nil {
62-
return fmt.Errorf("error remapping image %q: %v", image, err)
63-
}
59+
remapped := m.mapper(v)
6460
if remapped != image {
6561
mutator(remapped)
6662
}

‎pkg/model/components/context.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,7 @@ func Image(component string, clusterSpec *kops.ClusterSpec, assetsBuilder *asset
150150
if !kopsmodel.IsBaseURL(clusterSpec.KubernetesVersion) {
151151
image := "registry.k8s.io/" + imageName + ":" + "v" + kubernetesVersion.String()
152152

153-
image, err := assetsBuilder.RemapImage(image)
154-
if err != nil {
155-
return "", fmt.Errorf("unable to remap container %q: %v", image, err)
156-
}
157-
return image, nil
153+
return assetsBuilder.RemapImage(image), nil
158154
}
159155

160156
// The simple name is valid when pulling. But if we

‎pkg/model/components/etcdmanager/model.go‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
314314
// Remap image via AssetBuilder
315315
for i := range pod.Spec.InitContainers {
316316
initContainer := &pod.Spec.InitContainers[i]
317-
remapped, err := b.AssetBuilder.RemapImage(initContainer.Image)
318-
if err != nil {
319-
return nil, fmt.Errorf("unable to remap init container image %q: %w", container.Image, err)
320-
}
321-
initContainer.Image = remapped
317+
initContainer.Image = b.AssetBuilder.RemapImage(initContainer.Image)
322318
}
323319
}
324320

@@ -334,11 +330,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
334330
}
335331

336332
// Remap image via AssetBuilder
337-
remapped, err := b.AssetBuilder.RemapImage(container.Image)
338-
if err != nil {
339-
return nil, fmt.Errorf("unable to remap container image %q: %w", container.Image, err)
340-
}
341-
container.Image = remapped
333+
container.Image = b.AssetBuilder.RemapImage(container.Image)
342334
}
343335

344336
var clientHost string

‎pkg/model/components/kubeapiserver/model.go‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,7 @@ func (b *KubeApiserverBuilder) buildHealthcheckSidecar() (*corev1.Pod, error) {
138138
}
139139

140140
// Remap image via AssetBuilder
141-
{
142-
remapped, err := b.AssetBuilder.RemapImage(container.Image)
143-
if err != nil {
144-
return nil, fmt.Errorf("unable to remap container image %q: %v", container.Image, err)
145-
}
146-
container.Image = remapped
147-
}
141+
container.Image = b.AssetBuilder.RemapImage(container.Image)
148142

149143
return pod, nil
150144
}

‎pkg/model/components/kubelet.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,7 @@ func (b *KubeletOptionsBuilder) configureKubelet(cluster *kops.Cluster, kubelet
167167
// Prevent image GC from pruning the pause image
168168
// https://github.com/kubernetes/enhancements/tree/master/keps/sig-node/2040-kubelet-cri#pinned-images
169169
image := "registry.k8s.io/pause:3.9"
170-
var err error
171-
if image, err = b.AssetBuilder.RemapImage(image); err != nil {
172-
return err
173-
}
174-
kubelet.PodInfraContainerImage = image
170+
kubelet.PodInfraContainerImage = b.AssetBuilder.RemapImage(image)
175171

176172
if kubelet.FeatureGates == nil {
177173
kubelet.FeatureGates = make(map[string]string)

0 commit comments

Comments
 (0)